Changeset 588 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WorkFileUtils.ipf

Timestamp:

Nov 2, 2009 10:55:37 AM (13 years ago)

Author:

srkline

Message:

Added conditional compile instructions to some reduction procedure files that have only minor facility-specific changes. These changes are not significant enough to merit a separate facility file that must be maintained with essentially duplicate functions.

#define SYMBOL was attempted, but did not work since the symbols weren't actually defined until after the compile... and I couldn't figure out how to define - then compile. in additon, the table is static until Igor is quit - so multiple symbols could be defined, and compiling would fail.

So... the method now that appears to work is to put a dummy function for each facility in its facility specific "Includes" file. Then the conditional compilation checks for exists("function").

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WorkFileUtils.ipf (modified) (5 diffs)

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

@@ -141 +141 @@
         dscale = 1/(1-deadTime*cntrate)
 
-#ifdef ILL_D22
+#if (exists("ILL_D22")==6)
         Variable tubeSum
         // for D22 detector might need to use cntrate/128 as it is the tube response
@@ -161 +161 @@
         //update totals by adding RAW values to the local ones (write to work header at end of function)
         total_mon += raw_reals[0]
-#ifdef ILL_D22
+#if (exists("ILL_D22")==6)
         total_det += sum(data,-inf,inf)                 //add the newly scaled detector array
 #else
@@ -311 +311 @@
         dscale = 1/(1-deadTime*cntrate)
         
-#ifdef ILL_D22
+#if (exists("ILL_D22")==6)
         Variable tubeSum
         // for D22 detector might need to use cntrate/128 as it is the tube response
@@ -332 +332 @@
         //update totals to put in the work header (at the end of the function)
         total_mon += realsread[0]
-#ifdef ILL_D22  
+#if (exists("ILL_D22")==6)
         total_det += sum(data,-inf,inf)                 //add the newly scaled detector array
 #else
@@ -496 +496 @@
                         // so divide here to get the correct answer (5/22/08 SRK)
                         if(doEfficiency)
-#ifdef ILL_D22
+#if (exists("ILL_D22")==6)
                                 data[ii][jj]  /= DetEffCorrILL(lambda,dtdist,xd)                //tube-by-tube corrections 
                   solidAngle[ii][jj] = DetEffCorrILL(lambda,dtdist,xd)