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

    r146 r153  
    2424        Edit parameters_css,coef_css 
    2525        Variable/G root:g_css 
    26         g_css := CoreShellForm(coef_css,ywave_css,xwave_css) 
    27 //      ywave_css := CoreShellForm(coef_css,xwave_css) 
     26        g_css := CoreShellSphere(coef_css,ywave_css,xwave_css) 
     27//      ywave_css := CoreShellSphere(coef_css,xwave_css) 
    2828        Display ywave_css vs xwave_css 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    5858                                         
    5959        Variable/G gs_css=0 
    60         gs_css := fSmearedCoreShellForm(smear_coef_css,smeared_css,smeared_qvals)       //this wrapper fills the STRUCT 
     60        gs_css := fSmearedCoreShellSphere(smear_coef_css,smeared_css,smeared_qvals)     //this wrapper fills the STRUCT 
    6161         
    6262        Display smeared_css vs smeared_qvals                                                                     
     
    7171 
    7272//AAO version 
    73 Function CoreShellForm(cw,yw,xw) : FitFunc 
     73Function CoreShellSphere(cw,yw,xw) : FitFunc 
    7474        Wave cw,yw,xw 
    7575 
    76 #if exists("CoreShellFormX") 
    77         yw = CoreShellFormX(cw,xw) 
     76#if exists("CoreShellSphereX") 
     77        yw = CoreShellSphereX(cw,xw) 
    7878#else 
    79         yw = fCoreShellForm(cw,xw) 
     79        yw = fCoreShellSphere(cw,xw) 
    8080#endif 
    8181        return(0) 
     
    8585// unsmeared model calculation 
    8686/////////////////////////// 
    87 Function fCoreShellForm(w,x) : FitFunc 
     87Function fCoreShellSphere(w,x) : FitFunc 
    8888        Wave w 
    8989        Variable x 
     
    139139 
    140140// this is all there is to the smeared calculation! 
    141 Function SmearedCoreShellForm(s) :FitFunc 
     141Function SmearedCoreShellSphere(s) :FitFunc 
    142142        Struct ResSmearAAOStruct &s 
    143143 
    144144////the name of your unsmeared model is the first argument 
    145         Smear_Model_20(CoreShellForm,s.coefW,s.xW,s.yW,s.resW) 
     145        Smear_Model_20(CoreShellSphere,s.coefW,s.xW,s.yW,s.resW) 
    146146 
    147147        return(0) 
     
    153153// used only for the dependency, not for fitting 
    154154// 
    155 Function fSmearedCoreShellForm(coefW,yW,xW) 
     155Function fSmearedCoreShellSphere(coefW,yW,xW) 
    156156        Wave coefW,yW,xW 
    157157         
     
    168168         
    169169        Variable err 
    170         err = SmearedCoreShellForm(fs) 
     170        err = SmearedCoreShellSphere(fs) 
    171171         
    172172        return (0) 
Note: See TracChangeset for help on using the changeset viewer.