Ignore:
Timestamp:
Oct 16, 2009 2:24:50 PM (13 years ago)
Author:
srkline
Message:

Merging changes of NCNR_ in to the ILL_ files. This is mostly the :Packages:NIST: data folder structure that is new since Lionel made his changes.

Removed Lionel's InitializeILL file, and moved his specific changes (just some global variables) to the initialization routine in ILL_Utils, where it belongs.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_Utils.ipf

    r572 r573  
    3232 
    3333        Variable/G root:myGlobals:apOff = 5.0           // (cm) distance from sample aperture to sample position 
     34 
     35        // changing behavior specific to ILL correction of data 
     36        Variable/G root:myGlobals:gDoDetectorEffCorr = 0                                //default state is ==1 
     37        Variable/G root:myGlobals:gDoDetectorEffCorrILL = 1                     //new global switch 
     38 
    3439 
    3540End 
     
    9499        v_lambda = lambdaWidth^2/6.0 
    95100         
    96         if(usingLenses==1)                      //SRK 2007 
     101//      if(usingLenses==1)                      //SRK 2007 
     102        if(usingLenses != 0)                    //SRK 2008 allows for the possibility of different numbers of lenses in header 
    97103                v_b = 0.25*(S1*L2/L1)^2 +0.25*(2/3)*(lambdaWidth/lambda)^2*(S2*L2/lp)^2         //correction to 2nd term 
    98104        else 
     
    142148// - called by CircSectAvg.ipf, RectAnnulAvg.ipf, and ProtocolAsPanel.ipf 
    143149// 
    144 // fileStr is passed as TextRead[3] and is the filename 
    145 // detStr is passed as TextRead[9] and is an identifier for the detector 
     150// fileStr is passed as TextRead[3] 
     151// detStr is passed as TextRead[9] 
     152// 
     153// *** as of Jan 2008, depricated. Now detector pixel sizes are read from the file header 
     154// rw[10] = x size (mm); rw[13] = y size (mm) 
    146155// 
    147156// depricated - pixel dimensions are read directly from the file header 
     
    963972        return("Function Empty") 
    964973End 
    965  
Note: See TracChangeset for help on using the changeset viewer.