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

    r151 r153  
    1414//////////////////////////////////////////////// 
    1515 
    16 Proc PlotEllipCylinderForm(num,qmin,qmax) 
     16Proc PlotEllipticalCylinder(num,qmin,qmax) 
    1717        Variable num=50,qmin=0.001,qmax=0.7 
    1818        Prompt num "Enter number of data points for model: " 
     
    3232         
    3333        Variable/G root:g_ecf 
    34         g_ecf := EllipCyl20(coef_ecf,ywave_ecf,xwave_ecf) 
     34        g_ecf := EllipticalCylinder(coef_ecf,ywave_ecf,xwave_ecf) 
    3535        Display ywave_ecf vs xwave_ecf 
    3636        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    4242 
    4343// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    44 Proc PlotSmearedEllipCylForm(str)                                                                
     44Proc PlotSmearedEllipticalCylinder(str)                                                          
    4545        String str 
    4646        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    6464                                         
    6565        Variable/G gs_ecf=0 
    66         gs_ecf := fSmearedEllipCylForm(smear_coef_ecf,smeared_ecf,smeared_qvals)        //this wrapper fills the STRUCT 
     66        gs_ecf := fSmearedEllipticalCylinder(smear_coef_ecf,smeared_ecf,smeared_qvals)  //this wrapper fills the STRUCT 
    6767         
    6868        Display smeared_ecf vs smeared_qvals 
     
    8080// simply calls the original single point calculation with 
    8181// a wave assignment (this will behave nicely if given point ranges) 
    82 Function EllipCyl20(cw,yw,xw) : FitFunc 
     82Function EllipticalCylinder(cw,yw,xw) : FitFunc 
    8383        Wave cw,yw,xw 
    8484         
    85 #if exists("EllipCyl20X") 
    86         yw = EllipCyl20X(cw,xw) 
     85#if exists("EllipticalCylinderX") 
     86        yw = EllipticalCylinderX(cw,xw) 
    8787#else 
    88         yw = fEllipCyl20(cw,xw) 
     88        yw = fEllipticalCylinder(cw,xw) 
    8989#endif 
    9090        return(0) 
     
    9595// 20 points of quadrature seems to be sufficient for both integrals 
    9696// 
    97 Function fEllipCyl20(w,x)       : FitFunc 
     97Function fEllipticalCylinder(w,x)       : FitFunc 
    9898        Wave w 
    9999        Variable x 
     
    169169// used only for the dependency, not for fitting 
    170170// 
    171 Function fSmearedEllipCylForm(coefW,yW,xW) 
     171Function fSmearedEllipticalCylinder(coefW,yW,xW) 
    172172        Wave coefW,yW,xW 
    173173         
     
    184184         
    185185        Variable err 
    186         err = SmearedEllipCylForm(fs) 
     186        err = SmearedEllipticalCylinder(fs) 
    187187         
    188188        return (0) 
     
    190190 
    191191// this is all there is to the smeared calculation! 
    192 Function SmearedEllipCylForm(s) :FitFunc 
     192Function SmearedEllipticalCylinder(s) :FitFunc 
    193193        Struct ResSmearAAOStruct &s 
    194194 
    195195//      the name of your unsmeared model (AAO) is the first argument 
    196         Smear_Model_20(EllipCyl20,s.coefW,s.xW,s.yW,s.resW) 
     196        Smear_Model_20(EllipticalCylinder,s.coefW,s.xW,s.yW,s.resW) 
    197197 
    198198        return(0) 
Note: See TracChangeset for help on using the changeset viewer.