Changeset 1137 for sans/Dev/trunk/NCNR_User_Procedures/Reduction

Timestamp:

Mar 28, 2019 11:12:06 AM (4 years ago)

Author:

srkline

Message:

1) speed improvement (2x + faster) in recalculation of VCALC configuration by using multithreading where possible.

2) Important bug fix for USANS to account for data collected in q-values, where each point is collected for a different lenght of time. This change had unintended consequences for normalization and dead time corrections.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• USANS/BT5_Loader.ipf (modified) (7 diffs)
• USANS/Main_USANS.ipf (modified) (4 diffs)
• VSANS/VC_DetectorBinning_Utils.ipf (modified) (7 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/BT5_Loader.ipf

@@ -37 +37 @@
         Make/O/D/N=(num) $(USANSFolder+":"+type+":MonCts")
         Make/O/D/N=(num) $(USANSFolder+":"+type+":TransCts")
+        Make/O/D/N=(num) $(USANSFolder+":"+type+":CtTime")
         Wave Angle = $(USANSFolder+":"+type+":Angle")
         Wave DetCts = $(USANSFolder+":"+type+":DetCts")
@@ -42 +43 @@
         Wave MonCts = $(USANSFolder+":"+type+":MonCts")
         Wave TransCts = $(USANSFolder+":"+type+":TransCts")
+        Wave CtTime = $(USANSFolder+":"+type+":CtTime")
         
         Open/R refNum as fname          //if fname is "", a dialog will be presented
@@ -85 +87 @@
         
         Variable useNewDataFormat
-
+        NVAR    gRawUSANSisQvalues = root:Packages:NIST:gRawUSANSisQvalues
+        
+        
 // test by date
         Variable thisFileSecs
@@ -98 +102 @@
         
         USANS_DetectorDeadtime(filedt,MainDeadTime,TransDeadTime)
+        
+//      Print "Overriding Transmission DeadTime, set to 1e-9 s"
+//      TransDeadTime = 1e-9
+//      MainDeadTime = 1e-9
+        
         
         //skip line 2
@@ -119 +128 @@
                         break                                                   // Hit blank line. End of data in the file.
                 endif
+                //1st line of pair
                 sscanf buffer,"%g%g%g%g%g",v1,v2,v3,v4,v5               // 5 values here now
                 angle[numlinesloaded] = v1              //[0] is the ANGLE
+                if(gRawUSANSisQvalues==1)
+                        // in this mode, each data point is collected for a different time
+                        countTime = v2 * 60             // convert MIN to seconds
+                endif
+                
                 
                 FReadLine refNum,buffer //assume a 2nd line is there, w/16 values
@@ -152 +167 @@
                 endif
                 
+                CtTime[numlinesloaded] = countTime
+                
                 numlinesloaded += 1             //2 lines in file read, one "real" line of data
         while(1)
@@ -158 +175 @@
         //Print "numlines = ",numlinesloaded
         //trim the waves to the correct number of points
-        Redimension/N=(numlinesloaded) Angle,MonCts,DetCts,TransCts,ErrDetCts
+        Redimension/N=(numlinesloaded) Angle,MonCts,DetCts,TransCts,ErrDetCts,CtTime
         
         //remove LF from end of filelabel

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

@@ -456 +456 @@
 // note that trans detector counts are NOT normalized to 1E6 mon cts (not necessary)
 //
+// 28 Mar 2019
+//  converted CtTime to be a wave, loaded in with the raw data
+// for old-style data, this is a constant value. for new q-value data, each point
+// can be counted for a different time.
+//
 Function Convert2Countrate(type,doNorm)
         String type
@@ -463 +468 @@
         
         String noteStr = note($(USANSFolder+":"+Type+":DetCts"))
-        Variable ctTime
-        ctTime = NumberByKey("TIMEPT",noteStr,":",";")
+        
+        Variable ctTimeVal
+//      Variable ctTime
+//      ctTime = NumberByKey("TIMEPT",noteStr,":",";")
+
 //      print ctTime
         //normalize by counting time
@@ -471 +479 @@
         Wave MonCts = $(USANSFolder+":"+Type+":MonCts")
         Wave TransCts = $(USANSFolder+":"+Type+":TransCts")
+        Wave ctTime = $(USANSFolder+":"+Type+":ctTime")
         
         detCts /= ctTime
@@ -486 +495 @@
         
         //adjust the note (now on basis of 1 second)
-        ctTime = 1
-        noteStr = ReplaceNumberByKey("TIMEPT",noteStr,ctTime,":",";")
+        ctTimeVal = 1
+        noteStr = ReplaceNumberByKey("TIMEPT",noteStr,ctTimeVal,":",";")
         Note/K detCts
         Note detCts,noteStr

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

@@ -153 +153 @@
 ////////////////////
         
-        prob_i = trans*thick*pixSizeX*pixSizeY/(sdd)^2*tmpInten                 //probability of a neutron in q-bin(i) 
+        MultiThread prob_i = trans*thick*pixSizeX*pixSizeY/(sdd)^2*tmpInten                     //probability of a neutron in q-bin(i) 
                 
         tmpInten = (imon)*prob_i                //tmpInten is not the model calculation anymore!!
@@ -159 +159 @@
 
 /// **** can I safely assume a Gaussian error in the count rate??
-        tmpSig = sqrt(tmpInten)         // corrected based on John's memo, from 8/9/99
-
-        tmpInten += gnoise(tmpSig)
-        tmpInten = (tmpInten[p][q] < 0) ? 0 : tmpInten[p][q]                    // MAR 2013 -- is this the right thing to do
+        MultiThread tmpSig = sqrt(tmpInten)             // corrected based on John's memo, from 8/9/99
+
+        MultiThread tmpInten += gnoise(tmpSig)
+        MultiThread tmpInten = (tmpInten[p][q] < 0) ? 0 : tmpInten[p][q]                        // MAR 2013 -- is this the right thing to do
         tmpInten = trunc(tmpInten)
                 
@@ -205 +205 @@
         // loop over the array and calculate the values - this is done as a wave assignment
 // TODO -- be sure that it's p,q -- or maybe p+1,q+1 as used in WriteQIS.ipf    
-        qTot = VC_CalcQval(p,q,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
-        qx = VC_CalcQX(p,q,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
-        qy = VC_CalcQY(p,q,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
-        qz = VC_CalcQZ(p,q,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
+        MultiThread qTot = VC_CalcQval(p,q,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
+        MultiThread     qx = VC_CalcQX(p,q,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
+        MultiThread     qy = VC_CalcQY(p,q,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
+        MultiThread     qz = VC_CalcQZ(p,q,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
         
         return(0)
@@ -411 +411 @@
 //
 //
-Function VC_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
+Threadsafe Function VC_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
         Variable xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY
         
@@ -438 +438 @@
 // now properly accounts for qz
 //
-Function VC_CalcQX(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
+Threadsafe Function VC_CalcQX(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
         Variable xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY
 
@@ -468 +468 @@
 // now properly accounts for qz
 //
-Function VC_CalcQY(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
+Threadsafe Function VC_CalcQY(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
         Variable xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY
         
@@ -497 +497 @@
 // not actually used, but here for completeness if anyone asks
 //
-Function VC_CalcQZ(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
+Threadsafe Function VC_CalcQZ(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
         Variable xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY