Changeset 1192 for sans

Timestamp:

Aug 13, 2019 2:39:40 PM (3 years ago)

Author:

srkline

Message:

added comments in NCNR_Utils identifying the proper instrument prefix values for each instrument

Saving individual data sets from VSANS will now properly ignore the back detector (if preference set) and will handle all of the current binning types.

In the preferences, the bin width (as a multiple of pixels) is now active. This setting is a multiple of the natural deltaQ of one tube width.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• SANS/NCNR_Utils.ipf (modified) (1 diff)
• VSANS/VC_DetectorBinning_Utils.ipf (modified) (2 diffs)
• VSANS/V_Protocol_Reduction.ipf (modified) (2 diffs)
• VSANS/V_Write_VSANS_QIS.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf

@@ -1935 +1935 @@
         // a single digit -> string "3" to identify the proper wave in the lookup table
         
+        // CGB is the three character identifier for the NGB30 SANS instrument
+        // NGB is the 10m SANS instrument at NGB
+        // NGA does not exist
+        // NG5 hasn't existed for years
+        // NG3 is used when old NG3SANS data is processed (pre-instrument move)
+        
         attenNo = round(attenNo)
         

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

@@ -707 +707 @@
         String folderStr,detStr
 
+        NVAR binWidth = root:Packages:NIST:VSANS:Globals:gBinWidth
+
         Variable isVCALC
         if(cmpstr(folderStr,"VCALC") == 0)
@@ -743 +745 @@
                 Print "Reset delta Q for binning the back detector to 4x pix = ",delQ
         endif
+        
+        // multiply the deltaQ by the binWidth (=multiple of pixels)
+        // this defaults to 1, and is set in VSANS preferences
+        delQ *= binWidth
         
         // set the global

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

@@ -3286 +3286 @@
         String saveType = StringByKey("SAVE",avgStr,"=",";")            //does user want to save data?
 
+        NVAR gIgnoreBackDet = root:Packages:NIST:VSANS:Globals:gIgnoreDetB
+
+
         If( (cmpstr(saveType[0,2],"Yes")==0) && (cmpstr(av_type,"none") != 0) )         
                 //then save
@@ -3366 +3369 @@
                                         // remove the q=0 point from the back detector, if it's there
                                         // does not trim any other points from the data
-                                        V_RemoveQ0_B(activeType)
+                                        if(!gIgnoreBackDet)
+                                                V_RemoveQ0_B(activeType)
+                                        endif
 //                                      V_Write1DData_ITX("root:Packages:NIST:VSANS:",activeType,newFileName,binType)
 

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

@@ -290 +290 @@
         
         switch(binType)
-                case 1:         // 9 sets = 27 waves!  ksBinType1
+                case 1:         // 9 sets 
                         detList = ksBinType1
-                        
                         break
                 case 2:         // 5 sets
@@ -300 +299 @@
                         detList = ksBinType3
                         break
-                case 4:         // 9 sets
+                case 4:         // 5 sets
                         detList = ksBinType4
                         break
-                                        
+                case 5:         // 4 sets
+                        detList = ksBinType5
+                        break
+                case 6:         // 3 sets
+                        detList = ksBinType6
+                        break
+                case 7:         // 4 sets
+                        detList = ksBinType7
+                        break
+                                                                
                 default:
                 // do nothing, just close