Ignore:
Timestamp:
Apr 16, 2018 10:50:33 AM (4 years ago)
Author:
srkline
Message:

Added two model functions for white beam smearing.

Many other small changes for processing of the back detector, shuffling of VSANS menu items, and consistent naming of V_ procedures.

File:
1 edited

Legend:

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

    r1093 r1095  
    670670// detStr is the panel identifer "ML", etc. 
    671671// 
    672 Function SetDeltaQ(folderStr,detStr) 
     672Function V_SetDeltaQ(folderStr,detStr) 
    673673        String folderStr,detStr 
    674674 
     
    12091209                Print "Mask file not found for at least one detector - so all data is used" 
    12101210        endif 
     1211         
     1212        NVAR gIgnoreDetB = root:Packages:NIST:VSANS:Globals:gIgnoreDetB 
     1213        if(gIgnoreDetB && cmpstr(type,"B") == 0) 
     1214                maskMissing = 1 
     1215                Print "Mask skipped for B due to possible mismatch (Panel B ignored in preferences)" 
     1216        endif 
    12111217 
    12121218        Variable mask_val 
     
    14321438// 
    14331439// so I'm trusting [cm] is in the file 
    1434         S2 = V_getSampleAp2_size(folderStr)*10          // sample ap 1 or 2? 2 = the "external", convert to [cm] 
     1440        S2 = V_getSampleAp2_size(folderStr)*10          // sample ap 1 or 2? 2 = the "external", convert to [mm] 
    14351441         
    14361442// L1 = source to sample distance [m]  
     
    14441450         
    14451451// BS = beam stop diameter [mm] 
    1446         //BS = V_getBeamStopC2_size(folderStr)          // TODO: what are the units? which BS is in? carr2, carr3, back, none? 
     1452//TODO:? which BS is in? carr2, carr3, none? 
     1453// -- need to check the num_beamstops field, then description, then shape/size or shape/height and shape/width 
     1454// 
     1455// TODO: the values in the file are incorrect!!! BS = 1000 mm diameter!!! 
     1456//      BS = V_getBeamStopC2_size(folderStr)            // Units are [mm]  
    14471457        BS = 25.4                       //TODO hard-wired value 
    14481458         
     
    14651475 
    14661476// For white beam data, the wavelength distribution can't be represented as a gaussian, but all of the other  
    1467 //  geometric corrections still apply. Passing zero for the lambdaWidth will return the grometry contribution, 
     1477//  geometric corrections still apply. Passing zero for the lambdaWidth will return the geometry contribution, 
    14681478//  as long as the wavelength can be handled separately. It appears to be correct to do as a double integral, 
    1469 // with the inner(lambda) calculated first, then the outer(geometry). 
     1479//  with the inner(lambda) calculated first, then the outer(geometry). 
    14701480// 
    14711481 
Note: See TracChangeset for help on using the changeset viewer.