Changeset 1110 for sans

Timestamp:

Jul 5, 2018 12:09:24 PM (5 years ago)

Author:

srkline

Message:

minor changes to fix a few bugs when working with older data files.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_DetectorCorrections.ipf (modified) (1 diff)
• V_Marquee_Operations.ipf (modified) (2 diffs)
• V_MaskUtils.ipf (modified) (1 diff)

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

@@ -1390 +1390 @@
 Function V_ShiftBackDetImage(w,adjW)
         Wave w,adjW
+
+// this is necessary for some old data with the 150x150 back (dummy) panel
+        NVAR gIgnoreDetB = root:Packages:NIST:VSANS:Globals:gIgnoreDetB
+        if(gIgnoreDetB == 1)
+                adjW=w
+                return(0)
+        endif
         
         adjW=0

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

@@ -61 +61 @@
 
                 count = V_SumCountsInBox(x1,x2,y1,y2,ct_err,gCurDispType,detStr)
-                
-                Print "counts = ",count
+
+                
+                Print "total counts = ",count
                 Print "err/counts = ",ct_err/count
-
+                print "average counts per pixel = ",count/(x2-x1)/(y2-y1)
         endif
 End
@@ -266 +267 @@
 End
 
-Proc pV_SumCountsInBox_Cmd(x1,x2,y1,y2,type,detStr) : GraphMarquee
+Proc pV_SumCountsInBox_Cmd(x1,x2,y1,y2,type,detStr) 
         Variable x1=280,x2=430,y1=350,y2=1020
         String type="RAW",detStr="B"

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

@@ -910 +910 @@
                 NewDataFolder/O/S root:Packages:NIST:VSANS:MSK:entry:instrument:detector_B      
                         Make/O/I/N=(680,1656)   data    = 0
-                        data[][0,5] = 1
-                        data[][1650,1655] = 1
-                        data[0,5][] = 1
-                        data[675,679][] = 1
+                        data[][0,38] = 1
+                        data[][1548,1655] = 1
+                        data[0,10][] = 1
+                        data[669,679][] = 1
                 NewDataFolder/O/S root:Packages:NIST:VSANS:MSK:entry:instrument:detector_MR             
                         Make/O/I/N=(48,128)     data    = 0