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/GaussSpheres.ipf

    r151 r153  
    1111// 
    1212 
    13 Proc PlotGaussPolySphere(num,qmin,qmax) 
     13Proc PlotGaussSpheres(num,qmin,qmax) 
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
     
    2424         
    2525        Variable/G root:g_pgs 
    26         g_pgs := GaussPolySphere(coef_pgs,ywave_pgs,xwave_pgs) 
     26        g_pgs := GaussSpheres(coef_pgs,ywave_pgs,xwave_pgs) 
    2727        Display ywave_pgs vs xwave_pgs 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    3333 
    3434// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    35 Proc PlotSmearedGaussPolySpheres(str)                                                            
     35Proc PlotSmearedGaussSpheres(str)                                                                
    3636        String str 
    3737        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    5555                                         
    5656        Variable/G gs_pgs=0 
    57         gs_pgs := fSmearedGaussPolySphere(smear_coef_pgs,smeared_pgs,smeared_qvals)     //this wrapper fills the STRUCT 
     57        gs_pgs := fSmearedGaussSpheres(smear_coef_pgs,smeared_pgs,smeared_qvals)        //this wrapper fills the STRUCT 
    5858         
    5959        Display smeared_pgs vs smeared_qvals                                                                     
     
    7272// simply calls the original single point calculation with 
    7373// a wave assignment (this will behave nicely if given point ranges) 
    74 Function GaussPolySphere(cw,yw,xw) : FitFunc 
     74Function GaussSpheres(cw,yw,xw) : FitFunc 
    7575        Wave cw,yw,xw 
    7676         
    77 #if exists("GaussPolySphereX") 
    78         yw = GaussPolySphereX(cw,xw) 
     77#if exists("GaussSpheresX") 
     78        yw = GaussSpheresX(cw,xw) 
    7979#else 
    80         yw = fGaussPolySphere(cw,xw) 
     80        yw = fGaussSpheres(cw,xw) 
    8181#endif 
    8282        return(0) 
    8383End 
    8484 
    85 Function fGaussPolySphere(w,xx) : FitFunc 
     85Function fGaussSpheres(w,xx) : FitFunc 
    8686        wave w 
    8787        variable xx 
     
    177177// used only for the dependency, not for fitting 
    178178// 
    179 Function fSmearedGaussPolySphere(coefW,yW,xW) 
     179Function fSmearedGaussSpheres(coefW,yW,xW) 
    180180        Wave coefW,yW,xW 
    181181         
     
    192192         
    193193        Variable err 
    194         err = SmearedGaussPolySphere(fs) 
     194        err = SmearedGaussSpheres(fs) 
    195195         
    196196        return (0) 
     
    198198 
    199199// this is all there is to the smeared calculation! 
    200 Function SmearedGaussPolySphere(s) :FitFunc 
     200Function SmearedGaussSpheres(s) :FitFunc 
    201201        Struct ResSmearAAOStruct &s 
    202202 
    203203//      the name of your unsmeared model (AAO) is the first argument 
    204         Smear_Model_20(GaussPolySphere,s.coefW,s.xW,s.yW,s.resW) 
     204        Smear_Model_20(GaussSpheres,s.coefW,s.xW,s.yW,s.resW) 
    205205 
    206206        return(0) 
Note: See TracChangeset for help on using the changeset viewer.