Changeset 1095 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Utils.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/VC_DetectorBinning_Utils.ipf (modified) (5 diffs)

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

@@ -670 +670 @@
 // detStr is the panel identifer "ML", etc.
 //
-Function SetDeltaQ(folderStr,detStr)
+Function V_SetDeltaQ(folderStr,detStr)
         String folderStr,detStr
 
@@ -1209 +1209 @@
                 Print "Mask file not found for at least one detector - so all data is used"
         endif
+        
+        NVAR gIgnoreDetB = root:Packages:NIST:VSANS:Globals:gIgnoreDetB
+        if(gIgnoreDetB && cmpstr(type,"B") == 0)
+                maskMissing = 1
+                Print "Mask skipped for B due to possible mismatch (Panel B ignored in preferences)"
+        endif
 
         Variable mask_val
@@ -1432 +1438 @@
 //
 // so I'm trusting [cm] is in the file
-        S2 = V_getSampleAp2_size(folderStr)*10          // sample ap 1 or 2? 2 = the "external", convert to [cm]
+        S2 = V_getSampleAp2_size(folderStr)*10          // sample ap 1 or 2? 2 = the "external", convert to [mm]
         
 // L1 = source to sample distance [m] 
@@ -1444 +1450 @@
         
 // BS = beam stop diameter [mm]
-        //BS = V_getBeamStopC2_size(folderStr)          // TODO: what are the units? which BS is in? carr2, carr3, back, none?
+//TODO:? which BS is in? carr2, carr3, none?
+// -- need to check the num_beamstops field, then description, then shape/size or shape/height and shape/width
+//
+// TODO: the values in the file are incorrect!!! BS = 1000 mm diameter!!!
+//      BS = V_getBeamStopC2_size(folderStr)            // Units are [mm] 
         BS = 25.4                       //TODO hard-wired value
         
@@ -1465 +1475 @@
 
 // For white beam data, the wavelength distribution can't be represented as a gaussian, but all of the other 
-//  geometric corrections still apply. Passing zero for the lambdaWidth will return the grometry contribution,
+//  geometric corrections still apply. Passing zero for the lambdaWidth will return the geometry contribution,
 //  as long as the wavelength can be handled separately. It appears to be correct to do as a double integral,
-// with the inner(lambda) calculated first, then the outer(geometry).
+//  with the inner(lambda) calculated first, then the outer(geometry).
 //