Changeset 1249 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Q.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_DetectorBinning_Q.ipf (modified) (8 diffs)

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

@@ -188 +188 @@
         V_putDet_beam_center_y("VCALC","FL",yCtr)
 
-        SDD = VC_getSDD("FL")           // SDD [cm] - INCLUDES offset for TB
+        SDD = VC_getSDD("FL")           // SDD [cm] - does not include setback
                 
 //      VC_Detector_2Q(det_FL,qTot_FL,qx_FL,qy_FL,qz_FL,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY)
@@ -245 +245 @@
         V_putDet_beam_center_y("VCALC","FR",yCtr)       
         
-        SDD = VC_getSDD("FR")           // SDD [cm] - INCLUDES offset for TB
+        SDD = VC_getSDD("FR")           // SDD [cm] - does not include setback
         
 //      VC_Detector_2Q(det_FR,qTot_FR,qx_FR,qy_FR,qz_FR,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY)
@@ -299 +299 @@
         V_putDet_beam_center_y("VCALC","FT",yCtr)
 
-        SDD = VC_getSDD("FT")           // SDD [cm] - INCLUDES offset for TB
+        SDD = VC_getSDD("FT")           // SDD [cm] - does not include setback
+        SDD += VCALC_getTopBottomSDDSetback("FT")
                   
         // global sdd_offset is in (mm), convert to meters here for the Q-calculation
@@ -353 +354 @@
         V_putDet_beam_center_y("VCALC","FB",yCtr)
 
-        SDD = VC_getSDD("FB")           // SDD [cm] - INCLUDES offset for TB
+        SDD = VC_getSDD("FB")           // SDD [cm] - does not include setback
+        SDD += VCALC_getTopBottomSDDSetback("FB")
                 
         // global sdd_offset is in (mm), convert to meters here for the Q-calculation
@@ -694 +696 @@
         V_putDet_beam_center_y("VCALC","ML",yCtr)
 
-        SDD = VC_getSDD("ML")           //SDD [cm] - INCLUDES offset for TB
+        SDD = VC_getSDD("ML")           //SDD [cm] - does not include setback
         
 //      VC_Detector_2Q(det_ML,qTot_ML,qx_ML,qy_ML,qz_ML,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY)
@@ -755 +757 @@
         V_putDet_beam_center_y("VCALC","MR",yCtr)
 
-        SDD = VC_getSDD("MR")           //SDD [cm] - INCLUDES offset for TB
+        SDD = VC_getSDD("MR")           //SDD [cm] does not include setback
         
 //      VC_Detector_2Q(det_MR,qTot_MR,qx_MR,qy_MR,qz_MR,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY)
@@ -809 +811 @@
         V_putDet_beam_center_y("VCALC","MT",yCtr)
 
-        SDD = VC_getSDD("MT")           //SDD [cm] - INCLUDES offset for TB
+        SDD = VC_getSDD("MT")           //SDD [cm] - does not include setback
+        SDD += VCALC_getTopBottomSDDSetback("MT")
         
         // global sdd_offset is in (mm), convert to meters here for the Q-calculation  
@@ -863 +866 @@
         V_putDet_beam_center_y("VCALC","MB",yCtr)
 
-        SDD = VC_getSDD("MB")           //SDD [cm] - INCLUDES offset for TB
+        SDD = VC_getSDD("MB")           //SDD [cm] - does not include setback
+        SDD += VCALC_getTopBottomSDDSetback("MB")
         
                 // global sdd_offset is in (mm), convert to meters here for the Q-calculation