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_DetectorBinning_Q.ipf

    r1247 r1249  
    188188        V_putDet_beam_center_y("VCALC","FL",yCtr) 
    189189 
    190         SDD = VC_getSDD("FL")           // SDD [cm] - INCLUDES offset for TB 
     190        SDD = VC_getSDD("FL")           // SDD [cm] - does not include setback 
    191191                 
    192192//      VC_Detector_2Q(det_FL,qTot_FL,qx_FL,qy_FL,qz_FL,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY) 
     
    245245        V_putDet_beam_center_y("VCALC","FR",yCtr)        
    246246         
    247         SDD = VC_getSDD("FR")           // SDD [cm] - INCLUDES offset for TB 
     247        SDD = VC_getSDD("FR")           // SDD [cm] - does not include setback 
    248248         
    249249//      VC_Detector_2Q(det_FR,qTot_FR,qx_FR,qy_FR,qz_FR,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY) 
     
    299299        V_putDet_beam_center_y("VCALC","FT",yCtr) 
    300300 
    301         SDD = VC_getSDD("FT")           // SDD [cm] - INCLUDES offset for TB 
     301        SDD = VC_getSDD("FT")           // SDD [cm] - does not include setback 
     302        SDD += VCALC_getTopBottomSDDSetback("FT") 
    302303                   
    303304        // global sdd_offset is in (mm), convert to meters here for the Q-calculation 
     
    353354        V_putDet_beam_center_y("VCALC","FB",yCtr) 
    354355 
    355         SDD = VC_getSDD("FB")           // SDD [cm] - INCLUDES offset for TB 
     356        SDD = VC_getSDD("FB")           // SDD [cm] - does not include setback 
     357        SDD += VCALC_getTopBottomSDDSetback("FB") 
    356358                 
    357359        // global sdd_offset is in (mm), convert to meters here for the Q-calculation 
     
    694696        V_putDet_beam_center_y("VCALC","ML",yCtr) 
    695697 
    696         SDD = VC_getSDD("ML")           //SDD [cm] - INCLUDES offset for TB 
     698        SDD = VC_getSDD("ML")           //SDD [cm] - does not include setback 
    697699         
    698700//      VC_Detector_2Q(det_ML,qTot_ML,qx_ML,qy_ML,qz_ML,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY) 
     
    755757        V_putDet_beam_center_y("VCALC","MR",yCtr) 
    756758 
    757         SDD = VC_getSDD("MR")           //SDD [cm] - INCLUDES offset for TB 
     759        SDD = VC_getSDD("MR")           //SDD [cm] does not include setback 
    758760         
    759761//      VC_Detector_2Q(det_MR,qTot_MR,qx_MR,qy_MR,qz_MR,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY) 
     
    809811        V_putDet_beam_center_y("VCALC","MT",yCtr) 
    810812 
    811         SDD = VC_getSDD("MT")           //SDD [cm] - INCLUDES offset for TB 
     813        SDD = VC_getSDD("MT")           //SDD [cm] - does not include setback 
     814        SDD += VCALC_getTopBottomSDDSetback("MT") 
    812815         
    813816        // global sdd_offset is in (mm), convert to meters here for the Q-calculation   
     
    863866        V_putDet_beam_center_y("VCALC","MB",yCtr) 
    864867 
    865         SDD = VC_getSDD("MB")           //SDD [cm] - INCLUDES offset for TB 
     868        SDD = VC_getSDD("MB")           //SDD [cm] - does not include setback 
     869        SDD += VCALC_getTopBottomSDDSetback("MB") 
    866870         
    867871                // global sdd_offset is in (mm), convert to meters here for the Q-calculation 
Note: See TracChangeset for help on using the changeset viewer.