Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyCore_and_NShells_v40.ipf

    r396 r444  
    2727//needed to calculate the model function. 
    2828// 
    29 Macro PlotPolyPolyOneShell(num,qmin,qmax) 
     29Proc PlotPolyOneShell(num,qmin,qmax) 
    3030        Variable num=200, qmin=0.001, qmax=0.7 
    3131        Prompt num "Enter number of data points for model: " 
     
    3333        Prompt qmax "Enter maximum q-value (^-1) for model: " 
    3434// 
    35         Make/O/D/n=(num) xwave_PolyPolyOneShell, ywave_PolyPolyOneShell 
    36         xwave_PolyPolyOneShell =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    37         Make/O/D coef_PolyPolyOneShell = {1.,60,0.1,6.4e-6,10,1e-6,6.4e-6,0.001} 
    38         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)"} 
    39         Edit parameters_PolyPolyOneShell, coef_PolyPolyOneShell 
    40          
    41         Variable/G root:g_PolyPolyOneShell 
     35        Make/O/D/n=(num) xwave_PolyOneShell, ywave_PolyOneShell 
     36        xwave_PolyOneShell =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
     37        Make/O/D coef_PolyOneShell = {1.,60,0.1,6.4e-6,10,1e-6,6.4e-6,0.001} 
     38        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)"} 
     39        Edit parameters_PolyOneShell, coef_PolyOneShell 
     40         
     41        Variable/G root:g_PolyOneShell 
    4242        g_PolyOneShell := PolyOneShell(coef_PolyOneShell, ywave_PolyOneShell, xwave_PolyOneShell) 
    4343        Display ywave_PolyOneShell vs xwave_PolyOneShell 
     
    5252End 
    5353 
    54 Macro PlotPolyPolyTwoShell(num,qmin,qmax) 
     54Proc PlotPolyTwoShell(num,qmin,qmax) 
    5555        Variable num=200, qmin=0.001, qmax=0.7 
    5656        Prompt num "Enter number of data points for model: " 
     
    7777End 
    7878 
    79 Macro PlotPolyThreeShell(num,qmin,qmax) 
     79Proc PlotPolyThreeShell(num,qmin,qmax) 
    8080        Variable num=200, qmin=0.001, qmax=0.7 
    8181        Prompt num "Enter number of data points for model: " 
     
    102102End 
    103103 
    104 Macro PlotPolyFourShell(num,qmin,qmax) 
     104Proc PlotPolyFourShell(num,qmin,qmax) 
    105105        Variable num=200, qmin=0.001, qmax=0.7 
    106106        Prompt num "Enter number of data points for model: " 
     
    138138//////////////////////////////////////////////////// 
    139139// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    140 Macro PlotSmearedPolyOneShell(str)                                                               
     140Proc PlotSmearedPolyOneShell(str)                                                                
    141141        String str 
    142142        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    172172End 
    173173 
    174 Macro PlotSmearedPolyTwoShell(str)                                                               
     174Proc PlotSmearedPolyTwoShell(str)                                                                
    175175        String str 
    176176        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    207207 
    208208 
    209 Macro PlotSmearedPolyThreeShell(str)                                                             
     209Proc PlotSmearedPolyThreeShell(str)                                                              
    210210        String str 
    211211        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    241241End 
    242242 
    243 Macro PlotSmearedPolyFourShell(str)                                                              
     243Proc PlotSmearedPolyFourShell(str)                                                               
    244244        String str 
    245245        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
Note: See TracChangeset for help on using the changeset viewer.