Changeset 684 for sans/Dev/trunk

Timestamp:

Apr 12, 2010 11:19:19 AM (13 years ago)

Author:

srkline

Message:

Fixed bug in CatVSTable for HIFR read.

Updated all of the includes to include the correct (most current) procedures.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• CatVSTable.ipf (modified) (2 diffs)
• HFIR_Includes_v520.ipf (modified) (3 diffs)
• Includes_ANSTO.ipf (modified) (2 diffs)
• Includes_Facility.ipf (modified) (3 diffs)
• Includes_v520_ILL.ipf (modified) (2 diffs)

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

@@ -223 +223 @@
 #else
 //      Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR
-        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR,GPos,gNumGuides
+        Sort GSuffix, GSuffix, GFilenames, GLabels, GDateTime, GSDD, GLambda, GCntTime, GTotCnts, GCntRate, GTransmission, GThickness, GXCenter, GYCenter, GNumAttens,GRunNumber,GIsTrans,GRot,GTemp,GField,GMCR
 #endif
 
@@ -407 +407 @@
 #endif  
 
-// number of guides, only for NCNR
+// number of guides and sample position, only for NCNR
 #if (exists("NCNR")==6)
         InsertPoints lastPoint,1,GNumGuides

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

@@ -42 +42 @@
 #include "PlotUtilsMacro_v40"
 #include "NIST_XML_v40"
-#include "cansasXML"
+//#include "cansasXML"
 #include "USANS_SlitSmearing_v40"
 #include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere
@@ -72 +72 @@
 ////#include "MultScatter_MonteCarlo_2D"                        //Oct 2008 SRK for SASCALC simulation
 
-
-//#include "TISANE"
-
-
 //AJJ Oct 2008
 #include "PlotManager_v40"
@@ -82 +78 @@
 #include "Smear_2D"             //2D resolution calculation and smearing
 
+//AJJ Nov 2009
+#include "DataSetHandling"
+#include "WriteModelData_v40"
 
 // a simple list of items to add to the Beta menu

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

@@ -41 +41 @@
 #include "PlotUtilsMacro_v40"
 #include "NIST_XML_v40"
-#include "cansasXML"
+//#include "cansasXML"
 #include "USANS_SlitSmearing_v40"
 #include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere
@@ -78 +78 @@
 #include "Smear_2D"             //2D resolution calculation and smearing
 
-
+//AJJ Nov 2009
+#include "DataSetHandling"
+#include "WriteModelData_v40"
 
 

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

@@ -37 +37 @@
 #include "NSORT"                                        version>=5.0
 #include "PatchFiles"                   version>=5.0
-#include "PlotUtils"                    version>=5.0
+//#include "PlotUtils"                  version>=5.0
+//AJJ October 2008 - switch to shared file loader
+#include "PlotUtilsMacro_v40"
+#include "NIST_XML_v40"
+//#include "cansasXML"
+#include "USANS_SlitSmearing_v40"
+#include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere
+//
 #include "ProDiv"                               version>=5.0
 #include "ProtocolAsPanel"              version>=5.0
@@ -58 +65 @@
 #include "SANS_Utilities"                                                               //new in the 29MAR07 branch
 
-// to include the analysis packages, uncomment the following
-// include statement and click "compile" at the bottom of this window.
-// ** the SANSModels menu will appear, and the packages will be 
-// available under the Macros menu as usual.
+// new in Jan 2008
+//#include "SASCALC"
+#include "CheckVersionFTP"                              //added June 2008
+//#include "MultScatter_MonteCarlo_2D"                  //Oct 2008 SRK for SASCALC simulation
 
-//#include "Analysis_SRK"
+
+//AJJ Oct 2008
+#include "PlotManager_v40"
+
+// SRK JUN2009
+#include "Smear_2D"             //2D resolution calculation and smearing
+
+//AJJ Nov 2009
+#include "DataSetHandling"
+#include "WriteModelData_v40"
+
 
 
@@ -73 +90 @@
 // menu will appear in the menubar.
 //
-Menu "SANSBeta"
+xMenu "SANSBeta"
         "FillEMPUsingSelection"
         "GuessEveryTransFiles"

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

@@ -42 +42 @@
 #include "PlotUtilsMacro_v40"
 #include "NIST_XML_v40"
-#include "cansasXML"
+//#include "cansasXML"
 #include "USANS_SlitSmearing_v40"
 #include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere
@@ -67 +67 @@
 
 // new in Jan 2008
-#include "SASCALC"
+//#include "SASCALC"
 #include "CheckVersionFTP"                              //added June 2008
-#include "MultScatter_MonteCarlo_2D"                    //Oct 2008 SRK for SASCALC simulation
+//#include "MultScatter_MonteCarlo_2D"                  //Oct 2008 SRK for SASCALC simulation
 
 
 //AJJ Oct 2008
 #include "PlotManager_v40"
+
+// SRK JUN2009
+#include "Smear_2D"             //2D resolution calculation and smearing
+
+//AJJ Nov 2009
+#include "DataSetHandling"
+#include "WriteModelData_v40"