Ignore:
Timestamp:
Oct 4, 2019 8:56:43 AM (3 years ago)
Author:
srkline
Message:

Corrections to the NGB30mSANS attenuator tables (for 3A data only).

Corrections to the sample aperture units on VSANS (change in NICE on 5/22/19).

Additions for the super white beam mode on VSANS - still in progress.

File:
1 edited

Legend:

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

    r1203 r1219  
    172172                S2 = VC_sampleApertureDiam()*10         // convert cm to mm 
    173173        else 
    174         // I'm trusting [cm] is in the RAW data file 
     174        // I'm trusting [cm] is in the RAW data file, or returned from the function if the date is prior to 5/22/19 
    175175                S2 = V_getSampleAp2_size(folderStr)*10          // sample ap 1 or 2? 2 = the "external", convert to [mm] 
    176176        endif 
     
    260260// narrowSlit_whiteBeam 
    261261 
     262// TODO: this is a messy way to identify the super white beam condition, and it needs to be  
     263// done in a cleaner fashion (through IdentityCollimation) once NICE catches up 
     264 
     265        String monoType = V_IdentifyMonochromatorType(folderStr) 
     266         
    262267 
    263268        if(cmpstr(collimationStr,"pinhole") == 0) 
    264                 //nothing to change      
     269                if(cmpstr(monoType,"super_white_beam")==0) 
     270                        lambdaWidth = 0 
     271                endif 
     272                //otherwise, nothing to change   
    265273        endif 
    266274 
     
    321329        //Start resolution calculation 
    322330        a2 = S1*L2/L1 + S2*(L1+L2)/L1 
    323         q_small = 2.0*Pi*(BS-a2)*(1.0-lambdaWidth)/(lambda*L2) 
     331//      q_small = 2.0*Pi*(BS-a2)*(1.0-lambdaWidth)/(lambda*L2) 
    324332        lp = 1.0/( 1.0/L1 + 1.0/L2) 
    325333 
Note: See TracChangeset for help on using the changeset viewer.