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

    r151 r153  
    2323//needed to calculate the model function. 
    2424// 
    25 Proc Plot_TriaxialEllipsoid(num,qmin,qmax) 
     25Proc PlotTriaxialEllipsoid(num,qmin,qmax) 
    2626        Variable num=100, qmin=.001, qmax=.7 
    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_TriAxEllipsoid(str)                                                             
     50Proc PlotSmearedTriaxialEllipsoid(str)                                                           
    5151        String str 
    5252        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    7070                                         
    7171        Variable/G gs_triax=0 
    72         gs_triax := fTriax_Smeared(smear_coef_triax,smeared_triax,smeared_qvals)        //this wrapper fills the STRUCT 
     72        gs_triax := fSmearedTriaxialEllipsoid(smear_coef_triax,smeared_triax,smeared_qvals)     //this wrapper fills the STRUCT 
    7373         
    7474        Display smeared_triax vs smeared_qvals                                                                  // 
     
    189189// used only for the dependency, not for fitting 
    190190// 
    191 Function fTriax_Smeared(coefW,yW,xW) 
     191Function fSmearedTriaxialEllipsoid(coefW,yW,xW) 
    192192        Wave coefW,yW,xW 
    193193         
     
    204204         
    205205        Variable err 
    206         err = Triax_Smeared(fs) 
     206        err = SmearedTriaxialEllipsoid(fs) 
    207207         
    208208        return (0) 
     
    210210                 
    211211// this is all there is to the smeared calculation! 
    212 Function Triax_Smeared(s) :FitFunc 
     212Function SmearedTriaxialEllipsoid(s) :FitFunc 
    213213        Struct ResSmearAAOStruct &s 
    214214 
Note: See TracChangeset for help on using the changeset viewer.