Changeset 168


Ignore:
Timestamp:
Sep 25, 2007 2:21:35 PM (15 years ago)
Author:
srkline
Message:

Fixing keyWord string pairs for model functions as errors are found.

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

Legend:

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

    r166 r168  
    4646         
    4747        // Setup parameter table for model function 
    48         Make/O/D smear_coef_fractal =  {0.05,5,2,100,2e-6,6.35e-6,0} 
    49         make/o/t smear_parameters_fractal = {"Volume Fraction (scale)","Block Radius (A)","fractal dimension","correlation length (A)","SLD block (A-2)","SLD solvent (A-2)","bkgd (cm^-1 sr^-1)"} 
    50         Edit smear_parameters_fractal,smear_coef_fractal                                        //display parameters in a table 
     48        Make/O/D smear_coef_fra =  {0.05,5,2,100,2e-6,6.35e-6,0} 
     49        make/o/t smear_parameters_fra = {"Volume Fraction (scale)","Block Radius (A)","fractal dimension","correlation length (A)","SLD block (A-2)","SLD solvent (A-2)","bkgd (cm^-1 sr^-1)"} 
     50        Edit smear_parameters_fra,smear_coef_fra                                        //display parameters in a table 
    5151         
    5252        // output smeared intensity wave, dimensions are identical to experimental QSIG values 
    5353        // make extra copy of experimental q-values for easy plotting 
    54         Duplicate/O $(str+"_q") smeared_fractal,smeared_qvals                           // 
    55         SetScale d,0,0,"1/cm",smeared_fractal                                                   // 
     54        Duplicate/O $(str+"_q") smeared_fra,smeared_qvals                               // 
     55        SetScale d,0,0,"1/cm",smeared_fra                                               // 
    5656                                         
    57         Variable/G gs_fractal=0 
    58         gs_fractal := fSmearedFractal(smear_coef_fractal,smeared_fractal,smeared_qvals) //this wrapper fills the STRUCT 
     57        Variable/G gs_fra=0 
     58        gs_fra := fSmearedFractal(smear_coef_fra,smeared_fra,smeared_qvals)     //this wrapper fills the STRUCT 
    5959         
    60         Display smeared_fractal vs smeared_qvals                 
     60        Display smeared_fra vs smeared_qvals             
    6161        ModifyGraph log=1,marker=29,msize=2,mode=4 
    6262        Label bottom "q (\\S-1\\M)" 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarFF.ipf

    r166 r168  
    8080        SetDataFolder root: 
    8181         
    82         AddModelToStrings("SmearedLamellarPS","smear_coef_LamellarFF","LamellarFF") 
     82        AddModelToStrings("SmearedLamellarFF","smear_coef_LamellarFF","LamellarFF") 
    8383End 
    8484//////////////////////////////////////////////////// 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LogNormalSphere.ipf

    r166 r168  
    238238        Variable nden,r3,rg,sv,i0,ravg,rpk 
    239239         
    240         if(WaveExists(coef_lns)==0) 
    241                 abort "You need to plot the model first to create the coefficient table" 
     240        if(Exists("coef_lns")==0) 
     241                abort "You need to plot the unsmeared model first to create the coefficient table" 
    242242        Endif 
    243243         
     
    269269        variable sig,mu,maxr 
    270270         
    271         if(WaveExists(coef_lns)==0) 
    272                 abort "You need to plot the model first to create the coefficient table" 
     271        if(Exists("coef_lns")==0) 
     272                abort "You need to plot the unsmeared model first to create the coefficient table" 
    273273        Endif 
    274274        sig=coef_lns[2] 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/SumModel/SumSANSModels.ipf

    r151 r168  
    195195        Legend                                   
    196196        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     197         
     198        AddModelToStrings("Sum_Model","coef_sum","sum") 
    197199End 
    198200 
     
    269271         
    270272        SetDataFolder root: 
     273        AddModelToStrings("Smeared_Sum_Model","smear_coef_sum","sum") 
    271274End 
    272275 
Note: See TracChangeset for help on using the changeset viewer.