Changeset 1095 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorCorrections.ipf

Timestamp:

Apr 16, 2018 10:50:33 AM (4 years ago)

Author:

srkline

Message:

Added two model functions for white beam smearing.

Many other small changes for processing of the back detector, shuffling of VSANS menu items, and consistent naming of V_ procedures.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorCorrections.ipf (modified) (5 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorCorrections.ipf

@@ -715 +715 @@
 // calculate all of the q-values
 // sdd is passed in [cm]
-        qTot = V_CalcQval(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
-        qx = V_CalcQX(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
-        qy = V_CalcQY(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
-        qz = V_CalcQZ(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
-        
+
+
+// after adding in the 680x1656 back detector, load time was 7.8s, without multithreading
+// with multithreading, 1.9s
+//       qTot = V_CalcQval(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
+//              qx = V_CalcQX(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
+//              qy = V_CalcQY(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
+//              qz = V_CalcQZ(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)   
+
+        MultiThread qTot = V_CalcQval(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
+        MultiThread     qx = V_CalcQX(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
+        MultiThread     qy = V_CalcQY(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
+        MultiThread     qz = V_CalcQZ(p,q,xCtr,yCtr,sdd,lambda,data_realDistX,data_realDistY)
         
         return(0)
@@ -739 +747 @@
 //returned magnitude of Q is in 1/Angstroms
 //
-Function V_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY)
+ThreadSafe Function V_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY)
         Variable xaxval,yaxval,xctr,yctr,sdd,lam
         Wave distX,distY
@@ -769 +777 @@
 // this properly accounts for qz
 //
-Function V_CalcQX(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY)
+ThreadSafe Function V_CalcQX(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY)
         Variable xaxval,yaxval,xctr,yctr,sdd,lam
         Wave distX,distY
@@ -803 +811 @@
 // this properly accounts for qz
 //
-Function V_CalcQY(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY)
+ThreadSafe Function V_CalcQY(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY)
         Variable xaxval,yaxval,xctr,yctr,sdd,lam
         Wave distX,distY
@@ -838 +846 @@
 // this properly accounts for qz, because it is qz
 //
-Function V_CalcQZ(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY)
+ThreadSafe Function V_CalcQZ(xaxval,yaxval,xctr,yctr,sdd,lam,distX,distY)
         Variable xaxval,yaxval,xctr,yctr,sdd,lam
         Wave distX,distY