Changeset 175 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/SingleModelTemplate

Timestamp:

Oct 1, 2007 3:24:37 PM (15 years ago)

Author:

srkline

Message:

Updated the template to include all of the analysis package template items so that the model will function properly.
Updated the model to generate the keyword=string pairs for the function/suffix.
Updated the instructions.

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/SingleModelTemplate

Files:

• MyModel_Instructn_2007.ifn (added)
• My_Model.ipf (modified) (8 diffs)
• ReadMe_SingleModelTemplate.txt (modified) (1 diff)
• SingleModelTemplate_Sphere.pxt (modified) (previous)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/SingleModelTemplate/My_Model.ipf

@@ -36 +36 @@
 //needed to calculate the model function.
 //
-Macro Plot_MyModel(num,qmin,qmax)
+Macro PlotMyModel(num,qmin,qmax)
         Variable num=200, qmin=0.001, qmax=0.7
         Prompt num "Enter number of data points for model: "
@@ -56 +56 @@
         Label left "I(q) (cm\\S-1\\M)"
         AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)
+        
+        AddModelToStrings("MyModel","coef_MyModel","MyModel")
 //
 End
@@ -67 +69 @@
 ////////////////////////////////////////////////////
 // - sets up a dependency to a wrapper, not the actual SmearedModelFunction
-Macro PlotSmeared_MyModel(str)                                                          
+Macro PlotSmearedMyModel(str)                                                           
         String str
         Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4)
@@ -89 +91 @@
                                         
         Variable/G gs_MyModel=0
-        gs_MyModel := fMyModel_Smeared(smear_coef_MyModel,smeared_MyModel,smeared_qvals)        //this wrapper fills the STRUCT
+        gs_MyModel := fSmearedMyModel(smear_coef_MyModel,smeared_MyModel,smeared_qvals) //this wrapper fills the STRUCT
         
         Display smeared_MyModel vs smeared_qvals
@@ -98 +100 @@
         
         SetDataFolder root:
+        AddModelToStrings("SmearedMyModel","smear_coef_MyModel","MyModel")
 End
 
@@ -173 +176 @@
 //
 // this is all there is to the smeared model calculation!
-Function MyModel_Smeared(s) : FitFunc
+Function SmearedMyModel(s) : FitFunc
         Struct ResSmearAAOStruct &s
 
 //      the name of your unsmeared model (AAO) is the first argument
-        s.yW = Smear_Model_20(MyModel,s.coefW,s.xW,s.resW)
+        Smear_Model_20(MyModel,s.coefW,s.xW,s.yW,s.resW)
 
         return(0)
@@ -193 +196 @@
 // used only for the dependency, not for fitting
 //
-Function fMyModel_Smeared(coefW,yW,xW)
+Function fSmearedMyModel(coefW,yW,xW)
         Wave coefW,yW,xW
         
@@ -208 +211 @@
         
         Variable err
-        err = MyModel_Smeared(fs)
+        err = SmearedMyModel(fs)
         
         return (0)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/SingleModelTemplate/ReadMe_SingleModelTemplate.txt

@@ -4 +4 @@
 
 14 AUG 2006 SRK
+
+Updated to use the new structure function format
+
+01 OCT 2007 SRK