Changeset 1148 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MaskUtils.ipf

Timestamp:

Apr 30, 2019 12:17:29 PM (3 years ago)

Author:

srkline

Message:

added a batch patch routine to correct the sample aperture shape and size since it may be incorrectly written by NICE

defined the sector angles to match the SANS definition and updated the associated logic for the averaging and sector display

updated sorting of the file catalog to allow sorting by SDD_F and countRate_F. Also added a second sort key to keep the run numbers in order whenever sorting any other column.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_MaskUtils.ipf (modified) (2 diffs)

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

@@ -1089 +1089 @@
                 Variable/G root:Packages:NIST:VSANS:Globals:Mask:gSectorAngle = 30
                 Variable/G root:Packages:NIST:VSANS:Globals:Mask:gSectorDQ = 10
+                
+                // check for a mask, if not present, generate a default mask
+                String str="FT"
+                wave/Z maskW = $("root:Packages:NIST:VSANS:MSK:entry:instrument:detector_"+str+":data") 
+                if(!WaveExists(maskW))
+                        V_GenerateDefaultMask()
+                endif
                         
                 Execute "V_Display_Det_Panels()"
@@ -1129 +1136 @@
         SetVariable setvar1,limits={0,1,0.001},value=root:Packages:NIST:VSANS:Globals:Mask:gAnnularDQ
         SetVariable setvar2,pos={200,40},size={140,23},title="Sector Angle (deg)"
-        SetVariable setvar2,limits={0,359,1},value=root:Packages:NIST:VSANS:Globals:Mask:gSectorAngle
+        SetVariable setvar2,limits={-90,90,1},value=root:Packages:NIST:VSANS:Globals:Mask:gSectorAngle
         SetVariable setvar3,pos={200,70},size={140,23},title="Sector (+/-) (deg)"
-        SetVariable setvar3,limits={0,359,1},value=root:Packages:NIST:VSANS:Globals:Mask:gSectorDQ
+        SetVariable setvar3,limits={0,90,1},value=root:Packages:NIST:VSANS:Globals:Mask:gSectorDQ
 
         PopupMenu popup4,pos={200,100},size={90,23.00},title="Sector Side(s)"//,proc=V_DummyPopMenuProc