Ignore:
Timestamp:
Jun 21, 2018 9:42:24 AM (4 years ago)
Author:
srkline
Message:

changes mostly to VCALC to add in what bits of information I have about the instrument dimensions. Added in stubs (based on NG3 SANS) for the beam intensity. Added in a preset condition for Front+Middle. Still need a more uniform way to do this.

File:
1 edited

Legend:

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

    r1105 r1108  
    265265                // and for the back detector "B" 
    266266                Make/O/D/N=3 tmpCalibX,tmpCalibY 
    267                 tmpCalibX[0] = VCALC_getPixSizeX(detStr)*10                     // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm] 
     267                tmpCalibX[0] = VCALC_getPixSizeX(detStr)                        // pixel size in [cm]  VCALC_getPixSizeX(detStr) is [cm] 
    268268                tmpCalibX[1] = 1 
    269269                tmpcalibX[2] = 10000 
    270                 tmpCalibY[0] = VCALC_getPixSizeY(detStr)*10                     // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm] 
     270                tmpCalibY[0] = VCALC_getPixSizeY(detStr)                        // pixel size in [cm]  VCALC_getPixSizeX(detStr) is [cm] 
    271271                tmpCalibY[1] = 1 
    272272                tmpcalibY[2] = 10000 
     
    277277        if(cmpstr(detStr,"B") == 0) 
    278278                V_NonLinearCorrection_B("VCALC",data,tmpCalibX,tmpCalibY,detStr,destPath) 
     279                // beam center is in pixels, so use the old routine 
     280                V_ConvertBeamCtr_to_mmB("VCALC","B",destPath) 
    279281        else 
    280282                V_NonLinearCorrection("VCALC",data,tmpCalib,tube_width,detStr,destPath) 
     
    285287        NVAR gUseNonLinearDet = root:Packages:NIST:VSANS:VCALC:gUseNonLinearDet 
    286288 
    287         if(kBCTR_CM) 
     289        if(kBCTR_CM && cmpstr(detStr,"B") != 0) 
    288290                if(gUseNonLinearDet && WaveExists(data_realDistX) && WaveExists(data_realDistY)) 
    289291                        // beam ctr is in cm already 
Note: See TracChangeset for help on using the changeset viewer.