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

    r151 r153  
    1414//////////////////////////////////////////////// 
    1515 
    16 Proc PlotCoreShellCylinderForm(num,qmin,qmax) 
     16Proc PlotCoreShellCylinder(num,qmin,qmax) 
    1717        Variable num=128,qmin=0.001,qmax=0.7 
    1818        Prompt num "Enter number of data points for model: " 
     
    3737/////////////////////////////////////////////////////////// 
    3838// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    39 Proc PlotSmearedCSCylinderForm(str)                                                              
     39Proc PlotSmearedCoreShellCylinder(str)                                                           
    4040        String str 
    4141        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    5959                                         
    6060        Variable/G gs_cscyl=0 
    61         gs_cscyl := fSmearedCoreShellCylinderForm(smear_coef_cscyl,smeared_cscyl,smeared_qvals) //this wrapper fills the STRUCT 
     61        gs_cscyl := fSmearedCoreShellCylinder(smear_coef_cscyl,smeared_cscyl,smeared_qvals)     //this wrapper fills the STRUCT 
    6262         
    6363        Display smeared_cscyl vs smeared_qvals 
     
    223223 
    224224// this is all there is to the smeared calculation! 
    225 Function SmearedCoreShellCylinderForm(s) :FitFunc 
     225Function SmearedCoreShellCylinder(s) :FitFunc 
    226226        Struct ResSmearAAOStruct &s 
    227227 
     
    238238// used only for the dependency, not for fitting 
    239239// 
    240 Function fSmearedCoreShellCylinderForm(coefW,yW,xW) 
     240Function fSmearedCoreShellCylinder(coefW,yW,xW) 
    241241        Wave coefW,yW,xW 
    242242         
     
    253253         
    254254        Variable err 
    255         err = SmearedCoreShellCylinderForm(fs) 
     255        err = SmearedCoreShellCylinder(fs) 
    256256         
    257257        return (0) 
Note: See TracChangeset for help on using the changeset viewer.