Ignore:
Timestamp:
Feb 21, 2017 1:03:50 PM (6 years ago)
Author:
srkline
Message:

minor changes to prefix functions with "V_" to avoid conflicts with non-VSANS functions.

File:
1 edited

Legend:

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

    r1019 r1024  
    3535// -- calculate + return the error contribution? 
    3636// -- verify the error propagation 
    37 Function DeadTimeCorrectionTubes(dataW,data_errW,dtW,ctTime) 
     37Function V_DeadTimeCorrectionTubes(dataW,data_errW,dtW,ctTime) 
    3838        Wave dataW,data_errW,dtW 
    3939        Variable ctTime 
     
    7979 
    8080// test function 
    81 Function testDTCor() 
     81Function V_testDTCor() 
    8282 
    8383        String detStr = "" 
     
    9393         
    9494//      ctTime = 10 
    95         DeadTimeCorrectionTubes(w,w_err,w_dt,ctTime) 
     95        V_DeadTimeCorrectionTubes(w,w_err,w_dt,ctTime) 
    9696 
    9797End 
     
    122122// 
    123123// 
    124 Function NonLinearCorrection(dataW,coefW,tube_width,detStr,destPath) 
     124Function V_NonLinearCorrection(dataW,coefW,tube_width,detStr,destPath) 
    125125        Wave dataW,coefW 
    126126        Variable tube_width 
     
    171171// 
    172172// 
    173 Function NonLinearCorrection_B(folder,detStr,destPath) 
     173Function V_NonLinearCorrection_B(folder,detStr,destPath) 
    174174        String folder,detStr,destPath 
    175175 
     
    218218// 
    219219// 
    220 Function ConvertBeamCtr_to_mm(folder,detStr,destPath) 
     220Function V_ConvertBeamCtr_to_mm(folder,detStr,destPath) 
    221221        String folder,detStr,destPath 
    222222         
     
    276276// 
    277277// 
    278 Function ConvertBeamCtr_to_mmB(folder,detStr,destPath) 
     278Function V_ConvertBeamCtr_to_mmB(folder,detStr,destPath) 
    279279        String folder,detStr,destPath 
    280280         
     
    329329// 
    330330// TESTING ONLY 
    331 Proc MakeFakeCalibrationWaves() 
     331Proc V_MakeFakeCalibrationWaves() 
    332332        // make these in the RAW data folder, before converting to a work folder 
    333333        // - then they will be "found" by get() 
     
    338338        DoAlert 0, "Calibration waves are read in from the data file" 
    339339         
    340 //      fMakeFakeCalibrationWaves() 
     340//      V_fMakeFakeCalibrationWaves() 
    341341End 
    342342 
     
    355355// as for making the fake coefficients. 
    356356// 
    357 Function fMakeFakeCalibrationWaves() 
     357Function V_fMakeFakeCalibrationWaves() 
    358358 
    359359        Variable ii,pixSize 
     
    603603// 
    604604// 
    605 Function SolidAngleCorrection(w,w_err,fname,detStr,destPath) 
     605Function V_SolidAngleCorrection(w,w_err,fname,detStr,destPath) 
    606606        Wave w,w_err 
    607607        String fname,detStr,destPath 
     
    697697//works on the actual data array, assumes that is is already on LINEAR scale 
    698698// 
    699 Function DetCorr(data,data_err,realsread,doEfficiency,doTrans) 
     699Function V_DetCorr(data,data_err,realsread,doEfficiency,doTrans) 
    700700        Wave data,data_err,realsread 
    701701        Variable doEfficiency,doTrans 
     
    793793                                 
    794794                                // pass in the transmission error, and the error in the correction is returned as the last parameter 
    795                                 lat_corr = LargeAngleTransmissionCorr(trans,dtdist,xd,yd,trans_err,lat_err)             //moved from 1D avg SRK 11/2007 
     795                                lat_corr = V_LargeAngleTransmissionCorr(trans,dtdist,xd,yd,trans_err,lat_err)           //moved from 1D avg SRK 11/2007 
    796796                                data[ii][jj] /= lat_corr                        //divide by the correction factor 
    797797                                // 
     
    828828// 
    829829// 
    830 Function LargeAngleTransmissionCorr(trans,dtdist,xd,yd,trans_err,err) 
     830Function V_LargeAngleTransmissionCorr(trans,dtdist,xd,yd,trans_err,err) 
    831831        Variable trans,dtdist,xd,yd,trans_err,&err 
    832832 
     
    891891// 
    892892//test procedure, not called anymore 
    893 Proc AbsoluteScaling(type,c0,c1,c2,c3,c4,c5) 
     893Proc V_AbsoluteScaling(type,c0,c1,c2,c3,c4,c5) 
    894894        String type 
    895895        Variable c0=1,c1=0.1,c2=0.95,c3=0.1,c4=1,c5=32.0 
     
    905905        //call the function to do the math 
    906906        //data from "type" will be scaled and deposited in ABS 
    907         err = Absolute_Scale(type,c0,c1,c2,c3,c4,c5) 
     907        err = V_Absolute_Scale(type,c0,c1,c2,c3,c4,c5) 
    908908         
    909909        if(err) 
     
    924924        gCurDispType = Type      
    925925         
    926         fRawWindowHook() 
     926        V_fRawWindowHook() 
    927927         
    928928End 
     
    935935//w_ is the "work" file 
    936936//both are work files and should already be normalized to 10^8 monitor counts 
    937 Function Absolute_Scale(type,w_trans,w_thick,s_trans,s_thick,s_izero,s_cross,kappa_err) 
     937Function V_Absolute_Scale(type,w_trans,w_thick,s_trans,s_thick,s_izero,s_cross,kappa_err) 
    938938        String type 
    939939        Variable w_trans,w_thick,s_trans,s_thick,s_izero,s_cross,kappa_err 
     
    10521052// 
    10531053// 
    1054 Function Adjust_RAW_Attenuation(type) 
     1054Function V_Adjust_RAW_Attenuation(type) 
    10551055        String type 
    10561056 
     
    11001100//check before re-implementing 
    11011101// 
    1102 Proc DIV_a_Workfile(type) 
     1102Proc V_DIV_a_Workfile(type) 
    11031103        String type 
    11041104        Prompt type,"WORK data type",popup,"SAM;EMP;BGD;ADJ;" 
     
    11281128        String/G root:Packages:NIST:VSANS:Globals:gCurDispType=Type 
    11291129         
    1130         UpdateDisplayInformation(type) 
     1130        V_UpdateDisplayInformation(type) 
    11311131         
    11321132End 
Note: See TracChangeset for help on using the changeset viewer.