Changeset 237

Timestamp:

Jan 14, 2008 1:03:34 PM (15 years ago)

Author:

srkline

Message:

Changed Menu and Includes_v500 to include SASCALC, making them one integrated package.

The package integration still needs to be done at the SVN level.

Once done at the SVN level, there are some of the averaging routines "S_" that are direct duplicates of the "real" version in the SANS Reduction. These duplicates from SASCALC will need to be eliminated so that there is only one copy.

Location:

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00

Files:

• Includes_v500.ipf (modified) (1 diff)
• Menu.ipf (modified) (1 diff)

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/Includes_v500.ipf

@@ -48 +48 @@
 #include "SANS_Utilities"                                                               //new in the 29MAR07 branch
 
+// new in Jan 2008
+#include "SASCALC"
+
 // to include the analysis packages, uncomment the following
 // include statement and click "compile" at the bottom of this window.

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/Menu.ipf

@@ -23 +23 @@
         "-"
         "Main Control Panel",DoWindow/F Main_Panel
+        "SASCALC"
         "-"
         Submenu "Data Display"