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

    r151 r153  
    2424         
    2525        Variable/G root:g_mss 
    26         g_mss := MultiShellForm(coef_mss,ywave_mss,xwave_mss) 
     26        g_mss := MultiShellSphere(coef_mss,ywave_mss,xwave_mss) 
    2727        Display/K=1 ywave_mss vs xwave_mss 
    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 PlotSmearedMultiShell(str)                                                          
     35Proc PlotSmearedMultiShellSphere(str)                                                            
    3636        String str 
    3737        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    5555                                         
    5656        Variable/G gs_mss=0 
    57         gs_mss := fSmearedMultiShell(smear_coef_mss,smeared_mss,smeared_qvals)  //this wrapper fills the STRUCT 
     57        gs_mss := fSmearedMultiShellSphere(smear_coef_mss,smeared_mss,smeared_qvals)    //this wrapper fills the STRUCT 
    5858         
    5959        Display/K=1 smeared_mss 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 MultiShellForm(cw,yw,xw) : FitFunc 
     74Function MultiShellSphere(cw,yw,xw) : FitFunc 
    7575        Wave cw,yw,xw 
    7676         
    77 #if exists("MultiShellFormX") 
    78         yw = MultiShellFormX(cw,xw) 
     77#if exists("MultiShellSphereX") 
     78        yw = MultiShellSphereX(cw,xw) 
    7979#else 
    80         yw = fMultiShellForm(cw,xw) 
     80        yw = fMultiShellSphere(cw,xw) 
    8181#endif 
    8282        return(0) 
    8383End 
    8484 
    85 Function fMultiShellForm(w,x) :FitFunc 
     85Function fMultiShellSphere(w,x) :FitFunc 
    8686        Wave w 
    8787        Variable x 
     
    163163// used only for the dependency, not for fitting 
    164164// 
    165 Function fSmearedMultiShell(coefW,yW,xW) 
     165Function fSmearedMultiShellSphere(coefW,yW,xW) 
    166166        Wave coefW,yW,xW 
    167167         
     
    178178         
    179179        Variable err 
    180         err = SmearedMultiShell(fs) 
     180        err = SmearedMultiShellSphere(fs) 
    181181         
    182182        return (0) 
     
    184184 
    185185// this is all there is to the smeared calculation! 
    186 Function SmearedMultiShell(s) :FitFunc 
     186Function SmearedMultiShellSphere(s) :FitFunc 
    187187        Struct ResSmearAAOStruct &s 
    188188 
    189189//      the name of your unsmeared model (AAO) is the first argument 
    190         Smear_Model_20(MultiShellForm,s.coefW,s.xW,s.yW,s.resW) 
     190        Smear_Model_20(MultiShellSphere,s.coefW,s.xW,s.yW,s.resW) 
    191191 
    192192        return(0) 
Note: See TracChangeset for help on using the changeset viewer.