Changeset 807 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/USANS_Includes_v230.ipf

Timestamp:

Jun 10, 2011 2:03:45 PM (12 years ago)

Author:

srkline

Message:

Initial separation of facility-specific initialization from the USANS reduction procedures. This is being done to enable the KIST-USANS instrument to use the NCNR reduction scheme. KIST will duplicate the .bt5 file structure but use a different extension.

For this, files for KIST have been created for USANS-specifc, and for some SANS-specific procedures that are entangled with the XML writing and with the USANS simulator.

Corresponding changes (new U_NCNR_Utils) have been added for NCNR-specific USANS initialization.

More will need to be done to disentangle the U_CALC, but at a later date. See ticket #334.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/USANS_Includes_v230.ipf (modified) (4 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/USANS_Includes_v230.ipf

@@ -2 +2 @@
 #pragma version=2.20
 #pragma IgorVersion=6.1
+
+
+// to properly set up the template for other facility reduction templates, 
+// function NCNR_USANS() must exist here in the Includes file.
+//
+Function NCNR_USANS()
+        //does nothing but define NCNR_USANS()
+        return(0)
+End
+
 
 //*************
@@ -9 +19 @@
 //
 
+
 #include "BT5_Loader",version >= 2.20   
 #include "COR_Graph",version >= 2.20                    
 #include "Main_USANS",version >= 2.20   
 #include "PlotUtilsMacro_v40",version >= 2.20
-#include "NIST_XML_v40"
+#include "NIST_XML_v40"                                 //cansas file writer
 #include "USANS_SlitSmearing_v40"       
 #include "WriteUSANSData",version >= 2.20       
@@ -21 +32 @@
 #include "GaussUtils_v40"                               //added Oct 2008 for unified file loading
 #include "BT5_AddFiles"                                 //Oct 2009 to add raw data files
+#include "NCNR_Utils"                                   //needed for NIST_XML
+#include "U_NCNR_Utils"                                 //USANS-specific initialization
+
 
 // USANS simulation and required procedures
@@ -29 +43 @@
 #include "NCNR_DataReadWrite"
 #include "SANS_Utilities"
-#include "NCNR_Utils"
 #include "MultipleReduce"
 #include "WriteQIS"