Changeset 455 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models

Timestamp:

Nov 24, 2008 12:54:13 PM (14 years ago)

Author:

srkline

Message:

Two changes: (1) remove threading of Cyl-PolyRad? model until WM can fix the crashing bug related to compiling/threadsafe...
(2) fixed bug in the calculation of the random deviate for MC calculations. The wrong scattering cross section was calculated depending on wavelength. This has been corrected.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models

Files:

• NewModels_2006/Cylinder_PolyRadius_v40.ipf (modified) (1 diff)
• NewModels_2008/BCC_ParaCrystal_v40.ipf (modified) (2 diffs)
• NewModels_2008/FCC_ParaCrystal_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Cylinder_PolyRadius_v40.ipf

@@ -290 +290 @@
 Function Cyl_PolyRadius(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
-        
-#if exists("Cyl_PolyRadiusX")
-
-        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,Cyl_PolyRadius_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
-        endfor
-
-        do
-                variable tgs= ThreadGroupWait(mt,100)
-        while( tgs != 0 )
-
-        variable dummy= ThreadGroupRelease(mt)
-        
+
+///////NON-THREADED VERSION ///////
+#if exists("Cyl_PolyRadiusX")   
+        yw = Cyl_PolyRadiusX(cw,xw)
+#else
+        yw = fCyl_PolyRadius(cw,xw)
+#endif
+
+/// THREADED VERSION HAS BEEN REMOVED DUE TO CRASHES //////     
+//#if exists("Cyl_PolyRadiusX")
+//
+//      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,Cyl_PolyRadius_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+//      endfor
+//
+//      do
+//              variable tgs= ThreadGroupWait(mt,100)
+//      while( tgs != 0 )
+//
+//      variable dummy= ThreadGroupRelease(mt)
+//      
+//#else
+//              yw = fCyl_PolyRadius(cw,xw)             //the Igor, non-XOP, non-threaded calculation, messy to make ThreadSafe
+//#endif
+
 //      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
-        
-#else
-                yw = fCyl_PolyRadius(cw,xw)             //the Igor, non-XOP, non-threaded calculation
-#endif
+
         return(0)
 End

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/BCC_ParaCrystal_v40.ipf

@@ -97 +97 @@
 End
 
-
-// nothing to change here
-//
-//AAO version, uses XOP if available
-// simply calls the original single point calculation with
-// a wave assignment (this will behave nicely if given point ranges)
+// Threaded version
+// Threaded XOP = 2.4 s
+// non-threaded, non-XOP = 46.8 s
+// = x 19.5 speedup !
+//
 Function BCC_ParaCrystal(cw,yw,xw) : FitFunc
         Wave cw,yw,xw
-        
+
+///// NO threading /////////
 #if exists("BCC_ParaCrystalX")
         yw = BCC_ParaCrystalX(cw,xw)
@@ -111 +111 @@
         yw = fBCC_ParaCrystal(cw,xw)
 #endif
+
+
+/// THREADING ///////
+
+////    Variable t1=StopMSTimer(-2)
+//              
+//#if exists("BCC_ParaCrystalX")
+//
+//      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,BCC_ParaCrystal_T(cw,yw,xw,(i*npt/nthreads),((i+1)*npt/nthreads-1))
+//      endfor
+//
+//      do
+//              variable tgs= ThreadGroupWait(mt,100)
+//      while( tgs != 0 )
+//
+//      variable dummy= ThreadGroupRelease(mt)
+//      
+//#else
+//              yw = fBCC_ParaCrystal(cw,xw)            //the Igor, non-XOP, non-threaded calculation, messy to make ThreadSafe
+//#endif
+//
+////    Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
+
+
+
+        return(0)
+End
+
+
+
+// nothing to change here
+//
+//AAO version, uses XOP if available
+// simply calls the original single point calculation with
+// a wave assignment (this will behave nicely if given point ranges)
+//
+// Threaded Version
+ThreadSafe Function BCC_ParaCrystal_T(cw,yw,xw,p1,p2) : FitFunc
+        Wave cw,yw,xw
+        Variable p1,p2
+
+//      Variable t1=StopMSTimer(-2)
+
+#if exists("BCC_ParaCrystalX")
+        yw[p1,p2] = BCC_ParaCrystalX(cw,xw)
+#else
+        yw[p1,p2] = fBCC_ParaCrystal(cw,xw)
+#endif
+
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
+
         return(0)
 End

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/FCC_ParaCrystal_v40.ipf

@@ -271 +271 @@
 
 //      the name of your unsmeared model (AAO) is the first argument
-        Smear_Model_76(FCC_ParaCrystal,s.coefW,s.xW,s.yW,s.resW)
+        Smear_Model_20(FCC_ParaCrystal,s.coefW,s.xW,s.yW,s.resW)
 
         return(0)