Changeset 248


Ignore:
Timestamp:
Jan 23, 2008 5:06:34 PM (15 years ago)
Author:
srkline
Message:

When using lenses, the header is expected to have the number of lenses inserted. Any non-zero value will be interpreted as "lenses in" and the resolution calculation will use the calculations specific to lenses.

Location:
sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NCNR_DataReadWrite.ipf

    r247 r248  
    17071707// 
    17081708// currently, two values (0 | 1) = (no lens | yes lens) 
     1709// ideally, this field will have the actual number of lenses inserted. 
    17091710// 
    17101711// this is used in getResolution (reads the reals[]) and switches the calculation 
     
    17401741End 
    17411742 
    1742 // sets the flag to zero in the file (= 1) 
     1743// sets the flag to one in the file (= 1) 
    17431744Function HeaderToLensResolution(num)  
    17441745        Variable num     
  • sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NCNR_Utils.ipf

    r247 r248  
    110110        v_lambda = lambdaWidth^2/6.0 
    111111         
    112         if(usingLenses==1)                      //SRK 2007 
     112//      if(usingLenses==1)                      //SRK 2007 
     113        if(usingLenses != 0)                    //SRK 2008 allows for the possibility of different numbers of lenses in header 
    113114                v_b = 0.25*(S1*L2/L1)^2 +0.25*(2/3)*(lambdaWidth/lambda)^2*(S2*L2/lp)^2         //correction to 2nd term 
    114115        else 
Note: See TracChangeset for help on using the changeset viewer.