Changeset 444 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyCore_and_NShells_v40.ipf

Timestamp:

Nov 12, 2008 4:45:15 PM (14 years ago)

Author:

srkline

Message:

Changes to the analysis package to add a few more model functions. Documentation and XOPs are to follow later.

General n-point gaussian quadrature has been added to GaussUtils? by including a Gauss-Laguere point generator from Numerical Recipes. See the Paracrystal models for an example, since they needed more than the 76 point quadrature.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyCore_and_NShells_v40.ipf (modified) (9 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyCore_and_NShells_v40.ipf

@@ -27 +27 @@
 //needed to calculate the model function.
 //
-Macro PlotPolyPolyOneShell(num,qmin,qmax)
+Proc PlotPolyOneShell(num,qmin,qmax)
         Variable num=200, qmin=0.001, qmax=0.7
         Prompt num "Enter number of data points for model: "
@@ -33 +33 @@
         Prompt qmax "Enter maximum q-value (^-1) for model: "
 //
-        Make/O/D/n=(num) xwave_PolyPolyOneShell, ywave_PolyPolyOneShell
-        xwave_PolyPolyOneShell =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num))
-        Make/O/D coef_PolyPolyOneShell = {1.,60,0.1,6.4e-6,10,1e-6,6.4e-6,0.001}
-        make/o/t parameters_PolyPolyOneShell = {"scale","core radius (A)","Core Polydispersity(0,1)","Core SLD (A-2)","Shell thickness (A)","Shell SLD (A-2)","Solvent SLD (A-2)","bkg (cm-1)"}
-        Edit parameters_PolyPolyOneShell, coef_PolyPolyOneShell
-        
-        Variable/G root:g_PolyPolyOneShell
+        Make/O/D/n=(num) xwave_PolyOneShell, ywave_PolyOneShell
+        xwave_PolyOneShell =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num))
+        Make/O/D coef_PolyOneShell = {1.,60,0.1,6.4e-6,10,1e-6,6.4e-6,0.001}
+        make/o/t parameters_PolyOneShell = {"scale","core radius (A)","Core Polydispersity(0,1)","Core SLD (A-2)","Shell thickness (A)","Shell SLD (A-2)","Solvent SLD (A-2)","bkg (cm-1)"}
+        Edit parameters_PolyOneShell, coef_PolyOneShell
+        
+        Variable/G root:g_PolyOneShell
         g_PolyOneShell := PolyOneShell(coef_PolyOneShell, ywave_PolyOneShell, xwave_PolyOneShell)
         Display ywave_PolyOneShell vs xwave_PolyOneShell
@@ -52 +52 @@
 End
 
-Macro PlotPolyPolyTwoShell(num,qmin,qmax)
+Proc PlotPolyTwoShell(num,qmin,qmax)
         Variable num=200, qmin=0.001, qmax=0.7
         Prompt num "Enter number of data points for model: "
@@ -77 +77 @@
 End
 
-Macro PlotPolyThreeShell(num,qmin,qmax)
+Proc PlotPolyThreeShell(num,qmin,qmax)
         Variable num=200, qmin=0.001, qmax=0.7
         Prompt num "Enter number of data points for model: "
@@ -102 +102 @@
 End
 
-Macro PlotPolyFourShell(num,qmin,qmax)
+Proc PlotPolyFourShell(num,qmin,qmax)
         Variable num=200, qmin=0.001, qmax=0.7
         Prompt num "Enter number of data points for model: "
@@ -138 +138 @@
 ////////////////////////////////////////////////////
 // - sets up a dependency to a wrapper, not the actual SmearedModelFunction
-Macro PlotSmearedPolyOneShell(str)                                                              
+Proc PlotSmearedPolyOneShell(str)                                                               
         String str
         Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4)
@@ -172 +172 @@
 End
 
-Macro PlotSmearedPolyTwoShell(str)                                                              
+Proc PlotSmearedPolyTwoShell(str)                                                               
         String str
         Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4)
@@ -207 +207 @@
 
 
-Macro PlotSmearedPolyThreeShell(str)                                                            
+Proc PlotSmearedPolyThreeShell(str)                                                             
         String str
         Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4)
@@ -241 +241 @@
 End
 
-Macro PlotSmearedPolyFourShell(str)                                                             
+Proc PlotSmearedPolyFourShell(str)                                                              
         String str
         Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4)