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

    r151 r153  
    2525        Edit parameters_phs,coef_phs 
    2626        Variable/G root:g_phs 
    27         g_phs := PolyHardSphereIntensity(coef_phs,ywave_phs,xwave_phs) 
    28 //      ywave_phs := PolyHardSphereIntensity(coef_phs,xwave_phs) 
     27        g_phs := PolyHardSpheres(coef_phs,ywave_phs,xwave_phs) 
     28//      ywave_phs := PolyHardSpheres(coef_phs,xwave_phs) 
    2929        Display ywave_phs vs xwave_phs 
    3030        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    7070 
    7171//AAO version 
    72 Function PolyHardSphereIntensity(cw,yw,xw) : FitFunc 
     72Function PolyHardSpheres(cw,yw,xw) : FitFunc 
    7373        Wave cw,yw,xw 
    7474 
    75 #if exists("PolyHardSphereIntensityX") 
    76         yw = PolyHardSphereIntensityX(cw,xw) 
     75#if exists("PolyHardSpheresX") 
     76        yw = PolyHardSpheresX(cw,xw) 
    7777#else 
    78         yw = fPolyHardSphereIntensity(cw,xw) 
     78        yw = fPolyHardSpheres(cw,xw) 
    7979#endif 
    8080        return(0) 
     
    9494// 
    9595/////////////////////////// 
    96 Function fPolyHardSphereIntensity(w,k) : FitFunc 
     96Function fPolyHardSpheres(w,k) : FitFunc 
    9797        Wave w                  // the coefficient wave 
    9898        Variable k              // the x values, as a variable (single k is OK) 
     
    210210 
    211211////the name of your unsmeared model is the first argument 
    212         Smear_Model_20(PolyHardSphereIntensity,s.coefW,s.xW,s.yW,s.resW) 
     212        Smear_Model_20(PolyHardSpheres,s.coefW,s.xW,s.yW,s.resW) 
    213213 
    214214        return(0) 
Note: See TracChangeset for help on using the changeset viewer.