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

    r151 r153  
    2121//needed to calculate the model function. 
    2222// 
    23 Proc Plot_LamellarFF(num,qmin,qmax) 
     23Proc PlotLamellarFF(num,qmin,qmax) 
    2424        Variable num=128, qmin=.001, qmax=.5 
    2525        Prompt num "Enter number of data points for model: " 
     
    4646 
    4747// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    48 Proc PlotSmeared_LamellarFF(str)                                                                 
     48Proc PlotSmearedLamellarFF(str)                                                          
    4949        String str 
    5050        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    6868                                         
    6969        Variable/G gs_LamellarFF=0 
    70         gs_LamellarFF := fLamellarFF_Smeared(smear_coef_LamellarFF,smeared_LamellarFF,smeared_qvals)    //this wrapper fills the STRUCT 
     70        gs_LamellarFF := fSmearedLamellarFF(smear_coef_LamellarFF,smeared_LamellarFF,smeared_qvals)     //this wrapper fills the STRUCT 
    7171         
    7272        Display smeared_LamellarFF vs smeared_qvals                                                                     // 
     
    141141// used only for the dependency, not for fitting 
    142142// 
    143 Function fLamellarFF_Smeared(coefW,yW,xW) 
     143Function fSmearedLamellarFF(coefW,yW,xW) 
    144144        Wave coefW,yW,xW 
    145145         
     
    156156         
    157157        Variable err 
    158         err = LamellarFF_Smeared(fs) 
     158        err = SmearedLamellarFF(fs) 
    159159         
    160160        return (0) 
     
    162162 
    163163//the smeared model calculation 
    164 Function LamellarFF_Smeared(s) :FitFunc 
     164Function SmearedLamellarFF(s) :FitFunc 
    165165        Struct ResSmearAAOStruct &s 
    166166 
Note: See TracChangeset for help on using the changeset viewer.