Changeset 887 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/SumModel/SumSANSModels_v40.ipf

Timestamp:

Jan 16, 2013 3:44:53 PM (10 years ago)

Author:

srkline

Message:

Changes include:

updates to the simulation through SASCALC to allow easier "scripting" of SASCALC for simulation of "experiments"

updated some of the calibration values for the 10m SANS @ NGA

fixed bug in how the transmission error were being displayed in the TransFile? table (bad sort). Data was not affected, only the display.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/SumModel/SumSANSModels_v40.ipf (modified) (6 diffs)

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

@@ -257 +257 @@
 // selected data folder
 //
-Proc PlotSmeared_Sum_Model(str)                                                         
+Proc PlotSmearedSum_Model(str)                                                          
         String str
         Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4)
@@ -311 +311 @@
                                         
         Variable/G gs_sum=0
-        gs_sum := fSmeared_Sum_Model(smear_coef_sum,smeared_sum,smeared_qvals)  //this wrapper fills the STRUCT
+        gs_sum := fSmearedSum_Model(smear_coef_sum,smeared_sum,smeared_qvals)   //this wrapper fills the STRUCT
         
         Display smeared_sum vs $(str+"_q")                                                                      
@@ -321 +321 @@
         
         SetDataFolder root:
-        AddModelToStrings("Smeared_Sum_Model","smear_coef_sum","smear_parameters_sum","sum")
+        AddModelToStrings("SmearedSum_Model","smear_coef_sum","smear_parameters_sum","sum")
         
         // additional step to make sure the "helper waves" are the right dimension, in case the user
@@ -371 +371 @@
 
 // this is all there is to the smeared calculation!
-Function Smeared_Sum_Model(s) : FitFunc
+Function SmearedSum_Model(s) : FitFunc
         Struct ResSmearAAOStruct &s
 
@@ -385 +385 @@
 // used only for the dependency, not for fitting
 //
-Function fSmeared_Sum_Model(coefW,yW,xW)
+Function fSmearedSum_Model(coefW,yW,xW)
         Wave coefW,yW,xW
         
@@ -400 +400 @@
         
         Variable err
-        err = Smeared_Sum_Model(fs)
+        err = SmearedSum_Model(fs)
         
         return (0)