Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_UtilityProcedures.ipf

    r1242 r1249  
    622622        Variable a2_to_GV,sam_to_GV,sdd,l2 
    623623        sdd = VC_getSDD(detStr)                 //sample pos to detector 
     624        sdd += VCALC_getTopBottomSDDSetback(detStr)             //returns zero for L/R 
    624625        ControlInfo/W=VCALC VCALCCtrl_1d 
    625626        a2_to_GV = V_Value 
     
    661662        Variable a2_to_GV,sam_to_GV,sdd 
    662663        sdd = VC_getSDD(detStr)                 //sample pos to detector 
     664        sdd += VCALC_getTopBottomSDDSetback(detStr)             //returns zero for L/R 
    663665        ControlInfo/W=VCALC VCALCCtrl_1d 
    664666        a2_to_GV = V_Value 
     
    736738        sdd = V_Value 
    737739         
    738         sdd += VCALC_getTopBottomSDDSetback(detStr) 
     740        // MAR 2020 -- don't add in the setback, ask for it when needed 
     741//      sdd += VCALC_getTopBottomSDDSetback(detStr) 
    739742         
    740743        // VCALCCtrl_1e is Sample Pos to Gate Valve (cm) 
     
    791794                        break            
    792795                default: 
    793                         Print "no case matched in VC_getSDD()" 
     796                        Print "no case matched in VC_getGateValveToDetDistance()" 
    794797        endswitch 
    795798 
Note: See TracChangeset for help on using the changeset viewer.