Changeset 185 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D

Timestamp:

Oct 23, 2007 5:13:28 PM (15 years ago)

Author:

srkline

Message:

The Cylinder_2D calculation is now threaded (it's the only threaded function so far)

Plus a few interface tweaks on the Setup panel

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Cylinder_2D.ipf (modified) (2 diffs)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Cylinder_2D.ipf

@@ -76 +76 @@
         parameters_Cyl2D[7] = "Sigma of polydisp in Theta [rad]"
         parameters_Cyl2D[8] = "Sigma of polydisp in Phi [rad]"
-        parameters_Cyl2D[9] = "Sigma of polydisp in Radius [Angstroem]"
+        parameters_Cyl2D[9] = "Sigma of polydisp in Radius [A]"
 
         Edit parameters_Cyl2D,coef_Cyl2D                                        
@@ -114 +114 @@
 // simply calls the original single point calculation with
 // a wave assignment (this will behave nicely if given point ranges)
+//
+// NON-THREADED IMPLEMENTATION
+//
+//Function Cylinder2D(cw,zw,yw,xw) : FitFunc
+//      Wave cw,zw,yw,xw
+//      
+//#if exists("Cylinder_2D_Dist")
+//      zw = Cylinder_2D_Dist(cw,yw,xw)
+//#else
+//      Abort "You do not have the SANS Analysis XOP installed"
+//#endif
+//      return(0)
+//End
+//
+
+//threaded version of the function
+ThreadSafe Function Cylinder2D_T(cw,zw,yw,xw,p1,p2)
+        WAVE cw,zw,yw,xw
+        Variable p1,p2
+        
+        zw[p1,p2]= Cylinder_2D_Dist(cw,yw,xw)
+
+//      return stopMSTimer(-2)          // time when we finished
+        return 0
+End
+
+//function that is actually a wrapper to dispatch the calculation to N threads
+//
 Function Cylinder2D(cw,zw,yw,xw) : FitFunc
         Wave cw,zw,yw,xw
         
-#if exists("Cylinder_2D_Dist")
-        zw = Cylinder_2D_Dist(cw,yw,xw)
-#else
-        Abort "You do not have the SANS Analysis XOP installed"
-#endif
+        Variable npt=numpnts(yw)
+        Variable i,nthreads= ThreadProcessorCount
+        variable mt= ThreadGroupCreate(nthreads)
+
+        for(i=0;i<nthreads;i+=1)
+//              Print (i*npt/nthreads),((i+1)*npt/nthreads-1)
+                ThreadStart mt,i,Cylinder2D_T(cw,zw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+        endfor
+
+        do
+                variable tgs= ThreadGroupWait(mt,100)
+        while( tgs != 0 )
+
+        variable dummy= ThreadGroupRelease(mt)
+        
         return(0)
 End