Changeset 588 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProDiv.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/ProDiv.ipf (modified) (2 diffs)

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

@@ -76 +76 @@
         endif
 
-#ifdef QUOKKA   
+#if (exists("QUOKKA")==6)
         //corrects edge rows and columns by copy data from adjacent column
         DoAlert 1,"Do edge correction for Quokka detector?"
@@ -376 +376 @@
                         ConvertFolderToLinearScale("COR")
                         
-#ifdef QUOKKA   
+#if (exists("QUOKKA")==6)
                         //corrects edge rows and columns by copy data from adjacent column
+                        String ctrType="STO",offType="COR"
                         DoAlert 1,"Do edge correction for Quokka detector?"
                         if(V_flag==1)