Ignore:
Timestamp:
May 22, 2018 3:29:01 PM (5 years ago)
Author:
srkline
Message:

bug fixes for the back detector dimensions and beam center (pixels)

File:
1 edited

Legend:

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

    r1095 r1101  
    272272        endif 
    273273 
    274 Print "***Cal_X and Cal_Y for Back are using default values instead of file values ***" 
    275  
    276                 cal_x[0] = VCALC_getPixSizeX(detStr)*10                 // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm] 
    277                 cal_x[1] = 1 
    278                 cal_x[2] = 10000 
    279                 cal_y[0] = VCALC_getPixSizeY(detStr)*10                 // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm] 
    280                 cal_y[1] = 1 
    281                 cal_y[2] = 10000 
     274Print "***Cal_X and Cal_Y for Back are using file values ***" 
     275 
     276//              cal_x[0] = VCALC_getPixSizeX(detStr)*10                 // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm] 
     277//              cal_x[1] = 1 
     278//              cal_x[2] = 10000 
     279//              cal_y[0] = VCALC_getPixSizeY(detStr)*10                 // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm] 
     280//              cal_y[1] = 1 
     281//              cal_y[2] = 10000 
    282282 
    283283         
     
    300300//      Wave cal_y = V_getDet_cal_y(folder,detStr) 
    301301         
    302         data_realDistX[][] = cal_x[0]*p 
    303         data_realDistY[][] = cal_y[0]*q 
     302        data_realDistX[][] = cal_x[0]*p*10              // cal_x and cal_y are in [cm], need mm 
     303        data_realDistY[][] = cal_y[0]*q*10 
    304304         
    305305        return(0) 
     
    551551         
    552552         
    553         DoAlert 0,"Error - Beam center is being interpreted as pixels, but needs to be in cm. V_ConvertBeamCtr_to_mmB()" 
     553//      DoAlert 0,"Error - Beam center is being interpreted as pixels, but needs to be in cm. V_ConvertBeamCtr_to_mmB()" 
    554554         
    555555        Wave data_realDistX = $(destPath + ":entry:instrument:detector_"+detStr+":data_realDistX") 
     
    14331433        String destPath="" 
    14341434 
     1435        NVAR gIgnoreDetB = root:Packages:NIST:VSANS:Globals:gIgnoreDetB 
     1436        if(cmpstr(detStr,"B")==0 && gIgnoreDetB) 
     1437                return(0) 
     1438        endif 
     1439 
     1440 
    14351441        if(WaveExists(data) == 0) 
    14361442                Print "The data wave does not exist in V_DIVCorrection()" 
Note: See TracChangeset for help on using the changeset viewer.