Changeset 775 for sans/Dev/trunk

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:

• Models/Models_2D/PeakGauss2D_v40.ipf (modified) (1 diff)
• Packages/ModelPicker/SANSModelPicker_v40.ipf (modified) (2 diffs)
• Packages/ModelPicker/SANS_Model_List.itx (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/PeakGauss2D_v40.ipf

@@ -133 +133 @@
         Wave cw,zw,xw,yw
         
-        Variable npt=numpnts(yw)
-        Variable i,nthreads= ThreadProcessorCount
-        variable mt= ThreadGroupCreate(nthreads)
-
-//      Variable t1=StopMSTimer(-2)
-        
-        for(i=0;i<nthreads;i+=1)
-        //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
-                ThreadStart mt,i,PeakGauss2D_T(cw,zw,xw,yw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
-        endfor
-
-        do
-                variable tgs= ThreadGroupWait(mt,100)
-        while( tgs != 0 )
-
-        variable dummy= ThreadGroupRelease(mt)
-        
-//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
+#if exists("PeakGauss2DX")                      //to hide the function if XOP not installed
+        MultiThread zw= PeakGauss2DX(cw,xw,yw)
+#else
+        MultiThread zw = I_PeakGauss2D(cw,xw,yw)
+#endif  
+        
+//      Variable npt=numpnts(yw)
+//      Variable i,nthreads= ThreadProcessorCount
+//      variable mt= ThreadGroupCreate(nthreads)
+//
+////    Variable t1=StopMSTimer(-2)
+//      
+//      for(i=0;i<nthreads;i+=1)
+//      //      Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+//              ThreadStart mt,i,PeakGauss2D_T(cw,zw,xw,yw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+//      endfor
+//
+//      do
+//              variable tgs= ThreadGroupWait(mt,100)
+//      while( tgs != 0 )
+//
+//      variable dummy= ThreadGroupRelease(mt)
+//      
+////    Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
         
         return(0)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

@@ -139 +139 @@
 ////paste here... after deleting the old make statement and list
         
-  Make/O/T/N=95  SANS_Model_List
+  Make/O/T/N=97  SANS_Model_List
 
   SANS_Model_List[0] = "BE_Polyelectrolyte.ipf"
@@ -239 +239 @@
   SANS_Model_List[93] = "PolyRaspberry.ipf"
   SANS_Model_List[94] = "Two_Yukawa.ipf"
+  SANS_Model_List[95] = "Sphere_2D.ipf"
+  SANS_Model_List[96] = "PeakGauss2D.ipf"
 
   ///end paste here

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANS_Model_List.itx

@@ -97 +97 @@
         "PolyRaspberry.ipf"
         "Two_Yukawa.ipf"
+        "Sphere_2D.ipf"
+        "PeakGauss2D.ipf"
 END
 X SetScale/P x 0,1,"", SANS_Model_List; SetScale y 0,0,"", SANS_Model_List