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_HG.ipf

    r151 r153  
    2323//needed to calculate the model function. 
    2424// 
    25 Proc Plot_LamellarFF_HG(num,qmin,qmax) 
     25Proc PlotLamellarFF_HG(num,qmin,qmax) 
    2626        Variable num=128, qmin=.001, qmax=.5 
    2727        Prompt num "Enter number of data points for model: " 
     
    4848 
    4949// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    50 Proc PlotSmeared_LamellarFF_HG(str)                                                              
     50Proc PlotSmearedLamellarFF_HG(str)                                                               
    5151        String str 
    5252        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    7070                                         
    7171        Variable/G gs_LamellarFF_HG=0 
    72         gs_LamellarFF_HG := fLamellarFF_HG_Smeared(smear_coef_LamellarFF_HG,smeared_LamellarFF_HG,smeared_qvals)        //this wrapper fills the STRUCT 
     72        gs_LamellarFF_HG := fSmearedLamellarFF_HG(smear_coef_LamellarFF_HG,smeared_LamellarFF_HG,smeared_qvals) //this wrapper fills the STRUCT 
    7373         
    7474        Display smeared_LamellarFF_HG vs smeared_qvals                                                                  // 
     
    149149// used only for the dependency, not for fitting 
    150150// 
    151 Function fLamellarFF_HG_Smeared(coefW,yW,xW) 
     151Function fSmearedLamellarFF_HG(coefW,yW,xW) 
    152152        Wave coefW,yW,xW 
    153153         
     
    164164         
    165165        Variable err 
    166         err = LamellarFF_HG_Smeared(fs) 
     166        err = SmearedLamellarFF_HG(fs) 
    167167         
    168168        return (0) 
     
    170170 
    171171//the smeared model calculation 
    172 Function LamellarFF_HG_Smeared(s) :FitFunc 
     172Function SmearedLamellarFF_HG(s) :FitFunc 
    173173        Struct ResSmearAAOStruct &s 
    174174 
Note: See TracChangeset for help on using the changeset viewer.