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/FACILITY_Utils.ipf

    r572 r573  
    9292        v_lambda = lambdaWidth^2/6.0 
    9393         
    94         if(usingLenses==1)                      //SRK 2007 
     94//      if(usingLenses==1)                      //SRK 2007 
     95        if(usingLenses != 0)                    //SRK 2008 allows for the possibility of different numbers of lenses in header 
    9596                v_b = 0.25*(S1*L2/L1)^2 +0.25*(2/3)*(lambdaWidth/lambda)^2*(S2*L2/lp)^2         //correction to 2nd term 
    9697        else 
     
    138139//Global values are set in the Initialize procedure 
    139140// 
     141// 
    140142// - called by CircSectAvg.ipf, RectAnnulAvg.ipf, and ProtocolAsPanel.ipf 
    141143// 
    142 // fileStr is passed as TextRead[3] and is the filename 
    143 // detStr is passed as TextRead[9] and is an identifier for the detector 
     144// fileStr is passed as TextRead[3] 
     145// detStr is passed as TextRead[9] 
     146// 
     147// *** as of Jan 2008, depricated. Now detector pixel sizes are read from the file header 
     148// rw[10] = x size (mm); rw[13] = y size (mm) 
    144149// 
    145150// depricated - pixel dimensions are read directly from the file header 
Note: See TracChangeset for help on using the changeset viewer.