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

    r151 r153  
    2727//needed to calculate the model function. 
    2828// 
    29 Proc Plot_Parallelepiped(num,qmin,qmax) 
     29Proc PlotParallelepiped(num,qmin,qmax) 
    3030        Variable num=100, qmin=.001, qmax=.7 
    3131        Prompt num "Enter number of data points for model: " 
     
    5151 
    5252// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    53 Proc PlotSmeared_Parallelepiped(str)                                                             
     53Proc PlotSmearedParallelepiped(str)                                                              
    5454        String str 
    5555        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    7373                                         
    7474        Variable/G gs_Parallelepiped=0 
    75         gs_Parallelepiped := fParallelepiped_Smeared(smear_coef_Parallelepiped,smeared_Parallelepiped,smeared_qvals)    //this wrapper fills the STRUCT 
     75        gs_Parallelepiped := fSmearedParallelepiped(smear_coef_Parallelepiped,smeared_Parallelepiped,smeared_qvals)     //this wrapper fills the STRUCT 
    7676         
    7777        Display smeared_Parallelepiped vs smeared_qvals                                                                 // 
     
    203203// used only for the dependency, not for fitting 
    204204// 
    205 Function fParallelepiped_Smeared(coefW,yW,xW) 
     205Function fSmearedParallelepiped(coefW,yW,xW) 
    206206        Wave coefW,yW,xW 
    207207         
     
    218218         
    219219        Variable err 
    220         err = Parallelepiped_Smeared(fs) 
     220        err = SmearedParallelepiped(fs) 
    221221         
    222222        return (0) 
     
    224224 
    225225// this is all there is to the smeared calculation! 
    226 Function Parallelepiped_Smeared(s) :FitFunc 
     226Function SmearedParallelepiped(s) :FitFunc 
    227227        Struct ResSmearAAOStruct &s 
    228228 
Note: See TracChangeset for help on using the changeset viewer.