Changeset 153


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

Location:
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00
Files:
33 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/BE_Polyelectrolyte.ipf

    r151 r153  
    1313//////////////////////////////////////////////// 
    1414 
    15 Proc PlotBE_Polyelectrolyte(num,qmin,qmax) 
     15Proc PlotBEPolyelectrolyte(num,qmin,qmax) 
    1616        Variable num=512,qmin=0.001,qmax=0.2 
    1717        Prompt num "Enter number of data points for model: " 
     
    3636/////////////////////////////////////////////////////////// 
    3737// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    38 Proc PlotSmearedBE_Polyelectrolyte(str)                                                          
     38Proc PlotSmearedBEPolyelectrolyte(str)                                                           
    3939        String str 
    4040        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    5858                                         
    5959        Variable/G gs_BE=0 
    60         gs_BE := fSmearedBEPolyelec(smear_coef_BE,smeared_BE,smeared_qvals)     //this wrapper fills the STRUCT 
     60        gs_BE := fSmearedBEPolyelectrolyte(smear_coef_BE,smeared_BE,smeared_qvals)      //this wrapper fills the STRUCT 
    6161         
    6262        Display smeared_BE vs smeared_qvals                                                                     //**** mod 
     
    138138 
    139139// this is all there is to the smeared calculation! 
    140 Function SmearedBEPolyelec(s) :FitFunc 
     140Function SmearedBEPolyelectrolyte(s) :FitFunc 
    141141        Struct ResSmearAAOStruct &s 
    142142 
     
    152152// used only for the dependency, not for fitting 
    153153// 
    154 Function fSmearedBEPolyelec(coefW,yW,xW) 
     154Function fSmearedBEPolyelectrolyte(coefW,yW,xW) 
    155155        Wave coefW,yW,xW 
    156156         
     
    167167         
    168168        Variable err 
    169         err = SmearedBEPolyelec(fs) 
     169        err = SmearedBEPolyelectrolyte(fs) 
    170170         
    171171        return (0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CoreShell.ipf

    r146 r153  
    2424        Edit parameters_css,coef_css 
    2525        Variable/G root:g_css 
    26         g_css := CoreShellForm(coef_css,ywave_css,xwave_css) 
    27 //      ywave_css := CoreShellForm(coef_css,xwave_css) 
     26        g_css := CoreShellSphere(coef_css,ywave_css,xwave_css) 
     27//      ywave_css := CoreShellSphere(coef_css,xwave_css) 
    2828        Display ywave_css vs xwave_css 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    5858                                         
    5959        Variable/G gs_css=0 
    60         gs_css := fSmearedCoreShellForm(smear_coef_css,smeared_css,smeared_qvals)       //this wrapper fills the STRUCT 
     60        gs_css := fSmearedCoreShellSphere(smear_coef_css,smeared_css,smeared_qvals)     //this wrapper fills the STRUCT 
    6161         
    6262        Display smeared_css vs smeared_qvals                                                                     
     
    7171 
    7272//AAO version 
    73 Function CoreShellForm(cw,yw,xw) : FitFunc 
     73Function CoreShellSphere(cw,yw,xw) : FitFunc 
    7474        Wave cw,yw,xw 
    7575 
    76 #if exists("CoreShellFormX") 
    77         yw = CoreShellFormX(cw,xw) 
     76#if exists("CoreShellSphereX") 
     77        yw = CoreShellSphereX(cw,xw) 
    7878#else 
    79         yw = fCoreShellForm(cw,xw) 
     79        yw = fCoreShellSphere(cw,xw) 
    8080#endif 
    8181        return(0) 
     
    8585// unsmeared model calculation 
    8686/////////////////////////// 
    87 Function fCoreShellForm(w,x) : FitFunc 
     87Function fCoreShellSphere(w,x) : FitFunc 
    8888        Wave w 
    8989        Variable x 
     
    139139 
    140140// this is all there is to the smeared calculation! 
    141 Function SmearedCoreShellForm(s) :FitFunc 
     141Function SmearedCoreShellSphere(s) :FitFunc 
    142142        Struct ResSmearAAOStruct &s 
    143143 
    144144////the name of your unsmeared model is the first argument 
    145         Smear_Model_20(CoreShellForm,s.coefW,s.xW,s.yW,s.resW) 
     145        Smear_Model_20(CoreShellSphere,s.coefW,s.xW,s.yW,s.resW) 
    146146 
    147147        return(0) 
     
    153153// used only for the dependency, not for fitting 
    154154// 
    155 Function fSmearedCoreShellForm(coefW,yW,xW) 
     155Function fSmearedCoreShellSphere(coefW,yW,xW) 
    156156        Wave coefW,yW,xW 
    157157         
     
    168168         
    169169        Variable err 
    170         err = SmearedCoreShellForm(fs) 
     170        err = SmearedCoreShellSphere(fs) 
    171171         
    172172        return (0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CoreShellCylinder.ipf

    r151 r153  
    1414//////////////////////////////////////////////// 
    1515 
    16 Proc PlotCoreShellCylinderForm(num,qmin,qmax) 
     16Proc PlotCoreShellCylinder(num,qmin,qmax) 
    1717        Variable num=128,qmin=0.001,qmax=0.7 
    1818        Prompt num "Enter number of data points for model: " 
     
    3737/////////////////////////////////////////////////////////// 
    3838// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    39 Proc PlotSmearedCSCylinderForm(str)                                                              
     39Proc PlotSmearedCoreShellCylinder(str)                                                           
    4040        String str 
    4141        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    5959                                         
    6060        Variable/G gs_cscyl=0 
    61         gs_cscyl := fSmearedCoreShellCylinderForm(smear_coef_cscyl,smeared_cscyl,smeared_qvals) //this wrapper fills the STRUCT 
     61        gs_cscyl := fSmearedCoreShellCylinder(smear_coef_cscyl,smeared_cscyl,smeared_qvals)     //this wrapper fills the STRUCT 
    6262         
    6363        Display smeared_cscyl vs smeared_qvals 
     
    223223 
    224224// this is all there is to the smeared calculation! 
    225 Function SmearedCoreShellCylinderForm(s) :FitFunc 
     225Function SmearedCoreShellCylinder(s) :FitFunc 
    226226        Struct ResSmearAAOStruct &s 
    227227 
     
    238238// used only for the dependency, not for fitting 
    239239// 
    240 Function fSmearedCoreShellCylinderForm(coefW,yW,xW) 
     240Function fSmearedCoreShellCylinder(coefW,yW,xW) 
    241241        Wave coefW,yW,xW 
    242242         
     
    253253         
    254254        Variable err 
    255         err = SmearedCoreShellCylinderForm(fs) 
     255        err = SmearedCoreShellCylinder(fs) 
    256256         
    257257        return (0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CoreShell_and_Struct.ipf

    r151 r153  
    9191        //calculate each and combine 
    9292        Duplicate/O xw temp_CSS_HS_PQ,temp_CSS_HS_SQ            //make waves for the AAO 
    93         CoreShellForm(form_CSS_HS,temp_CSS_HS_PQ,xw) 
     93        CoreShellSphere(form_CSS_HS,temp_CSS_HS_PQ,xw) 
    9494        HardSphereStruct(struct_CSS_HS,temp_CSS_HS_SQ,xw) 
    9595        yw = temp_CSS_HS_PQ * temp_CSS_HS_SQ 
     
    186186        //calculate each and combine 
    187187        Duplicate/O xw temp_CSS_SW_PQ,temp_CSS_SW_SQ            //make waves for the AAO 
    188         CoreShellForm(form_CSS_SW,temp_CSS_SW_PQ,xw) 
     188        CoreShellSphere(form_CSS_SW,temp_CSS_SW_PQ,xw) 
    189189        SquareWellStruct(struct_CSS_SW,temp_CSS_SW_SQ,xw) 
    190190        yw = temp_CSS_SW_PQ * temp_CSS_SW_SQ 
     
    294294        //calculate each and combine 
    295295        Duplicate/O xw temp_CSS_SC_PQ,temp_CSS_SC_SQ            //make waves for the AAO 
    296         CoreShellForm(form_CSS_SC,temp_CSS_SC_PQ,xw) 
     296        CoreShellSphere(form_CSS_SC,temp_CSS_SC_PQ,xw) 
    297297        HayterPenfoldMSA(struct_CSS_SC,temp_CSS_SC_SQ,xw) 
    298298        yw = temp_CSS_SC_PQ * temp_CSS_SC_SQ 
     
    389389        //calculate each and combine 
    390390        Duplicate/O xw temp_CSS_SHS_PQ,temp_CSS_SHS_SQ          //make waves for the AAO 
    391         CoreShellForm(form_CSS_SHS,temp_CSS_SHS_PQ,xw) 
     391        CoreShellSphere(form_CSS_SHS,temp_CSS_SHS_PQ,xw) 
    392392        StickyHS_Struct(struct_CSS_SHS,temp_CSS_SHS_SQ,xw) 
    393393        yw = temp_CSS_SHS_PQ * temp_CSS_SHS_SQ 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/DAB_model.ipf

    r151 r153  
    1010 
    1111 
    12 Proc PlotDAB(num,qmin,qmax) 
     12Proc PlotDAB_Model(num,qmin,qmax) 
    1313        Variable num=512, qmin=.001, qmax=.7 
    1414        Prompt num "Enter number of data points for model: " 
     
    3434//////////////////////////////////////////////////// 
    3535// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    36 Proc PlotSmearedDAB(str)                                                                 
     36Proc PlotSmearedDAB_Model(str)                                                           
    3737        String str 
    3838        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/HollowCylinders.ipf

    r151 r153  
    1111//////////////////////////////////////////////// 
    1212 
    13 Proc PlotHollowCylinderForm(num,qmin,qmax) 
     13Proc PlotHollowCylinder(num,qmin,qmax) 
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
     
    3434/////////////////////////////////////////////////////////// 
    3535// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    36 Proc PlotSmearedHollowCylinderForm(str)                                                          
     36Proc PlotSmearedHollowCylinder(str)                                                              
    3737        String str 
    3838        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Lorentz_model.ipf

    r151 r153  
    55//      J. Barker, 2-10-99 
    66///////////////////////////// 
    7 Proc Plot_Lorentz(num,qmin,qmax) 
     7Proc PlotLorentz_Model(num,qmin,qmax) 
    88        Variable num=512, qmin=.001, qmax=.7 
    99        Prompt num "Enter number of data points for model: " 
     
    2929//////////////////////////////////////////////////// 
    3030// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    31 Proc PlotSmeared_Lorentz(str)                                                            
     31Proc PlotSmearedLorentz_Model(str)                                                               
    3232        String str 
    3333        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    101101 
    102102// this is all there is to the smeared calculation! 
    103 Function Smeared_Lorentz_Model(s) :FitFunc 
     103Function SmearedLorentz_Model(s) :FitFunc 
    104104        Struct ResSmearAAOStruct &s 
    105105 
     
    131131         
    132132        Variable err 
    133         err = Smeared_Lorentz_Model(fs) 
     133        err = SmearedLorentz_Model(fs) 
    134134         
    135135        return (0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Beaucage.ipf

    r151 r153  
    1414// see the help file for the original references 
    1515// 
    16 Proc PlotBeau_One(num,qmin,qmax) 
     16Proc PlotOnelevel(num,qmin,qmax) 
    1717        Variable num=256,qmin=0.001,qmax=0.7 
    1818        Prompt num "Enter number of data points for model: " 
     
    3535End 
    3636 
    37 Proc PlotBeau_Two(num,qmin,qmax) 
     37Proc PlotTwoLevel(num,qmin,qmax) 
    3838        Variable num=256,qmin=0.001,qmax=0.7 
    3939        Prompt num "Enter number of data points for model: " 
     
    5656End 
    5757 
    58 Proc PlotBeau_Three(num,qmin,qmax) 
     58Proc PlotThreeLevel(num,qmin,qmax) 
    5959        Variable num=256,qmin=0.001,qmax=0.7 
    6060        Prompt num "Enter number of data points for model: " 
     
    7777End 
    7878 
    79 Proc PlotBeau_Four(num,qmin,qmax) 
     79Proc PlotFourLevel(num,qmin,qmax) 
    8080        Variable num=256,qmin=0.001,qmax=0.7 
    8181        Prompt num "Enter number of data points for model: " 
     
    101101 
    102102// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    103 Proc PlotSmearedBeau_OneLevel(str)                                                               
     103Proc PlotSmearedOneLevel(str)                                                            
    104104        String str 
    105105        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    135135         
    136136// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    137 Proc PlotSmearedBeau_TwoLevel(str)                                                               
     137Proc PlotSmearedTwoLevel(str)                                                            
    138138        String str 
    139139        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    169169         
    170170// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    171 Proc PlotSmearedBeau_ThreeLevel(str)                                                             
     171Proc PlotSmearedThreeLevel(str)                                                          
    172172        String str 
    173173        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    203203         
    204204// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    205 Proc PlotSmearedBeau_FourLevel(str)                                                              
     205Proc PlotSmearedFourLevel(str)                                                           
    206206        String str 
    207207        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
  • 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 
  • 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) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/FlexCyl_EllipCross.ipf

    r151 r153  
    3838 
    3939// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    40 Proc PlotSmeared_FlexCyl_Ellip(str)                                                              
     40Proc PlotSmearedFlexCyl_Ellip(str)                                                               
    4141        String str 
    4242        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/FlexCyl_PolyLen.ipf

    r151 r153  
    88// JULY 2006 
    99// 
    10 Proc PlotFlexCyl_PolyLength(num,qmin,qmax) 
     10Proc PlotFlexCyl_PolyLen(num,qmin,qmax) 
    1111        Variable num=128,qmin=0.001,qmax=0.7 
    1212        Prompt num "Enter number of data points for model: " 
     
    3131 
    3232// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    33 Proc PlotSmeared_FlexCyl_PolyLen(str)                                                            
     33Proc PlotSmearedFlexCyl_PolyLen(str)                                                             
    3434        String str 
    3535        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/FlexCyl_PolyRadius.ipf

    r151 r153  
    77// JULY 2006 
    88// 
    9 Proc PlotFlexCyl_PolyRadius(num,qmin,qmax) 
     9Proc PlotFlexCyl_PolyRad(num,qmin,qmax) 
    1010        Variable num=100,qmin=0.001,qmax=0.7 
    1111        Prompt num "Enter number of data points for model: " 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/GaussSpheres.ipf

    r151 r153  
    1111// 
    1212 
    13 Proc PlotGaussPolySphere(num,qmin,qmax) 
     13Proc PlotGaussSpheres(num,qmin,qmax) 
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
     
    2424         
    2525        Variable/G root:g_pgs 
    26         g_pgs := GaussPolySphere(coef_pgs,ywave_pgs,xwave_pgs) 
     26        g_pgs := GaussSpheres(coef_pgs,ywave_pgs,xwave_pgs) 
    2727        Display ywave_pgs vs xwave_pgs 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    3333 
    3434// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    35 Proc PlotSmearedGaussPolySpheres(str)                                                            
     35Proc PlotSmearedGaussSpheres(str)                                                                
    3636        String str 
    3737        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    5555                                         
    5656        Variable/G gs_pgs=0 
    57         gs_pgs := fSmearedGaussPolySphere(smear_coef_pgs,smeared_pgs,smeared_qvals)     //this wrapper fills the STRUCT 
     57        gs_pgs := fSmearedGaussSpheres(smear_coef_pgs,smeared_pgs,smeared_qvals)        //this wrapper fills the STRUCT 
    5858         
    5959        Display smeared_pgs vs smeared_qvals                                                                     
     
    7272// simply calls the original single point calculation with 
    7373// a wave assignment (this will behave nicely if given point ranges) 
    74 Function GaussPolySphere(cw,yw,xw) : FitFunc 
     74Function GaussSpheres(cw,yw,xw) : FitFunc 
    7575        Wave cw,yw,xw 
    7676         
    77 #if exists("GaussPolySphereX") 
    78         yw = GaussPolySphereX(cw,xw) 
     77#if exists("GaussSpheresX") 
     78        yw = GaussSpheresX(cw,xw) 
    7979#else 
    80         yw = fGaussPolySphere(cw,xw) 
     80        yw = fGaussSpheres(cw,xw) 
    8181#endif 
    8282        return(0) 
    8383End 
    8484 
    85 Function fGaussPolySphere(w,xx) : FitFunc 
     85Function fGaussSpheres(w,xx) : FitFunc 
    8686        wave w 
    8787        variable xx 
     
    177177// used only for the dependency, not for fitting 
    178178// 
    179 Function fSmearedGaussPolySphere(coefW,yW,xW) 
     179Function fSmearedGaussSpheres(coefW,yW,xW) 
    180180        Wave coefW,yW,xW 
    181181         
     
    192192         
    193193        Variable err 
    194         err = SmearedGaussPolySphere(fs) 
     194        err = SmearedGaussSpheres(fs) 
    195195         
    196196        return (0) 
     
    198198 
    199199// this is all there is to the smeared calculation! 
    200 Function SmearedGaussPolySphere(s) :FitFunc 
     200Function SmearedGaussSpheres(s) :FitFunc 
    201201        Struct ResSmearAAOStruct &s 
    202202 
    203203//      the name of your unsmeared model (AAO) is the first argument 
    204         Smear_Model_20(GaussPolySphere,s.coefW,s.xW,s.yW,s.resW) 
     204        Smear_Model_20(GaussSpheres,s.coefW,s.xW,s.yW,s.resW) 
    205205 
    206206        return(0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/GaussSpheres_and_Struct.ipf

    r151 r153  
    9999        //calculate each and combine 
    100100        Duplicate/O xw tmp_pgs_HS_PQ,tmp_pgs_HS_SQ 
    101         GaussPolySphere(form_pgs_HS,tmp_pgs_HS_PQ,xw) 
     101        GaussSpheres(form_pgs_HS,tmp_pgs_HS_PQ,xw) 
    102102        HardSphereStruct(struct_pgs_HS,tmp_pgs_HS_SQ,xw) 
    103103        yw = tmp_pgs_HS_PQ * tmp_pgs_HS_SQ 
     
    199199        //calculate each and combine 
    200200        Duplicate/O xw tmp_pgs_SW_PQ,tmp_pgs_SW_SQ 
    201         GaussPolySphere(form_pgs_SW,tmp_pgs_SW_PQ,xw) 
     201        GaussSpheres(form_pgs_SW,tmp_pgs_SW_PQ,xw) 
    202202        SquareWellStruct(struct_pgs_SW,tmp_pgs_SW_SQ,xw) 
    203203        yw = tmp_pgs_SW_PQ * tmp_pgs_SW_SQ 
     
    312312        //calculate each and combine 
    313313        Duplicate/O xw tmp_pgs_SC_PQ,tmp_pgs_SC_SQ 
    314         GaussPolySphere(form_pgs_SC,tmp_pgs_SC_PQ,xw) 
     314        GaussSpheres(form_pgs_SC,tmp_pgs_SC_PQ,xw) 
    315315        HayterPenfoldMSA(struct_pgs_SC,tmp_pgs_SC_SQ,xw) 
    316316        yw = tmp_pgs_SC_PQ * tmp_pgs_SC_SQ 
     
    412412        //calculate each and combine 
    413413        Duplicate/O xw tmp_pgs_SHS_PQ,tmp_pgs_SHS_SQ 
    414         GaussPolySphere(form_pgs_SHS,tmp_pgs_SHS_PQ,xw) 
     414        GaussSpheres(form_pgs_SHS,tmp_pgs_SHS_PQ,xw) 
    415415        StickyHS_Struct(struct_pgs_SHS,tmp_pgs_SHS_SQ,xw) 
    416416        yw = tmp_pgs_SHS_PQ * tmp_pgs_SHS_SQ 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarFF.ipf

    r151 r153  
    2121//needed to calculate the model function. 
    2222// 
    23 Proc Plot_LamellarFF(num,qmin,qmax) 
     23Proc PlotLamellarFF(num,qmin,qmax) 
    2424        Variable num=128, qmin=.001, qmax=.5 
    2525        Prompt num "Enter number of data points for model: " 
     
    4646 
    4747// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    48 Proc PlotSmeared_LamellarFF(str)                                                                 
     48Proc PlotSmearedLamellarFF(str)                                                          
    4949        String str 
    5050        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    6868                                         
    6969        Variable/G gs_LamellarFF=0 
    70         gs_LamellarFF := fLamellarFF_Smeared(smear_coef_LamellarFF,smeared_LamellarFF,smeared_qvals)    //this wrapper fills the STRUCT 
     70        gs_LamellarFF := fSmearedLamellarFF(smear_coef_LamellarFF,smeared_LamellarFF,smeared_qvals)     //this wrapper fills the STRUCT 
    7171         
    7272        Display smeared_LamellarFF vs smeared_qvals                                                                     // 
     
    141141// used only for the dependency, not for fitting 
    142142// 
    143 Function fLamellarFF_Smeared(coefW,yW,xW) 
     143Function fSmearedLamellarFF(coefW,yW,xW) 
    144144        Wave coefW,yW,xW 
    145145         
     
    156156         
    157157        Variable err 
    158         err = LamellarFF_Smeared(fs) 
     158        err = SmearedLamellarFF(fs) 
    159159         
    160160        return (0) 
     
    162162 
    163163//the smeared model calculation 
    164 Function LamellarFF_Smeared(s) :FitFunc 
     164Function SmearedLamellarFF(s) :FitFunc 
    165165        Struct ResSmearAAOStruct &s 
    166166 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarFF_HG.ipf

    r151 r153  
    2323//needed to calculate the model function. 
    2424// 
    25 Proc Plot_LamellarFF_HG(num,qmin,qmax) 
     25Proc PlotLamellarFF_HG(num,qmin,qmax) 
    2626        Variable num=128, qmin=.001, qmax=.5 
    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_LamellarFF_HG(str)                                                              
     50Proc PlotSmearedLamellarFF_HG(str)                                                               
    5151        String str 
    5252        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    7070                                         
    7171        Variable/G gs_LamellarFF_HG=0 
    72         gs_LamellarFF_HG := fLamellarFF_HG_Smeared(smear_coef_LamellarFF_HG,smeared_LamellarFF_HG,smeared_qvals)        //this wrapper fills the STRUCT 
     72        gs_LamellarFF_HG := fSmearedLamellarFF_HG(smear_coef_LamellarFF_HG,smeared_LamellarFF_HG,smeared_qvals) //this wrapper fills the STRUCT 
    7373         
    7474        Display smeared_LamellarFF_HG vs smeared_qvals                                                                  // 
     
    149149// used only for the dependency, not for fitting 
    150150// 
    151 Function fLamellarFF_HG_Smeared(coefW,yW,xW) 
     151Function fSmearedLamellarFF_HG(coefW,yW,xW) 
    152152        Wave coefW,yW,xW 
    153153         
     
    164164         
    165165        Variable err 
    166         err = LamellarFF_HG_Smeared(fs) 
     166        err = SmearedLamellarFF_HG(fs) 
    167167         
    168168        return (0) 
     
    170170 
    171171//the smeared model calculation 
    172 Function LamellarFF_HG_Smeared(s) :FitFunc 
     172Function SmearedLamellarFF_HG(s) :FitFunc 
    173173        Struct ResSmearAAOStruct &s 
    174174 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarPS.ipf

    r151 r153  
    4747//needed to calculate the model function. 
    4848// 
    49 Proc Plot_LamellarPS(num,qmin,qmax) 
     49Proc PlotLamellarPS(num,qmin,qmax) 
    5050        Variable num=128, qmin=.001, qmax=.5 
    5151        Prompt num "Enter number of data points for model: " 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarPS_HG.ipf

    r151 r153  
    4747//needed to calculate the model function. 
    4848// 
    49 Proc Plot_LamellarPS_HG(num,qmin,qmax) 
     49Proc PlotLamellarPS_HG(num,qmin,qmax) 
    5050        Variable num=128, qmin=.001, qmax=.5 
    5151        Prompt num "Enter number of data points for model: " 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LogNormSpheres_and_Struct.ipf

    r151 r153  
    9898        //calculate each and combine 
    9999        Duplicate/O xw tmp_lns_HS_PQ,tmp_lns_HS_SQ 
    100         LogNormalPolySphere(form_lns_HS,tmp_lns_HS_PQ,xw) 
     100        LogNormalSphere(form_lns_HS,tmp_lns_HS_PQ,xw) 
    101101        HardSphereStruct(struct_lns_HS,tmp_lns_HS_SQ,xw) 
    102102        yw = tmp_lns_HS_PQ *tmp_lns_HS_SQ 
     
    198198        //calculate each and combine 
    199199        Duplicate/O xw tmp_lns_SW_PQ,tmp_lns_SW_SQ 
    200         LogNormalPolySphere(form_lns_SW,tmp_lns_SW_PQ,xw) 
     200        LogNormalSphere(form_lns_SW,tmp_lns_SW_PQ,xw) 
    201201        SquareWellStruct(struct_lns_SW,tmp_lns_SW_SQ,xw) 
    202202        yw = tmp_lns_SW_PQ * tmp_lns_SW_SQ 
     
    312312        //calculate each and combine 
    313313        Duplicate/O xw tmp_lns_SC_PQ,tmp_lns_SC_SQ 
    314         LogNormalPolySphere(form_lns_SC,tmp_lns_SC_PQ,xw) 
     314        LogNormalSphere(form_lns_SC,tmp_lns_SC_PQ,xw) 
    315315        HayterPenfoldMSA(struct_lns_SC,tmp_lns_SC_SQ,xw) 
    316316        yw = tmp_lns_SC_PQ * tmp_lns_SC_SQ 
     
    412412        //calculate each and combine 
    413413        Duplicate/O xw tmp_lns_SHS_PQ,tmp_lns_SHS_SQ 
    414         LogNormalPolySphere(form_lns_SHS,tmp_lns_SHS_PQ,xw) 
     414        LogNormalSphere(form_lns_SHS,tmp_lns_SHS_PQ,xw) 
    415415        StickyHS_Struct(struct_lns_SHS,tmp_lns_SHS_SQ,xw) 
    416416        yw = tmp_lns_SHS_PQ * tmp_lns_SHS_SQ 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LogNormalSphere.ipf

    r151 r153  
    88 
    99//Proc to setup data and coefficients to plot the model 
    10 Proc PlotLogNormalPolySphere(num,qmin,qmax) 
     10Proc PlotLogNormalSphere(num,qmin,qmax) 
    1111        Variable num=128,qmin=0.001,qmax=0.7 
    1212        Prompt num "Enter number of data points for model: " 
     
    2121         
    2222        Variable/G root:g_lns 
    23         g_lns := LogNormalPolySphere(coef_lns,ywave_lns,xwave_lns) 
     23        g_lns := LogNormalSphere(coef_lns,ywave_lns,xwave_lns) 
    2424        Display ywave_lns vs xwave_lns 
    2525        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    3030 
    3131// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    32 Proc PlotSmearLogNormPolySphere(str)                                                             
     32Proc PlotSmearedLogNormalSphere(str)                                                             
    3333        String str 
    3434        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    5252                                         
    5353        Variable/G gs_lns=0 
    54         gs_lns := fSmearLogNormSphere(smear_coef_lns,smeared_lns,smeared_qvals) //this wrapper fills the STRUCT 
     54        gs_lns := fSmearedLogNormalSphere(smear_coef_lns,smeared_lns,smeared_qvals)     //this wrapper fills the STRUCT 
    5555         
    5656        Display smeared_lns vs smeared_qvals                                                                     
     
    6969// simply calls the original single point calculation with 
    7070// a wave assignment (this will behave nicely if given point ranges) 
    71 Function LogNormalPolySphere(cw,yw,xw) : FitFunc 
     71Function LogNormalSphere(cw,yw,xw) : FitFunc 
    7272        Wave cw,yw,xw 
    7373         
    74 #if exists("LogNormalPolySphereX") 
    75         yw = LogNormalPolySphereX(cw,xw) 
     74#if exists("LogNormalSphereX") 
     75        yw = LogNormalSphereX(cw,xw) 
    7676#else 
    77         yw = fLogNormalPolySphere(cw,xw) 
     77        yw = fLogNormalSphere(cw,xw) 
    7878#endif 
    7979        return(0) 
     
    8585// 76 points is slower, but reccommended to remove high-q oscillations 
    8686// 
    87 Function fLogNormalPolySphere(w,xx): FitFunc 
     87Function fLogNormalSphere(w,xx): FitFunc 
    8888        wave w 
    8989        variable xx 
     
    185185// used only for the dependency, not for fitting 
    186186// 
    187 Function fSmearLogNormSphere(coefW,yW,xW) 
     187Function fSmearedLogNormalSphere(coefW,yW,xW) 
    188188        Wave coefW,yW,xW 
    189189         
     
    200200         
    201201        Variable err 
    202         err = SmearLogNormSphere(fs) 
     202        err = SmearedLogNormalSphere(fs) 
    203203         
    204204        return (0) 
     
    206206 
    207207// this is all there is to the smeared calculation! 
    208 Function SmearLogNormSphere(s) :FitFunc 
     208Function SmearedLogNormalSphere(s) :FitFunc 
    209209        Struct ResSmearAAOStruct &s 
    210210 
    211211//      the name of your unsmeared model (AAO) is the first argument 
    212         Smear_Model_20(LogNormalPolySphere,s.coefW,s.xW,s.yW,s.resW) 
     212        Smear_Model_20(LogNormalSphere,s.coefW,s.xW,s.yW,s.resW) 
    213213 
    214214        return(0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/MultiShell.ipf

    r151 r153  
    2424         
    2525        Variable/G root:g_mss 
    26         g_mss := MultiShellForm(coef_mss,ywave_mss,xwave_mss) 
     26        g_mss := MultiShellSphere(coef_mss,ywave_mss,xwave_mss) 
    2727        Display/K=1 ywave_mss vs xwave_mss 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
     
    3333 
    3434// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    35 Proc PlotSmearedMultiShell(str)                                                          
     35Proc PlotSmearedMultiShellSphere(str)                                                            
    3636        String str 
    3737        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    5555                                         
    5656        Variable/G gs_mss=0 
    57         gs_mss := fSmearedMultiShell(smear_coef_mss,smeared_mss,smeared_qvals)  //this wrapper fills the STRUCT 
     57        gs_mss := fSmearedMultiShellSphere(smear_coef_mss,smeared_mss,smeared_qvals)    //this wrapper fills the STRUCT 
    5858         
    5959        Display/K=1 smeared_mss vs smeared_qvals                                                                         
     
    7272// simply calls the original single point calculation with 
    7373// a wave assignment (this will behave nicely if given point ranges) 
    74 Function MultiShellForm(cw,yw,xw) : FitFunc 
     74Function MultiShellSphere(cw,yw,xw) : FitFunc 
    7575        Wave cw,yw,xw 
    7676         
    77 #if exists("MultiShellFormX") 
    78         yw = MultiShellFormX(cw,xw) 
     77#if exists("MultiShellSphereX") 
     78        yw = MultiShellSphereX(cw,xw) 
    7979#else 
    80         yw = fMultiShellForm(cw,xw) 
     80        yw = fMultiShellSphere(cw,xw) 
    8181#endif 
    8282        return(0) 
    8383End 
    8484 
    85 Function fMultiShellForm(w,x) :FitFunc 
     85Function fMultiShellSphere(w,x) :FitFunc 
    8686        Wave w 
    8787        Variable x 
     
    163163// used only for the dependency, not for fitting 
    164164// 
    165 Function fSmearedMultiShell(coefW,yW,xW) 
     165Function fSmearedMultiShellSphere(coefW,yW,xW) 
    166166        Wave coefW,yW,xW 
    167167         
     
    178178         
    179179        Variable err 
    180         err = SmearedMultiShell(fs) 
     180        err = SmearedMultiShellSphere(fs) 
    181181         
    182182        return (0) 
     
    184184 
    185185// this is all there is to the smeared calculation! 
    186 Function SmearedMultiShell(s) :FitFunc 
     186Function SmearedMultiShellSphere(s) :FitFunc 
    187187        Struct ResSmearAAOStruct &s 
    188188 
    189189//      the name of your unsmeared model (AAO) is the first argument 
    190         Smear_Model_20(MultiShellForm,s.coefW,s.xW,s.yW,s.resW) 
     190        Smear_Model_20(MultiShellSphere,s.coefW,s.xW,s.yW,s.resW) 
    191191 
    192192        return(0) 
  • 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 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/SchulzSpheres.ipf

    r145 r153  
    99 
    1010// 
    11 Proc PlotSchulzPolySpheres(num,qmin,qmax) 
     11Proc PlotSchulzSpheres(num,qmin,qmax) 
    1212        Variable num=128,qmin=0.001,qmax=0.7 
    1313        Prompt num "Enter number of data points for model: " 
     
    3232 
    3333// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    34 Proc PlotSmearedSchulzPolySpheres(str)                                                           
     34Proc PlotSmearedSchulzSpheres(str)                                                               
    3535        String str 
    3636        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/StickyHardSphereStruct.ipf

    r127 r153  
    2222//needed to calculate the model function. 
    2323// 
    24 Proc Plot_StickyHS_Struct(num,qmin,qmax) 
     24Proc PlotStickyHS_Struct(num,qmin,qmax) 
    2525        Variable num=256, qmin=.001, qmax=.5 
    2626        Prompt num "Enter number of data points for model: " 
  • 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 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/Vesicle_UL.ipf

    r151 r153  
    2121//////////////////////////////////////////////// 
    2222 
    23 Proc PlotVesicle(num,qmin,qmax) 
     23Proc PlotVesicleForm(num,qmin,qmax) 
    2424        Variable num=128,qmin=0.001,qmax=0.7 
    2525        Prompt num "Enter number of data points for model: " 
     
    4545 
    4646// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    47 Proc PlotSmearedVesicle(str)                                                             
     47Proc PlotSmearedVesicleForm(str)                                                                 
    4848        String str 
    4949        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf

    r152 r153  
    7171 
    7272// show the available models 
    73 // not the f* 
    74 // not the *X XOPS 
     73// not the f*(cw,xw) point calculations 
     74// not the *X(cw,xw) XOPS 
    7575// 
    7676// KIND:10 should show only user-defined curve fitting functions 
     
    7979Function/S W_FunctionPopupList() 
    8080        String list,tmp 
    81         list = FunctionList("*",";","KIND:10")          //get everything 
    82          
    83         list = RemoveFromList("Sum_Model", list  ,";") 
     81        list = FunctionList("*",";","KIND:10")          //get every user defined curve fit function 
     82//      list = RemoveFromList("Sum_Model", list  ,";") 
    8483         
    8584        tmp = FunctionList("*_proto",";","KIND:10")             //prototypes 
    8685        list = RemoveFromList(tmp, list  ,";") 
    87  
    88         tmp = FunctionList("f*",";","KIND:10")          //point calculations 
     86//      Print "everything - proto = ",list 
     87//      print " " 
     88 
     89        tmp = FunctionList("f*",";","NPARAMS:2")                //point calculations 
     90//      Print "f* = ",tmp 
     91//      print " " 
    8992        list = RemoveFromList(tmp, list  ,";") 
    9093         
    91         // this should be a null string with KIND:10 
    92         tmp = FunctionList("*X",";","KIND:10")          //XOPs, also point calculations 
     94        tmp = FunctionList("fSmear*",";","NPARAMS:3")           //smeared dependency calculations 
     95//      Print "f* = ",tmp 
     96//      print " " 
    9397        list = RemoveFromList(tmp, list  ,";") 
    9498         
     99//      tmp = FunctionList("*X",";","KIND:4")           //XOPs, but these shouldn't show up if KIND:10 is used initially 
     100//      Print "X* = ",tmp 
     101//      print " " 
     102//      list = RemoveFromList(tmp, list  ,";") 
     103         
     104        //non-fit functions that I can't seem to filter out 
     105        list = RemoveFromList("BinaryHS_PSF11;BinaryHS_PSF12;BinaryHS_PSF22;EllipCyl_Integrand;PP_Inner;PP_Outer;Phi_EC;TaE_Inner;TaE_Outer;",list,";") 
     106 
    95107        if(strlen(list)==0) 
    96108                list = "No functions plotted" 
     
    113125        list = WaveList("coef*",";","") 
    114126         
    115         ControlInfo popup_0 
     127        ControlInfo/W=wrapperpanel popup_0 
    116128        if(V_Value != 0)                //0== no items in menu 
    117129                if(DataFolderExists("root:"+S_Value)) 
     
    121133        endif 
    122134         
     135        // tmp coefficients that aren't being cleaned up from somewhere... 
     136        list = RemoveFromList("temp_coef_1;temp_coef_2;", list  ,";") 
     137 
    123138        if(strlen(list)==0) 
    124139                list = "No functions plotted" 
    125140        endif 
    126141        list = SortList(list) 
     142         
     143//      Print itemsinlist(list,";") 
    127144         
    128145        setDataFolder root: 
     
    196213End 
    197214 
    198 Function/S getModelSuffix(modelStr) 
    199         String modelStr 
    200          
    201         Variable pos=Strsearch(modelStr,"_",Inf,1)              //look backwards to find "_" 
    202          
    203         return(modelStr[pos,strlen(modelStr)-1]) 
     215// always pass this the coefficient string 
     216// 
     217// either "coef_" 
     218// or "smear_coef_" 
     219// 
     220Function/S getModelSuffix(coefStr) 
     221        String coefStr 
     222 
     223        Variable pos,start=0 
     224//      Variable pos=Strsearch(modelStr,"_",Inf,1)              //look backwards to find "_" - this fails for form+struct models 
     225 
     226        if(stringmatch(coefStr,"smear_*") == 1) 
     227                start=7 //look forwards to find "_", skipping "smear_coe" if necessary 
     228        endif 
     229        pos=Strsearch(coefStr,"_",start,0) 
     230        //Print start, pos 
     231        return(coefStr[pos,strlen(coefStr)-1]) 
    204232End 
    205233 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Peak_Gauss_model.ipf

    r151 r153  
    55//      J. Barker, 2-10-99 
    66////////////////// 
    7 Proc PlotPeak_Gauss(num,qmin,qmax) 
     7Proc PlotPeak_Gauss_Model(num,qmin,qmax) 
    88        Variable num=512, qmin=.001, qmax=.7 
    99        Prompt num "Enter number of data points for model: " 
     
    3030//////////////////////////////////////////////////// 
    3131// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    32 Proc PlotSmearedPeak_Gauss(str)                                                          
     32Proc PlotSmearedPeak_Gauss_Model(str)                                                            
    3333        String str 
    3434        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Peak_Lorentz_model.ipf

    r151 r153  
    55//      J. Barker, 2-10-99 
    66//////////////////////////////////// 
    7 Proc PlotPeak_Lorentz(num,qmin,qmax) 
     7Proc PlotPeak_Lorentz_Model(num,qmin,qmax) 
    88        Variable num=512, qmin=.001, qmax=.7 
    99        Prompt num "Enter number of data points for model: " 
     
    3030//////////////////////////////////////////////////// 
    3131// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    32 Proc PlotSmearedPeak_Lorentz(str)                                                                
     32Proc PlotSmearedPeak_Lorentz_Model(str)                                                          
    3333        String str 
    3434        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
  • 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) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Power_Law_model.ipf

    r151 r153  
    55//      J. Barker, 2-10-99 
    66////////////////////////////////// 
    7 Proc PlotPower_Law(num,qmin,qmax) 
     7Proc PlotPower_Law_Model(num,qmin,qmax) 
    88        Variable num=512, qmin=.001, qmax=.2 
    99        Prompt num "Enter number of data points for model: " 
     
    3131//////////////////////////////////////////////////// 
    3232// - sets up a dependency to a wrapper, not the actual SmearedModelFunction 
    33 Proc PlotSmearedPower_Law(str)                                                           
     33Proc PlotSmearedPower_Law_Model(str)                                                             
    3434        String str 
    3535        Prompt str,"Pick the data folder containing the resolution you want",popup,getAList(4) 
     
    6666 
    6767//AAO version 
    68 Function Power_Law_model(cw,yw,xw) : FitFunc 
     68Function Power_Law_Model(cw,yw,xw) : FitFunc 
    6969        Wave cw,yw,xw 
    7070 
    71 #if exists("Power_Law_modelX") 
    72         yw = Power_Law_modelX(cw,xw) 
     71#if exists("Power_Law_ModelX") 
     72        yw = Power_Law_ModelX(cw,xw) 
    7373#else 
    74         yw = fPower_Law_model(cw,xw) 
     74        yw = fPower_Law_Model(cw,xw) 
    7575#endif 
    7676        return(0) 
    7777End 
    7878 
    79 Function fPower_Law_model(w,x) : FitFunc 
     79Function fPower_Law_Model(w,x) : FitFunc 
    8080        Wave w 
    8181        Variable x 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/UniformEllipsoid.ipf

    r151 r153  
    5555        SetScale d,0,0,"1/cm",smeared_eor        
    5656 
    57         Variable/G root:gs_eor=0 
     57        Variable/G gs_eor=0 
    5858        gs_eor := fSmearedEllipsoidForm(smear_coef_eor,smeared_eor,smeared_qvals) 
    5959         
Note: See TracChangeset for help on using the changeset viewer.