Changeset 658 for sans/Dev/trunk

Timestamp:

Apr 2, 2010 1:32:31 PM (13 years ago)

Author:

srkline

Message:

For compatibility with Jan Ilavsky's procedures, change our canSASXML.ipf file to have the same exact name. This is a file provided by Pete Jemain, and has only one function. Changing to a common name avoids a duplicate function name and failure to compile. Both versions (ours and Jan's) should be independently kept up-to-date with any (minor) changes Pete might make. Issues are unlikely.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/NIST_XML_v40.ipf (modified) (1 diff)
• Common/canSASXML.ipf (added)
• Common/cansasXML_v11.ipf (deleted)
• Reduction/SANS/HFIR_Includes_v520.ipf (modified) (1 diff)
• Reduction/SANS/Includes_ANSTO.ipf (modified) (1 diff)
• Reduction/SANS/Includes_v510.ipf (modified) (1 diff)
• Reduction/SANS/Includes_v520.ipf (modified) (1 diff)
• Reduction/SANS/Includes_v520_ILL.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

@@ -6 +6 @@
 #if( Exists("XmlOpenFile") )
 
-#include "cansasXML_v11", version >= 1.10
+#include "cansasXML", version >= 1.10
 
 // The function is called "LoadNISTXMLData" but is actually more generic

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

@@ -43 +43 @@
 #include "PlotUtilsMacro_v40"
 #include "NIST_XML_v40"
-#include "cansasXML_v11"
+#include "cansasXML"
 #include "USANS_SlitSmearing_v40"
 #include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere

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

@@ -41 +41 @@
 #include "PlotUtilsMacro_v40"
 #include "NIST_XML_v40"
-#include "cansasXML_v11"
+#include "cansasXML"
 #include "USANS_SlitSmearing_v40"
 #include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere

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

@@ -58 +58 @@
 #include "PlotManager_v40"                                              //Oct 2008 as part of unifying the loading routines
 #include "NIST_XML_v40"                                                 // - creates a cascade of dependencies to load files
-#include "cansasXML_v11"
+#include "cansasXML"
 #include "GaussUtils_v40"
 #include "USANS_SlitSmearing_v40"

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

@@ -40 +40 @@
 #include "PlotUtilsMacro_v40"
 #include "NIST_XML_v40"
-//#include "cansasXML_v11"
+//#include "cansasXML"
 #include "USANS_SlitSmearing_v40"
 #include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere

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

@@ -42 +42 @@
 #include "PlotUtilsMacro_v40"
 #include "NIST_XML_v40"
-#include "cansasXML_v11"
+#include "cansasXML"
 #include "USANS_SlitSmearing_v40"
 #include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere