Ignore:
Timestamp:
Jan 5, 2018 10:32:55 AM (5 years ago)
Author:
srkline
Message:

more utilities and bug fixes to handle:
(1) generation of DIV files
(2) generation and loading of slit-smeared VSANS data sets

Loading of VSANS data sets and generating the resolution smearing matrix required adding a conditional compile statement to the PlotUtilsMacro? file, to distinguish VSANS data - crudely done now by checking to see that VSANS is defined (which will NOT be the case for a "normal" Analysis experiment. This will need to be revisited in the future.

File:
1 edited

Legend:

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

    r1076 r1078  
    160160// both beam conditions (+/- 0.0 mm). FTB was +/- 0.8 mm, MTB +/- 2 mm 
    161161        if(cmpstr(detStr,"FL") == 0 || cmpstr(detStr,"FR") == 0) 
    162                 gap = 3.2               //mm 
     162                gap = 3.8               //mm (measured, JB 1/4/18) 
    163163        endif 
    164164        if(cmpstr(detStr,"FT") == 0 || cmpstr(detStr,"FB") == 0) 
     
    166166        endif 
    167167        if(cmpstr(detStr,"ML") == 0 || cmpstr(detStr,"MR") == 0) 
    168                 gap = 5.4               //mm 
     168                gap = 5.9               //mm (measured, JB 1/4/18) 
    169169        endif 
    170170        if(cmpstr(detStr,"MT") == 0 || cmpstr(detStr,"MB") == 0) 
     
    12281228                Wave data_err = V_getDetectorDataErrW("ABS",detStr) 
    12291229                 
    1230                 data *= s1*s2*s3*s4 
     1230                data *= scale 
    12311231                data_err = sqrt(scale^2*data_err^2 + scale^2*data^2*(kappa_err^2/s_izero^2 +trans_err^2/w_trans^2)) 
    12321232        endfor 
    12331233         
    12341234        //********* 15APR02 
    1235         // DO NOT correct for atenuators here - the COR step already does this, putting all of the data one equal 
     1235        // DO NOT correct for atenuators here - the COR step already does this, putting all of the data on equal 
    12361236        // footing (zero atten) before doing the subtraction. 
    12371237         
Note: See TracChangeset for help on using the changeset viewer.