Changeset 1249 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_UtilityProcedures.ipf

Timestamp:

Apr 1, 2020 11:54:01 AM (2 years ago)

Author:

srkline

Message:

minor changes - can't find the diff command in TortoiseSVN...

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_UtilityProcedures.ipf (modified) (4 diffs)

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

@@ -622 +622 @@
         Variable a2_to_GV,sam_to_GV,sdd,l2
         sdd = VC_getSDD(detStr)                 //sample pos to detector
+        sdd += VCALC_getTopBottomSDDSetback(detStr)             //returns zero for L/R
         ControlInfo/W=VCALC VCALCCtrl_1d
         a2_to_GV = V_Value
@@ -661 +662 @@
         Variable a2_to_GV,sam_to_GV,sdd
         sdd = VC_getSDD(detStr)                 //sample pos to detector
+        sdd += VCALC_getTopBottomSDDSetback(detStr)             //returns zero for L/R
         ControlInfo/W=VCALC VCALCCtrl_1d
         a2_to_GV = V_Value
@@ -736 +738 @@
         sdd = V_Value
         
-        sdd += VCALC_getTopBottomSDDSetback(detStr)
+        // MAR 2020 -- don't add in the setback, ask for it when needed
+//      sdd += VCALC_getTopBottomSDDSetback(detStr)
         
         // VCALCCtrl_1e is Sample Pos to Gate Valve (cm)
@@ -791 +794 @@
                         break           
                 default:
-                        Print "no case matched in VC_getSDD()"
+                        Print "no case matched in VC_getGateValveToDetDistance()"
         endswitch