Ignore:
Timestamp:
Aug 30, 2007 4:24:41 PM (15 years ago)
Author:
srkline
Message:

Changed Plot* and PlotSmeared?* naming schemes to be all consistent prefixes for the actual function name, so that the macros can be constructed from the function name, or vice versa.

also some tweaks to the wrapper to make sure that plot and append really work

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LogNormalSphere.ipf

    r151 r153  
    88 
    99//Proc to setup data and coefficients to plot the model 
    10 Proc PlotLogNormalPolySphere(num,qmin,qmax) 
     10Proc PlotLogNormalSphere(num,qmin,qmax) 
    1111        Variable num=128,qmin=0.001,qmax=0.7 
    1212        Prompt num "Enter number of data points for model: " 
     
    2121         
    2222        Variable/G root:g_lns 
    23         g_lns := LogNormalPolySphere(coef_lns,ywave_lns,xwave_lns) 
     23        g_lns := LogNormalSphere(coef_lns,ywave_lns,xwave_lns) 
    2424        Display ywave_lns vs xwave_lns 
    2525        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    3030 
    3131// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    32 Proc PlotSmearLogNormPolySphere(str)                                                             
     32Proc PlotSmearedLogNormalSphere(str)                                                             
    3333        String str 
    3434        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    5252                                         
    5353        Variable/G gs_lns=0 
    54         gs_lns := fSmearLogNormSphere(smear_coef_lns,smeared_lns,smeared_qvals) //this wrapper fills the STRUCT 
     54        gs_lns := fSmearedLogNormalSphere(smear_coef_lns,smeared_lns,smeared_qvals)     //this wrapper fills the STRUCT 
    5555         
    5656        Display smeared_lns vs smeared_qvals                                                                     
     
    6969// simply calls the original single point calculation with 
    7070// a wave assignment (this will behave nicely if given point ranges) 
    71 Function LogNormalPolySphere(cw,yw,xw) : FitFunc 
     71Function LogNormalSphere(cw,yw,xw) : FitFunc 
    7272        Wave cw,yw,xw 
    7373         
    74 #if exists("LogNormalPolySphereX") 
    75         yw = LogNormalPolySphereX(cw,xw) 
     74#if exists("LogNormalSphereX") 
     75        yw = LogNormalSphereX(cw,xw) 
    7676#else 
    77         yw = fLogNormalPolySphere(cw,xw) 
     77        yw = fLogNormalSphere(cw,xw) 
    7878#endif 
    7979        return(0) 
     
    8585// 76 points is slower, but reccommended to remove high-q oscillations 
    8686// 
    87 Function fLogNormalPolySphere(w,xx): FitFunc 
     87Function fLogNormalSphere(w,xx): FitFunc 
    8888        wave w 
    8989        variable xx 
     
    185185// used only for the dependency, not for fitting 
    186186// 
    187 Function fSmearLogNormSphere(coefW,yW,xW) 
     187Function fSmearedLogNormalSphere(coefW,yW,xW) 
    188188        Wave coefW,yW,xW 
    189189         
     
    200200         
    201201        Variable err 
    202         err = SmearLogNormSphere(fs) 
     202        err = SmearedLogNormalSphere(fs) 
    203203         
    204204        return (0) 
     
    206206 
    207207// this is all there is to the smeared calculation! 
    208 Function SmearLogNormSphere(s) :FitFunc 
     208Function SmearedLogNormalSphere(s) :FitFunc 
    209209        Struct ResSmearAAOStruct &s 
    210210 
    211211//      the name of your unsmeared model (AAO) is the first argument 
    212         Smear_Model_20(LogNormalPolySphere,s.coefW,s.xW,s.yW,s.resW) 
     212        Smear_Model_20(LogNormalSphere,s.coefW,s.xW,s.yW,s.resW) 
    213213 
    214214        return(0) 
Note: See TracChangeset for help on using the changeset viewer.