Changeset 573 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_Utils.ipf

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:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_Utils.ipf (modified) (4 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_Utils.ipf

@@ -32 +32 @@
 
         Variable/G root:myGlobals:apOff = 5.0           // (cm) distance from sample aperture to sample position
+
+        // changing behavior specific to ILL correction of data
+        Variable/G root:myGlobals:gDoDetectorEffCorr = 0                                //default state is ==1
+        Variable/G root:myGlobals:gDoDetectorEffCorrILL = 1                     //new global switch
+
 
 End
@@ -94 +99 @@
         v_lambda = lambdaWidth^2/6.0
         
-        if(usingLenses==1)                      //SRK 2007
+//      if(usingLenses==1)                      //SRK 2007
+        if(usingLenses != 0)                    //SRK 2008 allows for the possibility of different numbers of lenses in header
                 v_b = 0.25*(S1*L2/L1)^2 +0.25*(2/3)*(lambdaWidth/lambda)^2*(S2*L2/lp)^2         //correction to 2nd term
         else
@@ -142 +148 @@
 // - called by CircSectAvg.ipf, RectAnnulAvg.ipf, and ProtocolAsPanel.ipf
 //
-// fileStr is passed as TextRead[3] and is the filename
-// detStr is passed as TextRead[9] and is an identifier for the detector
+// fileStr is passed as TextRead[3]
+// detStr is passed as TextRead[9]
+//
+// *** as of Jan 2008, depricated. Now detector pixel sizes are read from the file header
+// rw[10] = x size (mm); rw[13] = y size (mm)
 //
 // depricated - pixel dimensions are read directly from the file header
@@ -963 +972 @@
         return("Function Empty")
 End
-