Ignore:
Timestamp:
Dec 8, 2010 4:12:18 PM (12 years ago)
Author:
srkline
Message:

Added 2D versions of sphere and GaussPeak? to the package. Probably never need them, but good for testing.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Analysis
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/PeakGauss2D_v40.ipf

    r708 r775  
    133133        Wave cw,zw,xw,yw 
    134134         
    135         Variable npt=numpnts(yw) 
    136         Variable i,nthreads= ThreadProcessorCount 
    137         variable mt= ThreadGroupCreate(nthreads) 
    138  
    139 //      Variable t1=StopMSTimer(-2) 
    140          
    141         for(i=0;i<nthreads;i+=1) 
    142         //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1) 
    143                 ThreadStart mt,i,PeakGauss2D_T(cw,zw,xw,yw,(i*npt/nthreads),((i+1)*npt/nthreads-1)) 
    144         endfor 
    145  
    146         do 
    147                 variable tgs= ThreadGroupWait(mt,100) 
    148         while( tgs != 0 ) 
    149  
    150         variable dummy= ThreadGroupRelease(mt) 
    151          
    152 //      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6 
     135#if exists("PeakGauss2DX")                      //to hide the function if XOP not installed 
     136        MultiThread zw= PeakGauss2DX(cw,xw,yw) 
     137#else 
     138        MultiThread zw = I_PeakGauss2D(cw,xw,yw) 
     139#endif   
     140         
     141//      Variable npt=numpnts(yw) 
     142//      Variable i,nthreads= ThreadProcessorCount 
     143//      variable mt= ThreadGroupCreate(nthreads) 
     144// 
     145////    Variable t1=StopMSTimer(-2) 
     146//       
     147//      for(i=0;i<nthreads;i+=1) 
     148//      //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1) 
     149//              ThreadStart mt,i,PeakGauss2D_T(cw,zw,xw,yw,(i*npt/nthreads),((i+1)*npt/nthreads-1)) 
     150//      endfor 
     151// 
     152//      do 
     153//              variable tgs= ThreadGroupWait(mt,100) 
     154//      while( tgs != 0 ) 
     155// 
     156//      variable dummy= ThreadGroupRelease(mt) 
     157//       
     158////    Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6 
    153159         
    154160        return(0) 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

    r774 r775  
    139139////paste here... after deleting the old make statement and list 
    140140         
    141   Make/O/T/N=95  SANS_Model_List 
     141  Make/O/T/N=97  SANS_Model_List 
    142142 
    143143  SANS_Model_List[0] = "BE_Polyelectrolyte.ipf" 
     
    239239  SANS_Model_List[93] = "PolyRaspberry.ipf" 
    240240  SANS_Model_List[94] = "Two_Yukawa.ipf" 
     241  SANS_Model_List[95] = "Sphere_2D.ipf" 
     242  SANS_Model_List[96] = "PeakGauss2D.ipf" 
    241243 
    242244  ///end paste here 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANS_Model_List.itx

    r774 r775  
    9797        "PolyRaspberry.ipf" 
    9898        "Two_Yukawa.ipf" 
     99        "Sphere_2D.ipf" 
     100        "PeakGauss2D.ipf" 
    99101END 
    100102X SetScale/P x 0,1,"", SANS_Model_List; SetScale y 0,0,"", SANS_Model_List 
Note: See TracChangeset for help on using the changeset viewer.