Changeset 369 for sans/Dev

Timestamp:

May 22, 2008 4:45:39 PM (15 years ago)

Author:

srkline

Message:

Changed the detector efficiency correction to DIVIDE, rather than multiply. This was verified with John's data from Vanadium.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• InstalledVersion.txt (modified) (1 diff)
• SANS/Analysis/Models/NewModels_2006/Cylinder_PolyRadius_v40.ipf (modified) (2 diffs)
• SANS/Reduction/WorkFileUtils.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/InstalledVersion.txt

@@ -1 @@
-PACKAGE_VERSION=6.001;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21;
+PACKAGE_VERSION=6.002;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21;
 
 Only the first line of the file is read in.

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

@@ -280 +280 @@
 End
 
-
+//
+//  Fit function that is actually a wrapper to dispatch the calculation to N threads
+//
+// nthreads is 1 or an even number, typically 2
+// it doesn't matter if npt is odd. In this case, fractional point numbers are passed
+// and the wave indexing works just fine - I tested this with test waves of 7 and 8 points
+// and the points "2.5" and "3.5" evaluate correctly as 2 and 3
+//
+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)
+        
+//      Print "elapsed time = ",(StopMSTimer(-2) - t1)/1e6
+        
+#else
+                yw = fCyl_PolyRadius(cw,xw)             //the Igor, non-XOP, non-threaded calculation
+#endif
+        return(0)
+End
 
 //// experimental threaded version...
@@ -293 +329 @@
 #if exists("Cyl_PolyRadiusX")                   //this check is done in the calling function, simply hide from compiler
         yw[p1,p2] = Cyl_PolyRadiusX(cw,xw)
-//#else
-//      yw[p1,p2] = fCyl_PolyRadius(cw,xw)
+#else
+        yw[p1,p2] = fCyl_PolyRadius(cw,xw)
 #endif
 
         return 0
 End
-
-//
-//  Fit function that is actually a wrapper to dispatch the calculation to N threads
-//
-// nthreads is 1 or an even number, typically 2
-// it doesn't matter if npt is odd. In this case, fractional point numbers are passed
-// and the wave indexing works just fine - I tested this with test waves of 7 and 8 points
-// and the points "2.5" and "3.5" evaluate correctly as 2 and 3
-//
-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)
-        
-//      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/SANS/Reduction/WorkFileUtils.ipf

@@ -444 +444 @@
                         // correction inserted 11/2007 SRK
                         // large angle detector efficiency correction is >= 1 and will "bump up" the highest angles
+                        // so divide here to get the correct answer (5/22/08 SRK)
                         if(doEfficiency)
-                                data[ii][jj] *= DetEffCorr(lambda,dtdist,xd,yd)
+                                data[ii][jj] /= DetEffCorr(lambda,dtdist,xd,yd)
         //                      solidAngle[ii][jj] = DetEffCorr(lambda,dtdist,xd,yd)            //testing only
                         endif