Changeset 354 for sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis

Timestamp:

May 7, 2008 4:21:29 PM (15 years ago)

Author:

srkline

Message:

(1) - added to the list of included files in the main includes file, to ensure that this is the only file that needs to be included for an analysis experiment
(2) - bug fix in Sum Models, setup procs could act on epsilon wave that did not exist

Location:

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models

Files:

• Packages/SumModel/SumSANSModels_v40.ipf (modified) (2 diffs)
• SA_includes_v400.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/SumModel/SumSANSModels_v40.ipf

@@ -221 +221 @@
                 Redimension/N=(nParam) $("epsilon_"+suffix),$("Hold_"+suffix)
                 Redimension/N=(nParam) $("LoLim_"+suffix),$("HiLim_"+suffix)
-        endif
-        $("epsilon_"+suffix) = abs(coef_sum*1e-4) + 1e-10                       //default eps is proportional to the coefficients
+                $("epsilon_"+suffix) = abs(coef_sum*1e-4) + 1e-10                       //default eps is proportional to the coefficients
+        endif
 End
 
@@ -306 +306 @@
                 Redimension/N=(nParam) $("epsilon_"+suffix),$("Hold_"+suffix)
                 Redimension/N=(nParam) $("LoLim_"+suffix),$("HiLim_"+suffix)
-        endif
-        $("epsilon_"+suffix) = abs(smear_coef_sum*1e-4) + 1e-10                 //default eps is proportional to the coefficients
+                $("epsilon_"+suffix) = abs(smear_coef_sum*1e-4) + 1e-10                 //default eps is proportional to the coefficients
+        endif
         SetDataFolder root:
 End

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/SA_includes_v400.ipf

@@ -16 +16 @@
 #include "PlotManager_v40"                              version>=4.00
 
+#include "USANS_SlitSmearing_v40"
+#include "WriteModelData_v40"
 #include "Wrapper_v40"
 #include "PlotUtils2D_v40"