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

    r151 r153  
    4444//background = guess[7] 
    4545 
    46 Proc Plot_BinaryHS(num,qmin,qmax) 
     46Proc PlotBinaryHS(num,qmin,qmax) 
    4747        Variable num=256, qmin=.001, qmax=.7 
    4848        Prompt num "Enter number of data points for model: " 
     
    6969 
    7070// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    71 Proc PlotSmeared_BinaryHS(str)                                                           
     71Proc PlotSmearedBinaryHS(str)                                                            
    7272        String str 
    7373        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    9292                                         
    9393        Variable/G gs_BinaryHS=0 
    94         gs_BinaryHS := fBinaryHS_Smeared(smear_coef_BinaryHS,smeared_BinaryHS,smeared_qvals)    //this wrapper fills the STRUCT 
     94        gs_BinaryHS := fSmearedBinaryHS(smear_coef_BinaryHS,smeared_BinaryHS,smeared_qvals)     //this wrapper fills the STRUCT 
    9595         
    9696        Display smeared_BinaryHS vs smeared_qvals                                                                       // 
     
    455455// used only for the dependency, not for fitting 
    456456// 
    457 Function fBinaryHS_Smeared(coefW,yW,xW) 
     457Function fSmearedBinaryHS(coefW,yW,xW) 
    458458        Wave coefW,yW,xW 
    459459         
     
    470470         
    471471        Variable err 
    472         err = BinaryHS_Smeared(fs) 
     472        err = SmearedBinaryHS(fs) 
    473473         
    474474        return (0) 
     
    476476 
    477477// this is all there is to the smeared calculation! 
    478 Function BinaryHS_Smeared(s) :FitFunc 
     478Function SmearedBinaryHS(s) :FitFunc 
    479479        Struct ResSmearAAOStruct &s 
    480480 
Note: See TracChangeset for help on using the changeset viewer.