Ignore:
Timestamp:
May 19, 2009 5:18:50 PM (14 years ago)
Author:
srkline
Message:

Simple change in all of the model function files to include the name of the parameter wave in the Keyword=list that is generated when a model is plotted. This is becoming an issue where the proper parameter wave can't be deduced from just the suffix, then there is nothing to put in the table.

I should have added this when I initially wrote the wrapper...

Location:
sans/Dev/trunk/NCNR_User_Procedures/Analysis
Files:
89 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/BE_Polyelectrolyte_v40.ipf

    r379 r510  
    3333        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3434         
    35         AddModelToStrings("BEPolyelectrolyte","coef_BE","BE") 
     35        AddModelToStrings("BEPolyelectrolyte","coef_BE","parameters_BE","BE") 
    3636End 
    3737 
     
    6969         
    7070        SetDataFolder root: 
    71         AddModelToStrings("SmearedBEPolyelectrolyte","smear_coef_BE","BE") 
     71        AddModelToStrings("SmearedBEPolyelectrolyte","smear_coef_BE","smear_parameters_BE","BE") 
    7272End 
    7373         
     
    175175End 
    176176 
    177  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/CoreShellCylinder_v40.ipf

    r379 r510  
    3434        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3535         
    36         AddModelToStrings("CoreShellCylinder","coef_cscyl","cscyl") 
     36        AddModelToStrings("CoreShellCylinder","coef_cscyl","parameters_cscyl","cscyl") 
    3737End 
    3838 
     
    7070         
    7171        SetDataFolder root: 
    72         AddModelToStrings("SmearedCoreShellCylinder","smear_coef_cscyl","cscyl") 
     72        AddModelToStrings("SmearedCoreShellCylinder","smear_coef_cscyl","smear_parameters_cscyl","cscyl") 
    7373End 
    7474         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/CoreShell_Sq_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("CoreShell_HS","coef_CSS_HS","CSS_HS") 
     34        AddModelToStrings("CoreShell_HS","coef_CSS_HS","parameters_CSS_HS","CSS_HS") 
    3535End 
    3636 
     
    6868         
    6969        SetDataFolder root: 
    70         AddModelToStrings("SmearedCoreShell_HS","smear_coef_CSS_HS","CSS_HS") 
     70        AddModelToStrings("SmearedCoreShell_HS","smear_coef_CSS_HS","smear_parameters_CSS_HS","CSS_HS") 
    7171End 
    7272         
     
    128128        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    129129         
    130         AddModelToStrings("CoreShell_SW","coef_CSS_SW","CSS_SW") 
     130        AddModelToStrings("CoreShell_SW","coef_CSS_SW","parameters_CSS_SW","CSS_SW") 
    131131End 
    132132 
     
    164164         
    165165        SetDataFolder root: 
    166         AddModelToStrings("SmearedCoreShell_SW","smear_coef_CSS_SW","CSS_SW") 
     166        AddModelToStrings("SmearedCoreShell_SW","smear_coef_CSS_SW","smear_parameters_CSS_SW","CSS_SW") 
    167167End 
    168168         
     
    232232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    233233         
    234         AddModelToStrings("CoreShell_SC","coef_CSS_SC","CSS_SC") 
     234        AddModelToStrings("CoreShell_SC","coef_CSS_SC","parameters_CSS_SC","CSS_SC") 
    235235End 
    236236 
     
    273273         
    274274        SetDataFolder root: 
    275         AddModelToStrings("SmearedCoreShell_SC","smear_coef_CSS_SC","CSS_SC") 
     275        AddModelToStrings("SmearedCoreShell_SC","smear_coef_CSS_SC","smear_parameters_CSS_SC","CSS_SC") 
    276276End 
    277277         
     
    337337        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    338338         
    339         AddModelToStrings("CoreShell_SHS","coef_CSS_SHS","CSS_SHS") 
     339        AddModelToStrings("CoreShell_SHS","coef_CSS_SHS","parameters_CSS_SHS","CSS_SHS") 
    340340End 
    341341 
     
    373373         
    374374        SetDataFolder root: 
    375         AddModelToStrings("SmearedCoreShell_SHS","smear_coef_CSS_SHS","CSS_SHS") 
     375        AddModelToStrings("SmearedCoreShell_SHS","smear_coef_CSS_SHS","smear_parameters_CSS_SHS","CSS_SHS") 
    376376End 
    377377         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/CoreShell_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("CoreShellSphere","coef_css","css") 
     34        AddModelToStrings("CoreShellSphere","coef_css","parameters_css","css") 
    3535End 
    3636 
     
    6969         
    7070        SetDataFolder root: 
    71         AddModelToStrings("SmearedCoreShellSphere","smear_coef_css","css") 
     71        AddModelToStrings("SmearedCoreShellSphere","smear_coef_css","smear_parameters_css","css") 
    7272End 
    7373 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Cylinder_Sq_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("Cylinder_HS","coef_CYL_HS","CYL_HS") 
     34        AddModelToStrings("Cylinder_HS","coef_CYL_HS","parameters_CYL_HS","CYL_HS") 
    3535End 
    3636 
     
    6868         
    6969        SetDataFolder root: 
    70         AddModelToStrings("SmearedCylinder_HS","smear_coef_CYL_HS","CYL_HS") 
     70        AddModelToStrings("SmearedCylinder_HS","smear_coef_CYL_HS","smear_parameters_CYL_HS","CYL_HS") 
    7171End 
    7272                 
     
    128128        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    129129         
    130         AddModelToStrings("Cylinder_SW","coef_CYL_SW","CYL_SW") 
     130        AddModelToStrings("Cylinder_SW","coef_CYL_SW","parameters_CYL_SW","CYL_SW") 
    131131End 
    132132 
     
    164164         
    165165        SetDataFolder root: 
    166         AddModelToStrings("SmearedCylinder_SW","smear_coef_CYL_SW","CYL_SW") 
     166        AddModelToStrings("SmearedCylinder_SW","smear_coef_CYL_SW","smear_parameters_CYL_SW","CYL_SW") 
    167167End 
    168168         
     
    231231        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    232232         
    233         AddModelToStrings("Cylinder_SC","coef_CYL_SC","CYL_SC") 
     233        AddModelToStrings("Cylinder_SC","coef_CYL_SC","parameters_CYL_SC","CYL_SC") 
    234234End 
    235235 
     
    272272         
    273273        SetDataFolder root: 
    274         AddModelToStrings("SmearedCylinder_SC","smear_coef_CYL_SC","CYL_SC") 
     274        AddModelToStrings("SmearedCylinder_SC","smear_coef_CYL_SC","smear_parameters_CYL_SC","CYL_SC") 
    275275End 
    276276 
     
    337337        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    338338         
    339         AddModelToStrings("Cylinder_SHS","coef_CYL_SHS","CYL_SHS") 
     339        AddModelToStrings("Cylinder_SHS","coef_CYL_SHS","parameters_CYL_SHS","CYL_SHS") 
    340340End 
    341341 
     
    373373         
    374374        SetDataFolder root: 
    375         AddModelToStrings("SmearedCylinder_SHS","smear_coef_CYL_SHS","CYL_SHS") 
     375        AddModelToStrings("SmearedCylinder_SHS","smear_coef_CYL_SHS","smear_parameters_CYL_SHS","CYL_SHS") 
    376376End 
    377377         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Cylinder_v40.ipf

    r379 r510  
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3232         
    33         AddModelToStrings("CylinderForm","coef_cyl","cyl") 
     33        AddModelToStrings("CylinderForm","coef_cyl","parameters_cyl","cyl") 
    3434End 
    3535 
     
    6767         
    6868        SetDataFolder root: 
    69         AddModelToStrings("SmearedCylinderForm","smear_coef_cyl","cyl") 
     69        AddModelToStrings("SmearedCylinderForm","smear_coef_cyl","smear_parameters_cyl","cyl") 
    7070End 
    7171 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/DAB_model_v40.ipf

    r379 r510  
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3232         
    33         AddModelToStrings("DAB_Model","coef_DAB","DAB") 
     33        AddModelToStrings("DAB_Model","coef_DAB","parameters_DAB","DAB") 
    3434End 
    3535 
     
    6767         
    6868        SetDataFolder root: 
    69         AddModelToStrings("SmearedDAB_Model","smear_coef_DAB","DAB") 
     69        AddModelToStrings("SmearedDAB_Model","smear_coef_DAB","smear_parameters_DAB","DAB") 
    7070End 
    7171 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/HPMSA_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("HayterPenfoldMSA","coef_hpmsa","hpmsa") 
     34        AddModelToStrings("HayterPenfoldMSA","coef_hpmsa","parameters_hpmsa","hpmsa") 
    3535End 
    3636 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/HardSphereStruct_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("HardSphereStruct","coef_hss","hss") 
     34        AddModelToStrings("HardSphereStruct","coef_hss","parameters_hss","hss") 
    3535End 
    3636 
     
    110110End 
    111111// End of HardSphereStruct 
    112  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/HollowCylinders_v40.ipf

    r379 r510  
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3232         
    33         AddModelToStrings("HollowCylinder","coef_Hcyl","Hcyl") 
     33        AddModelToStrings("HollowCylinder","coef_Hcyl","parameters_Hcyl","Hcyl") 
    3434End 
    3535 
     
    6767         
    6868        SetDataFolder root: 
    69         AddModelToStrings("SmearedHollowCylinder","smear_coef_Hcyl","Hcyl") 
     69        AddModelToStrings("SmearedHollowCylinder","smear_coef_Hcyl","smear_parameters_Hcyl","Hcyl") 
    7070End 
    7171 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Lorentz_model_v40.ipf

    r379 r510  
    2626        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    2727         
    28         AddModelToStrings("Lorentz_Model","coef_Lorentz","Lorentz") 
     28        AddModelToStrings("Lorentz_Model","coef_Lorentz","parameters_Lorentz","Lorentz") 
    2929End 
    3030 
     
    6262                 
    6363        SetDataFolder root: 
    64         AddModelToStrings("SmearedLorentz_Model","smear_coef_Lorentz","Lorentz") 
     64        AddModelToStrings("SmearedLorentz_Model","smear_coef_Lorentz","smear_parameters_Lorentz","Lorentz") 
    6565End 
    6666 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/CoreShellCyl2D_v40.ipf

    r288 r510  
    7373        Duplicate/O $(str+"_qy") ywave_CSCyl2D,zwave_CSCyl2D                     
    7474                 
    75         Variable/G gs_CSCyl2D=0 
    76         gs_CSCyl2D := CoreShellCylinder2D(coef_CSCyl2D,zwave_CSCyl2D,xwave_CSCyl2D,ywave_CSCyl2D)       //AAO 2D calculation 
     75        Variable/G g_CSCyl2D=0 
     76        g_CSCyl2D := CoreShellCylinder2D(coef_CSCyl2D,zwave_CSCyl2D,xwave_CSCyl2D,ywave_CSCyl2D)        //AAO 2D calculation 
    7777         
    7878        Display ywave_CSCyl2D vs xwave_CSCyl2D 
     
    9292 
    9393        // not a function evaluation - this simply keeps the matrix for display in sync with the triplet calculation 
    94         Variable/G gs_CSCyl2Dmat=0 
    95         gs_CSCyl2Dmat := UpdateQxQy2Mat(xwave_CSCyl2D,ywave_CSCyl2D,zwave_CSCyl2D,CSCyl2D_lin,CSCyl2D_mat) 
     94        Variable/G g_CSCyl2Dmat=0 
     95        g_CSCyl2Dmat := UpdateQxQy2Mat(xwave_CSCyl2D,ywave_CSCyl2D,zwave_CSCyl2D,CSCyl2D_lin,CSCyl2D_mat) 
    9696         
    9797         
    9898        SetDataFolder root: 
    99         AddModelToStrings("CoreShellCylinder2D","coef_CSCyl2D","CSCyl2D") 
     99        AddModelToStrings("CoreShellCylinder2D","coef_CSCyl2D","parameters_CSCyl2D","CSCyl2D") 
    100100End 
    101101 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/Cylinder_2D_v40.ipf

    r288 r510  
    7070        Duplicate/O $(str+"_qy") ywave_Cyl2D,zwave_Cyl2D                         
    7171                 
    72         Variable/G gs_Cyl2D=0 
    73         gs_Cyl2D := Cylinder2D(coef_Cyl2D,zwave_Cyl2D,xwave_Cyl2D,ywave_Cyl2D)  //AAO 2D calculation 
     72        Variable/G g_Cyl2D=0 
     73        g_Cyl2D := Cylinder2D(coef_Cyl2D,zwave_Cyl2D,xwave_Cyl2D,ywave_Cyl2D)   //AAO 2D calculation 
    7474         
    7575        Display ywave_Cyl2D vs xwave_Cyl2D 
     
    8989 
    9090        // not a function evaluation - this simply keeps the matrix for display in sync with the triplet calculation 
    91         Variable/G gs_Cyl2Dmat=0 
    92         gs_Cyl2Dmat := UpdateQxQy2Mat(xwave_Cyl2D,ywave_Cyl2D,zwave_Cyl2D,Cyl2D_lin,Cyl2D_mat) 
     91        Variable/G g_Cyl2Dmat=0 
     92        g_Cyl2Dmat := UpdateQxQy2Mat(xwave_Cyl2D,ywave_Cyl2D,zwave_Cyl2D,Cyl2D_lin,Cyl2D_mat) 
    9393         
    9494         
    9595        SetDataFolder root: 
    96         AddModelToStrings("Cylinder2D","coef_Cyl2D","Cyl2D") 
     96        AddModelToStrings("Cylinder2D","coef_Cyl2D","parameters_Cyl2D","Cyl2D") 
    9797End 
    9898 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/Ellipsoid2D_v40.ipf

    r288 r510  
    7373        Duplicate/O $(str+"_qy") ywave_Ellip2D,zwave_Ellip2D                     
    7474                 
    75         Variable/G gs_Ellip2D=0 
    76         gs_Ellip2D := Ellipsoid2D(coef_Ellip2D,zwave_Ellip2D,xwave_Ellip2D,ywave_Ellip2D)       //AAO 2D calculation 
     75        Variable/G g_Ellip2D=0 
     76        g_Ellip2D := Ellipsoid2D(coef_Ellip2D,zwave_Ellip2D,xwave_Ellip2D,ywave_Ellip2D)        //AAO 2D calculation 
    7777         
    7878        Display ywave_Ellip2D vs xwave_Ellip2D 
     
    9292 
    9393        // not a function evaluation - this simply keeps the matrix for display in sync with the triplet calculation 
    94         Variable/G gs_Ellip2Dmat=0 
    95         gs_Ellip2Dmat := UpdateQxQy2Mat(xwave_Ellip2D,ywave_Ellip2D,zwave_Ellip2D,Ellip2D_lin,Ellip2D_mat) 
     94        Variable/G g_Ellip2Dmat=0 
     95        g_Ellip2Dmat := UpdateQxQy2Mat(xwave_Ellip2D,ywave_Ellip2D,zwave_Ellip2D,Ellip2D_lin,Ellip2D_mat) 
    9696         
    9797         
    9898        SetDataFolder root: 
    99         AddModelToStrings("Ellipsoid2D","coef_Ellip2D","Ellip2D") 
     99        AddModelToStrings("Ellipsoid2D","coef_Ellip2D","parameters_Ellip2D","Ellip2D") 
    100100End 
    101101 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/EllipticalCylinder2D_v40.ipf

    r288 r510  
    7474        Duplicate/O $(str+"_qy") ywave_EllCyl2D,zwave_EllCyl2D                   
    7575                 
    76         Variable/G gs_EllCyl2D=0 
    77         gs_EllCyl2D := EllipticalCylinder2D(coef_EllCyl2D,zwave_EllCyl2D,xwave_EllCyl2D,ywave_EllCyl2D) //AAO 2D calculation 
     76        Variable/G g_EllCyl2D=0 
     77        g_EllCyl2D := EllipticalCylinder2D(coef_EllCyl2D,zwave_EllCyl2D,xwave_EllCyl2D,ywave_EllCyl2D)  //AAO 2D calculation 
    7878         
    7979        Display ywave_EllCyl2D vs xwave_EllCyl2D 
     
    9393 
    9494        // not a function evaluation - this simply keeps the matrix for display in sync with the triplet calculation 
    95         Variable/G gs_EllCyl2Dmat=0 
    96         gs_EllCyl2Dmat := UpdateQxQy2Mat(xwave_EllCyl2D,ywave_EllCyl2D,zwave_EllCyl2D,EllCyl2D_lin,EllCyl2D_mat) 
     95        Variable/G g_EllCyl2Dmat=0 
     96        g_EllCyl2Dmat := UpdateQxQy2Mat(xwave_EllCyl2D,ywave_EllCyl2D,zwave_EllCyl2D,EllCyl2D_lin,EllCyl2D_mat) 
    9797         
    9898         
    9999        SetDataFolder root: 
    100         AddModelToStrings("EllipticalCylinder2D","coef_EllCyl2D","EllCyl2D") 
     100        AddModelToStrings("EllipticalCylinder2D","coef_EllCyl2D","parameters_EllCyl2D","EllCyl2D") 
    101101End 
    102102 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Models_2D/Sphere_2D_v40.ipf

    r509 r510  
    5656         
    5757        SetDataFolder root: 
    58         AddModelToStrings("Sphere2D","coef_sf2D","sf2D") 
     58        AddModelToStrings("Sphere2D","coef_sf2D","parameters_sf2D","sf2D") 
    5959End 
    6060 
     
    9292        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    9393         
     94        // generate the matrix representation 
     95        Duplicate/O $(str+"_qx"), sm_qx 
     96        Duplicate/O $(str+"_qy"), sm_qy         // I can't use local variables in dependencies, so I need the name (that I can't get) 
     97         
     98        ConvertQxQy2Mat(sm_qx,sm_qy,smeared_sf2D,"sm_sf2D_mat") 
     99        Duplicate/O $"sm_sf2D_mat",$"sm_sf2D_lin"               //keep a linear-scaled version of the data 
     100        // _mat is for display, _lin is the real calculation 
     101 
     102        // not a function evaluation - this simply keeps the matrix for display in sync with the triplet calculation 
     103        Variable/G gs_sf2Dmat=0 
     104        gs_sf2Dmat := UpdateQxQy2Mat(sm_qx,sm_qy,smeared_sf2D,sm_sf2D_lin,sm_sf2D_mat) 
     105         
    94106        SetDataFolder root: 
    95         AddModelToStrings("SmearedSphere2D","smear_coef_sf2D","sf2D") 
     107        AddModelToStrings("SmearedSphere2D","smear_coef_sf2D","smear_parameters_sf2D","sf2D") 
    96108End 
    97109 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Beaucage_v40.ipf

    r379 r510  
    3434        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3535         
    36         AddModelToStrings("OneLevel","coef_b1","b1") 
     36        AddModelToStrings("OneLevel","coef_b1","parameters_b1","b1") 
    3737End 
    3838 
     
    5757        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    5858         
    59         AddModelToStrings("TwoLevel","coef_b2","b2") 
     59        AddModelToStrings("TwoLevel","coef_b2","parameters_b2","b2") 
    6060End 
    6161 
     
    8080        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    8181         
    82         AddModelToStrings("ThreeLevel","coef_b3","b3") 
     82        AddModelToStrings("ThreeLevel","coef_b3","parameters_b3","b3") 
    8383End 
    8484 
     
    103103        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    104104         
    105         AddModelToStrings("FourLevel","coef_b4","b4") 
     105        AddModelToStrings("FourLevel","coef_b4","parameters_b4","b4") 
    106106End 
    107107 
     
    140140         
    141141        SetDataFolder root: 
    142         AddModelToStrings("SmearedOneLevel","smear_coef_b1","b1") 
     142        AddModelToStrings("SmearedOneLevel","smear_coef_b1","smear_parameters_b1","b1") 
    143143End 
    144144         
     
    175175         
    176176        SetDataFolder root: 
    177         AddModelToStrings("SmearedTwoLevel","smear_coef_b2","b2") 
     177        AddModelToStrings("SmearedTwoLevel","smear_coef_b2","smear_parameters_b2","b2") 
    178178End 
    179179         
     
    210210         
    211211        SetDataFolder root: 
    212         AddModelToStrings("SmearedThreeLevel","smear_coef_b3","b3") 
     212        AddModelToStrings("SmearedThreeLevel","smear_coef_b3","smear_parameters_b3","b3") 
    213213End 
    214214         
     
    245245         
    246246        SetDataFolder root: 
    247         AddModelToStrings("SmearedFourLevel","smear_coef_b4","b4") 
     247        AddModelToStrings("SmearedFourLevel","smear_coef_b4","smear_parameters_b4","b4") 
    248248End 
    249249         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/BimodalSchulzSpheres_v40.ipf

    r379 r510  
    3535        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3636         
    37         AddModelToStrings("BimodalSchulzSpheres","coef_bss","bss") 
     37        AddModelToStrings("BimodalSchulzSpheres","coef_bss","parameters_bss","bss") 
    3838End 
    3939 
     
    7474         
    7575        SetDataFolder root: 
    76         AddModelToStrings("SmearedBimodalSchulzSpheres","smear_coef_bss","bss") 
     76        AddModelToStrings("SmearedBimodalSchulzSpheres","smear_coef_bss","smear_parameters_bss","bss") 
    7777End 
    7878         
     
    259259         
    260260 
    261  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/BinaryHardSpheres_v40.ipf

    r379 r510  
    6767        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    6868         
    69         AddModelToStrings("BinaryHS","coef_BinaryHS","BinaryHS") 
     69        AddModelToStrings("BinaryHS","coef_BinaryHS","parameters_BinaryHS","BinaryHS") 
    7070End 
    7171 
     
    103103         
    104104        SetDataFolder root: 
    105         AddModelToStrings("SmearedBinaryHS","smear_coef_BinaryHS","BinaryHS") 
     105        AddModelToStrings("SmearedBinaryHS","smear_coef_BinaryHS","smear_parameters_BinaryHS","BinaryHS") 
    106106End 
    107107 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Cylinder_PolyLength_v40.ipf

    r379 r510  
    3737        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3838         
    39         AddModelToStrings("Cyl_PolyLength","coef_cypl","cypl") 
     39        AddModelToStrings("Cyl_PolyLength","coef_cypl","parameters_cypl","cypl") 
    4040End 
    4141 
     
    7272         
    7373        SetDataFolder root: 
    74         AddModelToStrings("SmearedCyl_PolyLength","smear_coef_cypl","cypl") 
     74        AddModelToStrings("SmearedCyl_PolyLength","smear_coef_cypl","smear_parameters_cypl","cypl") 
    7575End 
    7676         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Cylinder_PolyRadius_v40.ipf

    r457 r510  
    3737        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3838         
    39         AddModelToStrings("Cyl_PolyRadius","coef_cypr","cypr") 
     39        AddModelToStrings("Cyl_PolyRadius","coef_cypr","parameters_cypr","cypr") 
    4040End 
    4141 
     
    7373         
    7474        SetDataFolder root: 
    75         AddModelToStrings("SmearedCyl_PolyRadius","smear_coef_cypr","cypr") 
     75        AddModelToStrings("SmearedCyl_PolyRadius","smear_coef_cypr","smear_parameters_cypr","cypr") 
    7676End 
    7777         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Debye_v40.ipf

    r429 r510  
    2424        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    2525         
    26         AddModelToStrings("Debye","coef_deb","deb") 
     26        AddModelToStrings("Debye","coef_deb","parameters_deb","deb") 
    2727End 
    2828 
     
    5959         
    6060        SetDataFolder root: 
    61         AddModelToStrings("SmearedDebye","smear_coef_deb","deb") 
     61        AddModelToStrings("SmearedDebye","smear_coef_deb","smear_parameters_deb","deb") 
    6262End 
    6363         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/EllipticalCylinder_v40.ipf

    r379 r510  
    3939        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4040         
    41         AddModelToStrings("EllipticalCylinder","coef_ecf","ecf") 
     41        AddModelToStrings("EllipticalCylinder","coef_ecf","parameters_ecf","ecf") 
    4242End 
    4343/////////////////////////////////////////////////////////// 
     
    7575         
    7676        SetDataFolder root: 
    77         AddModelToStrings("SmearedEllipticalCylinder","smear_coef_ecf","ecf") 
     77        AddModelToStrings("SmearedEllipticalCylinder","smear_coef_ecf","smear_parameters_ecf","ecf") 
    7878End 
    7979 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/FlexCyl_EllipCross_v40.ipf

    r379 r510  
    3636        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3737         
    38         AddModelToStrings("FlexCyl_Ellip","coef_fleell","fleell") 
     38        AddModelToStrings("FlexCyl_Ellip","coef_fleell","parameters_fleell","fleell") 
    3939End 
    4040 
     
    7171         
    7272        SetDataFolder root: 
    73         AddModelToStrings("SmearedFlexCyl_Ellip","smear_coef_fleell","fleell") 
     73        AddModelToStrings("SmearedFlexCyl_Ellip","smear_coef_fleell","smear_parameters_fleell","fleell") 
    7474End 
    7575         
     
    191191End 
    192192 
    193  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/FlexCyl_PolyLen_v40.ipf

    r379 r510  
    2929        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3030         
    31         AddModelToStrings("FlexCyl_PolyLen","coef_flepl","flepl") 
     31        AddModelToStrings("FlexCyl_PolyLen","coef_flepl","parameters_flepl","flepl") 
    3232End 
    3333 
     
    6464         
    6565        SetDataFolder root: 
    66         AddModelToStrings("SmearedFlexCyl_PolyLen","smear_coef_flepl","flepl") 
     66        AddModelToStrings("SmearedFlexCyl_PolyLen","smear_coef_flepl","smear_parameters_flepl","flepl") 
    6767End 
    6868         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/FlexCyl_PolyRadius_v40.ipf

    r379 r510  
    2727        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    2828         
    29         AddModelToStrings("FlexCyl_PolyRad","coef_fcpr","fcpr") 
     29        AddModelToStrings("FlexCyl_PolyRad","coef_fcpr","parameters_fcpr","fcpr") 
    3030End 
    3131 
     
    6262         
    6363        SetDataFolder root: 
    64         AddModelToStrings("SmearedFlexCyl_PolyRad","smear_coef_fcpr","fcpr") 
     64        AddModelToStrings("SmearedFlexCyl_PolyRad","smear_coef_fcpr","smear_parameters_fcpr","fcpr") 
    6565End 
    6666 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/FlexibleCylinder_v40.ipf

    r379 r510  
    3939        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4040         
    41         AddModelToStrings("FlexExclVolCyl","coef_fle","fle") 
     41        AddModelToStrings("FlexExclVolCyl","coef_fle","parameters_fle","fle") 
    4242End 
    4343/////////////////////////////////////////////////////////// 
     
    7575         
    7676        SetDataFolder root: 
    77         AddModelToStrings("SmearedFlexExclVolCyl","smear_coef_fle","fle") 
     77        AddModelToStrings("SmearedFlexExclVolCyl","smear_coef_fle","smear_parameters_fle","fle") 
    7878End 
    7979         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Fractal_v40.ipf

    r379 r510  
    3030        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3131         
    32         AddModelToStrings("Fractal","coef_fra","fra") 
     32        AddModelToStrings("Fractal","coef_fra","parameters_fra","fra") 
    3333End 
    3434 
     
    6565         
    6666        SetDataFolder root: 
    67         AddModelToStrings("SmearedFractal","smear_coef_fra","fra") 
     67        AddModelToStrings("SmearedFractal","smear_coef_fra","smear_parameters_fra","fra") 
    6868End 
    6969 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/GaussSpheres_Sq_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("GaussPolySphere_HS","coef_pgs_HS","pgs_HS") 
     34        AddModelToStrings("GaussPolySphere_HS","coef_pgs_HS","parameters_pgs_HS","pgs_HS") 
    3535End 
    3636 
     
    6767         
    6868        SetDataFolder root: 
    69         AddModelToStrings("SmearedGaussPolySphere_HS","smear_coef_pgs_HS","pgs_HS") 
     69        AddModelToStrings("SmearedGaussPolySphere_HS","smear_coef_pgs_HS","smear_parameters_pgs_HS","pgs_HS") 
    7070End 
    7171 
     
    135135        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    136136         
    137         AddModelToStrings("GaussPolySphere_SW","coef_pgs_SW","pgs_SW") 
     137        AddModelToStrings("GaussPolySphere_SW","coef_pgs_SW","parameters_pgs_SW","pgs_SW") 
    138138End 
    139139 
     
    170170         
    171171        SetDataFolder root: 
    172         AddModelToStrings("SmearedGaussPolySphere_SW","smear_coef_pgs_SW","pgs_SW") 
     172        AddModelToStrings("SmearedGaussPolySphere_SW","smear_coef_pgs_SW","smear_parameters_pgs_SW","pgs_SW") 
    173173End 
    174174         
     
    244244        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    245245         
    246         AddModelToStrings("GaussPolySphere_SC","coef_pgs_SC","pgs_SC") 
     246        AddModelToStrings("GaussPolySphere_SC","coef_pgs_SC","parameters_pgs_SC","pgs_SC") 
    247247End 
    248248 
     
    284284         
    285285        SetDataFolder root: 
    286         AddModelToStrings("SmearedGaussPolySphere_SC","smear_coef_pgs_SC","pgs_SC") 
     286        AddModelToStrings("SmearedGaussPolySphere_SC","smear_coef_pgs_SC","smear_parameters_pgs_SC","pgs_SC") 
    287287End 
    288288 
     
    354354        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    355355         
    356         AddModelToStrings("GaussPolySphere_SHS","coef_pgs_SHS","pgs_SHS") 
     356        AddModelToStrings("GaussPolySphere_SHS","coef_pgs_SHS","parameters_pgs_SHS","pgs_SHS") 
    357357End 
    358358 
     
    389389         
    390390        SetDataFolder root: 
    391         AddModelToStrings("SmearedGaussPolySphere_SHS","smear_coef_pgs_SHS","pgs_SHS") 
     391        AddModelToStrings("SmearedGaussPolySphere_SHS","smear_coef_pgs_SHS","smear_parameters_pgs_SHS","pgs_SHS") 
    392392End 
    393393         
     
    577577        return (0) 
    578578End 
    579  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/GaussSpheres_v40.ipf

    r379 r510  
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3232         
    33         AddModelToStrings("GaussSpheres","coef_pgs","pgs") 
     33        AddModelToStrings("GaussSpheres","coef_pgs","parameters_pgs","pgs") 
    3434End 
    3535 
     
    6666         
    6767        SetDataFolder root: 
    68         AddModelToStrings("SmearedGaussSpheres","smear_coef_pgs","pgs") 
     68        AddModelToStrings("SmearedGaussSpheres","smear_coef_pgs","smear_parameters_pgs","pgs") 
    6969End 
    7070         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LamellarFF_HG_v40.ipf

    r379 r510  
    4545        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4646         
    47         AddModelToStrings("LamellarFF_HG","coef_LamellarFF_HG","LamellarFF_HG") 
     47        AddModelToStrings("LamellarFF_HG","coef_LamellarFF_HG","parameters_LamellarFF_HG","LamellarFF_HG") 
    4848// 
    4949End 
     
    8181         
    8282        SetDataFolder root: 
    83         AddModelToStrings("SmearedLamellarFF_HG","smear_coef_LamellarFF_HG","LamellarFF_HG") 
     83        AddModelToStrings("SmearedLamellarFF_HG","smear_coef_LamellarFF_HG","smear_parameters_LamellarFF_HG","LamellarFF_HG") 
    8484End 
    8585 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LamellarFF_v40.ipf

    r379 r510  
    4343        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4444         
    45         AddModelToStrings("LamellarFF","coef_LamellarFF","LamellarFF") 
     45        AddModelToStrings("LamellarFF","coef_LamellarFF","parameters_LamellarFF","LamellarFF") 
    4646// 
    4747End 
     
    8080        SetDataFolder root: 
    8181         
    82         AddModelToStrings("SmearedLamellarFF","smear_coef_LamellarFF","LamellarFF") 
     82        AddModelToStrings("SmearedLamellarFF","smear_coef_LamellarFF","smear_parameters_LamellarFF","LamellarFF") 
    8383End 
    8484//////////////////////////////////////////////////// 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LamellarPS_HG_v40.ipf

    r391 r510  
    7878        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    7979         
    80         AddModelToStrings("LamellarPS_HG","coef_LamellarPS_HG","LamellarPS_HG") 
     80        AddModelToStrings("LamellarPS_HG","coef_LamellarPS_HG","parameters_LamellarPS_HG","LamellarPS_HG") 
    8181End 
    8282 
     
    120120         
    121121        SetDataFolder root: 
    122         AddModelToStrings("SmearedLamellarPS_HG","smear_coef_LamellarPS_HG","LamellarPS_HG") 
     122        AddModelToStrings("SmearedLamellarPS_HG","smear_coef_LamellarPS_HG","smear_parameters_LamellarPS_HG","LamellarPS_HG") 
    123123End 
    124124         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LamellarPS_v40.ipf

    r391 r510  
    7878        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    7979         
    80         AddModelToStrings("LamellarPS","coef_LamellarPS","LamellarPS") 
     80        AddModelToStrings("LamellarPS","coef_LamellarPS","parameters_LamellarPS","LamellarPS") 
    8181End 
    8282 
     
    120120         
    121121        SetDataFolder root: 
    122         AddModelToStrings("SmearedLamellarPS","smear_coef_LamellarPS","LamellarPS") 
     122        AddModelToStrings("SmearedLamellarPS","smear_coef_LamellarPS","smear_parameters_LamellarPS","LamellarPS") 
    123123End 
    124124 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LogNormalSphere_Sq_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("LogNormalSphere_HS","coef_lns_HS","lns_HS") 
     34        AddModelToStrings("LogNormalSphere_HS","coef_lns_HS","parameters_lns_HS","lns_HS") 
    3535End 
    3636 
     
    6767         
    6868        SetDataFolder root: 
    69         AddModelToStrings("SmearedLogNormalSphere_HS","smear_coef_lns_HS","lns_HS") 
     69        AddModelToStrings("SmearedLogNormalSphere_HS","smear_coef_lns_HS","smear_parameters_lns_HS","lns_HS") 
    7070End 
    7171         
     
    134134        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    135135         
    136         AddModelToStrings("LogNormalSphere_SW","coef_lns_SW","lns_SW") 
     136        AddModelToStrings("LogNormalSphere_SW","coef_lns_SW","parameters_lns_SW","lns_SW") 
    137137End 
    138138 
     
    169169         
    170170        SetDataFolder root: 
    171         AddModelToStrings("SmearedLogNormalSphere_SW","smear_coef_lns_SW","lns_SW") 
     171        AddModelToStrings("SmearedLogNormalSphere_SW","smear_coef_lns_SW","smear_parameters_lns_SW","lns_SW") 
    172172End 
    173173         
     
    243243        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    244244         
    245         AddModelToStrings("LogNormalSphere_SC","coef_lns_SC","lns_SC") 
     245        AddModelToStrings("LogNormalSphere_SC","coef_lns_SC","parameters_lns_SC","lns_SC") 
    246246End 
    247247 
     
    283283         
    284284        SetDataFolder root: 
    285         AddModelToStrings("SmearedLogNormalSphere_SC","smear_coef_lns_SC","lns_SC") 
     285        AddModelToStrings("SmearedLogNormalSphere_SC","smear_coef_lns_SC","smear_parameters_lns_SC","lns_SC") 
    286286End 
    287287 
     
    354354        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    355355         
    356         AddModelToStrings("LogNormalSphere_SHS","coef_lns_SHS","lns_SHS") 
     356        AddModelToStrings("LogNormalSphere_SHS","coef_lns_SHS","parameters_lns_SHS","lns_SHS") 
    357357End 
    358358 
     
    389389         
    390390        SetDataFolder root: 
    391         AddModelToStrings("SmearedLogNormalSphere_SHS","smear_coef_lns_SHS","lns_SHS") 
     391        AddModelToStrings("SmearedLogNormalSphere_SHS","smear_coef_lns_SHS","smear_parameters_lns_SHS","lns_SHS") 
    392392End 
    393393         
     
    576576        return (0) 
    577577End 
    578  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/LogNormalSphere_v40.ipf

    r379 r510  
    2828        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    2929         
    30         AddModelToStrings("LogNormalSphere","coef_lns","lns") 
     30        AddModelToStrings("LogNormalSphere","coef_lns","parameters_lns","lns") 
    3131End 
    3232 
     
    6363         
    6464        SetDataFolder root: 
    65         AddModelToStrings("SmearedLogNormalSphere","smear_coef_lns","lns") 
     65        AddModelToStrings("SmearedLogNormalSphere","smear_coef_lns","smear_parameters_lns","lns") 
    6666End 
    6767 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/MultiShell_v40.ipf

    r379 r510  
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3232         
    33         AddModelToStrings("MultiShellSphere","coef_mss","mss") 
     33        AddModelToStrings("MultiShellSphere","coef_mss","parameters_mss","mss") 
    3434End 
    3535 
     
    6666         
    6767        SetDataFolder root: 
    68         AddModelToStrings("SmearedMultiShellSphere","smear_coef_mss","mss") 
     68        AddModelToStrings("SmearedMultiShellSphere","smear_coef_mss","smear_parameters_mss","mss") 
    6969End 
    7070 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Parallelepiped_v40.ipf

    r379 r510  
    4848        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4949         
    50         AddModelToStrings("Parallelepiped","coef_Parallelepiped","Parallelepiped") 
     50        AddModelToStrings("Parallelepiped","coef_Parallelepiped","parameters_Parallelepiped","Parallelepiped") 
    5151// 
    5252End 
     
    8484         
    8585        SetDataFolder root: 
    86         AddModelToStrings("SmearedParallelepiped","smear_coef_Parallelepiped","Parallelepiped") 
     86        AddModelToStrings("SmearedParallelepiped","smear_coef_Parallelepiped","smear_parameters_Parallelepiped","Parallelepiped") 
    8787End 
    8888 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/PolyCoreShellCylinder_v40.ipf

    r465 r510  
    4141        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4242         
    43         AddModelToStrings("PolyCoShCylinder","coef_CSCpr","CSCpr") 
     43        AddModelToStrings("PolyCoShCylinder","coef_CSCpr","parameters_CSCpr","CSCpr") 
    4444End 
    4545 
     
    7777         
    7878        SetDataFolder root: 
    79         AddModelToStrings("SmearedPolyCoShCylinder","smear_coef_CSCpr","CSCpr") 
     79        AddModelToStrings("SmearedPolyCoShCylinder","smear_coef_CSCpr","smear_parameters_CSCpr","CSCpr") 
    8080End 
    8181         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/SchulzSpheres_Sq_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("SchulzSpheres_HS","coef_sch_HS","sch_HS") 
     34        AddModelToStrings("SchulzSpheres_HS","coef_sch_HS","parameters_sch_HS","sch_HS") 
    3535End 
    3636 
     
    6767         
    6868        SetDataFolder root: 
    69         AddModelToStrings("SmearedSchulzSpheres_HS","smear_coef_sch_HS","sch_HS") 
     69        AddModelToStrings("SmearedSchulzSpheres_HS","smear_coef_sch_HS","smear_parameters_sch_HS","sch_HS") 
    7070End 
    7171         
     
    136136        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    137137         
    138         AddModelToStrings("SchulzSpheres_SW","coef_sch_SW","sch_SW") 
     138        AddModelToStrings("SchulzSpheres_SW","coef_sch_SW","parameters_sch_SW","sch_SW") 
    139139End 
    140140 
     
    171171         
    172172        SetDataFolder root: 
    173         AddModelToStrings("SmearedSchulzSpheres_SW","smear_coef_sch_SW","sch_SW") 
     173        AddModelToStrings("SmearedSchulzSpheres_SW","smear_coef_sch_SW","smear_parameters_sch_SW","sch_SW") 
    174174End 
    175175 
     
    247247        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    248248         
    249         AddModelToStrings("SchulzSpheres_SC","coef_sch_SC","sch_SC") 
     249        AddModelToStrings("SchulzSpheres_SC","coef_sch_SC","parameters_sch_SC","sch_SC") 
    250250End 
    251251 
     
    287287         
    288288        SetDataFolder root: 
    289         AddModelToStrings("SmearedSchulzSpheres_SC","smear_coef_sch_SC","sch_SC") 
     289        AddModelToStrings("SmearedSchulzSpheres_SC","smear_coef_sch_SC","smear_parameters_sch_SC","sch_SC") 
    290290End 
    291291 
     
    358358        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    359359         
    360         AddModelToStrings("SchulzSpheres_SHS","coef_sch_SHS","sch_SHS") 
     360        AddModelToStrings("SchulzSpheres_SHS","coef_sch_SHS","parameters_sch_SHS","sch_SHS") 
    361361End 
    362362 
     
    393393         
    394394        SetDataFolder root: 
    395         AddModelToStrings("SmearedSchulzSpheres_SHS","smear_coef_sch_SHS","sch_SHS") 
     395        AddModelToStrings("SmearedSchulzSpheres_SHS","smear_coef_sch_SHS","smear_parameters_sch_SHS","sch_SHS") 
    396396End 
    397397 
     
    582582        return (0) 
    583583End 
    584  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/SchulzSpheres_v40.ipf

    r379 r510  
    2929        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3030         
    31         AddModelToStrings("SchulzSpheres","coef_sch","sch") 
     31        AddModelToStrings("SchulzSpheres","coef_sch","parameters_sch","sch") 
    3232End 
    3333 
     
    6464        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    6565         
    66         AddModelToStrings("SmearedSchulzSpheres","smear_coef_sch","sch") 
     66        AddModelToStrings("SmearedSchulzSpheres","smear_coef_sch","smear_parameters_sch","sch") 
    6767End 
    6868         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/StickyHardSphereStruct_v40.ipf

    r379 r510  
    4343        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4444         
    45         AddModelToStrings("StickyHS_Struct","coef_shsSQ","shsSQ") 
     45        AddModelToStrings("StickyHS_Struct","coef_shsSQ","parameters_shsSQ","shsSQ") 
    4646// 
    4747End 
     
    135135        Return (sq) 
    136136End 
    137  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/TriaxialEllipsoid_v40.ipf

    r379 r510  
    4444        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4545         
    46         AddModelToStrings("TriaxialEllipsoid","coef_triax","triax") 
     46        AddModelToStrings("TriaxialEllipsoid","coef_triax","parameters_triax","triax") 
    4747// 
    4848End 
     
    8181         
    8282        SetDataFolder root: 
    83         AddModelToStrings("SmearedTriaxialEllipsoid","smear_coef_triax","triax") 
     83        AddModelToStrings("SmearedTriaxialEllipsoid","smear_coef_triax","smear_parameters_triax","triax") 
    8484End 
    8585 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Vesicle_UL_and_Struct_v40.ipf

    r379 r510  
    3939        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4040         
    41         AddModelToStrings("Vesicle_HS","coef_ves_HS","ves_HS") 
     41        AddModelToStrings("Vesicle_HS","coef_ves_HS","parameters_ves_HS","ves_HS") 
    4242End 
    4343 
     
    7575         
    7676        SetDataFolder root: 
    77         AddModelToStrings("SmearedVesicle_HS","smear_coef_ves_HS","ves_HS") 
     77        AddModelToStrings("SmearedVesicle_HS","smear_coef_ves_HS","smear_parameters_ves_HS","ves_HS") 
    7878End 
    7979 
     
    146146 
    147147        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    148         AddModelToStrings("Vesicle_SW","coef_ves_SW","ves_SW") 
     148        AddModelToStrings("Vesicle_SW","coef_ves_SW","parameters_ves_SW","ves_SW") 
    149149End 
    150150 
     
    182182         
    183183        SetDataFolder root: 
    184         AddModelToStrings("SmearedVesicle_SW","smear_coef_ves_SW","ves_SW") 
     184        AddModelToStrings("SmearedVesicle_SW","smear_coef_ves_SW","smear_parameters_ves_SW","ves_SW") 
    185185End 
    186186 
     
    258258 
    259259        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    260         AddModelToStrings("Vesicle_SC","coef_ves_SC","ves_SC") 
     260        AddModelToStrings("Vesicle_SC","coef_ves_SC","parameters_ves_SC","ves_SC") 
    261261End 
    262262 
     
    299299         
    300300        SetDataFolder root: 
    301         AddModelToStrings("SmearedVesicle_SC","smear_coef_ves_SC","ves_SC") 
     301        AddModelToStrings("SmearedVesicle_SC","smear_coef_ves_SC","smear_parameters_ves_SC","ves_SC") 
    302302End 
    303303         
     
    375375 
    376376        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    377         AddModelToStrings("Vesicle_SHS","coef_ves_SHS","ves_SHS") 
     377        AddModelToStrings("Vesicle_SHS","coef_ves_SHS","parameters_ves_SHS","ves_SHS") 
    378378End 
    379379 
     
    411411         
    412412        SetDataFolder root: 
    413         AddModelToStrings("SmearedVesicle_SHS","smear_coef_ves_SHS","ves_SHS") 
     413        AddModelToStrings("SmearedVesicle_SHS","smear_coef_ves_SHS","smear_parameters_ves_SHS","ves_SHS") 
    414414End 
    415415 
     
    602602        return (0) 
    603603End 
    604  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/Vesicle_UL_v40.ipf

    r379 r510  
    4141        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4242         
    43         AddModelToStrings("VesicleForm","coef_vesicle","vesicle") 
     43        AddModelToStrings("VesicleForm","coef_vesicle","parameters_vesicle","vesicle") 
    4444End 
    4545 
     
    7979         
    8080        SetDataFolder root: 
    81         AddModelToStrings("SmearedVesicleForm","smear_coef_vesicle","vesicle") 
     81        AddModelToStrings("SmearedVesicleForm","smear_coef_vesicle","smear_parameters_vesicle","vesicle") 
    8282End 
    8383 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/BCC_ParaCrystal_v40.ipf

    r457 r510  
    4949        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    5050         
    51         AddModelToStrings("BCC_ParaCrystal","coef_BCC_ParaCrystal","BCC_ParaCrystal") 
     51        AddModelToStrings("BCC_ParaCrystal","coef_BCC_ParaCrystal","parameters_BCC_ParaCrystal","BCC_ParaCrystal") 
    5252// 
    5353End 
     
    7474        // Setup parameter table for model function 
    7575        Make/O/D smear_coef_BCC_ParaCrystal = {1,220,0.06,40,3e-6,6.3e-6,0.0} 
    76         make/o/t smear_parameters_BCC_ParaCrystal = {"scale","Nearest Neighbor (A)","distortion, g","Sphere Radius (A)","SLD Sphere (A-2)","SLD Solvent (A-2)", "Background (cm-1)"} 
    77         Edit smear_parameters_BCC_ParaCrystal,smear_coef_BCC_ParaCrystal                                        //display parameters in a table 
     76        make/o/t smear_param_BCC_ParaCrystal = {"scale","Nearest Neighbor (A)","distortion, g","Sphere Radius (A)","SLD Sphere (A-2)","SLD Solvent (A-2)", "Background (cm-1)"} 
     77        Edit smear_param_BCC_ParaCrystal,smear_coef_BCC_ParaCrystal                                     //display parameters in a table 
    7878         
    7979        // output smeared intensity wave, dimensions are identical to experimental QSIG values 
     
    9494         
    9595        SetDataFolder root: 
    96         AddModelToStrings("SmearedBCC_ParaCrystal","smear_coef_BCC_ParaCrystal","BCC_ParaCrystal") 
     96        AddModelToStrings("SmearedBCC_ParaCrystal","smear_coef_BCC_ParaCrystal","smear_param_BCC_ParaCrystal","BCC_ParaCrystal") 
    9797End 
    9898 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Barbell_v40.ipf

    r449 r510  
    4343        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4444         
    45         AddModelToStrings("Barbell","coef_Barbell","Barbell") 
     45        AddModelToStrings("Barbell","coef_Barbell","parameters_Barbell","Barbell") 
    4646// 
    4747End 
     
    8080         
    8181        SetDataFolder root: 
    82         AddModelToStrings("SmearedBarbell","smear_coef_Barbell","Barbell") 
     82        AddModelToStrings("SmearedBarbell","smear_coef_Barbell","smear_parameters_Barbell","Barbell") 
    8383End 
    8484 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/BroadPeak_v40.ipf

    r451 r510  
    3535        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3636         
    37         AddModelToStrings("BroadPeak","coef_BroadPeak","BroadPeak") 
     37        AddModelToStrings("BroadPeak","coef_BroadPeak","parameters_BroadPeak","BroadPeak") 
    3838// 
    3939End 
     
    7676         
    7777        SetDataFolder root: 
    78         AddModelToStrings("SmearedBroadPeak","smear_coef_BroadPeak","BroadPeak") 
     78        AddModelToStrings("SmearedBroadPeak","smear_coef_BroadPeak","smear_parameters_BroadPeak","BroadPeak") 
    7979End 
    8080 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/CappedCylinder_v40.ipf

    r449 r510  
    4444        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4545         
    46         AddModelToStrings("CappedCylinder","coef_CapCyl","CapCyl") 
     46        AddModelToStrings("CappedCylinder","coef_CapCyl","parameters_CapCyl","CapCyl") 
    4747// 
    4848End 
     
    8181         
    8282        SetDataFolder root: 
    83         AddModelToStrings("SmearedCappedCylinder","smear_coef_CapCyl","CapCyl") 
     83        AddModelToStrings("SmearedCappedCylinder","smear_coef_CapCyl","smear_parameters_CapCyl","CapCyl") 
    8484End 
    8585 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/ConvexLens_v40.ipf

    r451 r510  
    4242        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4343         
    44         AddModelToStrings("ConvexLens","coef_ConvLens","ConvLens") 
     44        AddModelToStrings("ConvexLens","coef_ConvLens","parameters_ConvLens","ConvLens") 
    4545// 
    4646End 
     
    7979         
    8080        SetDataFolder root: 
    81         AddModelToStrings("SmearedConvexLens","smear_coef_ConvLens","ConvLens") 
     81        AddModelToStrings("SmearedConvexLens","smear_coef_ConvLens","smear_parameters_ConvLens","ConvLens") 
    8282End 
    8383 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Core_and_NShells_v40.ipf

    r461 r510  
    5050        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    5151         
    52         AddModelToStrings("OneShell","coef_OneShell","OneShell") 
     52        AddModelToStrings("OneShell","coef_OneShell","parameters_OneShell","OneShell") 
    5353// 
    5454End 
     
    7575        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    7676         
    77         AddModelToStrings("TwoShell","coef_TwoShell","TwoShell") 
     77        AddModelToStrings("TwoShell","coef_TwoShell","parameters_TwoShell","TwoShell") 
    7878// 
    7979End 
     
    100100        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    101101         
    102         AddModelToStrings("ThreeShell","coef_ThreeShell","ThreeShell") 
     102        AddModelToStrings("ThreeShell","coef_ThreeShell","parameters_ThreeShell","ThreeShell") 
    103103// 
    104104End 
     
    125125        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    126126         
    127         AddModelToStrings("FourShell","coef_FourShell","FourShell") 
     127        AddModelToStrings("FourShell","coef_FourShell","parameters_FourShell","FourShell") 
    128128// 
    129129End 
     
    171171         
    172172        SetDataFolder root: 
    173         AddModelToStrings("SmearedOneShell","smear_coef_OneShell","OneShell") 
     173        AddModelToStrings("SmearedOneShell","smear_coef_OneShell","smear_parameters_OneShell","OneShell") 
    174174End 
    175175 
     
    205205         
    206206        SetDataFolder root: 
    207         AddModelToStrings("SmearedTwoShell","smear_coef_TwoShell","TwoShell") 
     207        AddModelToStrings("SmearedTwoShell","smear_coef_TwoShell","smear_parameters_TwoShell","TwoShell") 
    208208End 
    209209 
     
    240240         
    241241        SetDataFolder root: 
    242         AddModelToStrings("SmearedThreeShell","smear_coef_ThreeShell","ThreeShell") 
     242        AddModelToStrings("SmearedThreeShell","smear_coef_ThreeShell","smear_parameters_ThreeShell","ThreeShell") 
    243243End 
    244244 
     
    274274         
    275275        SetDataFolder root: 
    276         AddModelToStrings("SmearedFourShell","smear_coef_FourShell","FourShell") 
     276        AddModelToStrings("SmearedFourShell","smear_coef_FourShell","smear_parameters_FourShell","FourShell") 
    277277End 
    278278 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/CorrelationLengthModel_v40.ipf

    r445 r510  
    3535        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3636         
    37         AddModelToStrings("CorrLength","coef_CorrLength","CorrLength") 
     37        AddModelToStrings("CorrLength","coef_CorrLength","parameters_CorrLength","CorrLength") 
    3838// 
    3939End 
     
    7676         
    7777        SetDataFolder root: 
    78         AddModelToStrings("SmearedCorrLength","smear_coef_CorrLength","CorrLength") 
     78        AddModelToStrings("SmearedCorrLength","smear_coef_CorrLength","smear_parameters_CorrLength","CorrLength") 
    7979End 
    8080 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Dumbbell_v40.ipf

    r449 r510  
    4646        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4747         
    48         AddModelToStrings("Dumbbell","coef_Dumb","Dumb") 
     48        AddModelToStrings("Dumbbell","coef_Dumb","parameters_Dumb","Dumb") 
    4949// 
    5050End 
     
    8383         
    8484        SetDataFolder root: 
    85         AddModelToStrings("SmearedDumbbell","smear_coef_Dumb","Dumb") 
     85        AddModelToStrings("SmearedDumbbell","smear_coef_Dumb","smear_parameters_Dumb","Dumb") 
    8686End 
    8787 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/FCC_ParaCrystal_v40.ipf

    r455 r510  
    4949        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    5050         
    51         AddModelToStrings("FCC_ParaCrystal","coef_FCC_ParaCrystal","FCC_ParaCrystal") 
     51        AddModelToStrings("FCC_ParaCrystal","coef_FCC_ParaCrystal","parameters_FCC_ParaCrystal","FCC_ParaCrystal") 
    5252// 
    5353End 
     
    7474        // Setup parameter table for model function 
    7575        Make/O/D smear_coef_FCC_ParaCrystal = {1,220,0.06,40,3e-6,6.3e-6,0.0} 
    76         make/o/t smear_parameters_FCC_ParaCrystal = {"scale","Nearest Neighbor (A)","distortion, g","Sphere Radius (A)","SLD sphere (A-2)","SLD solvent (A-2)", "Background (cm-1)"} 
    77         Edit smear_parameters_FCC_ParaCrystal,smear_coef_FCC_ParaCrystal                                        //display parameters in a table 
     76        make/o/t smear_param_FCC_ParaCrystal = {"scale","Nearest Neighbor (A)","distortion, g","Sphere Radius (A)","SLD sphere (A-2)","SLD solvent (A-2)", "Background (cm-1)"} 
     77        Edit smear_param_FCC_ParaCrystal,smear_coef_FCC_ParaCrystal                                     //display parameters in a table 
    7878         
    7979        // output smeared intensity wave, dimensions are identical to experimental QSIG values 
     
    9494         
    9595        SetDataFolder root: 
    96         AddModelToStrings("SmearedFCC_ParaCrystal","smear_coef_FCC_ParaCrystal","FCC_ParaCrystal") 
     96        AddModelToStrings("SmearedFCC_ParaCrystal","smear_coef_FCC_ParaCrystal","smear_param_FCC_ParaCrystal","FCC_ParaCrystal") 
    9797End 
    9898 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Fractal_PolySphere_v40.ipf

    r396 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("FractalPolySphere","coef_fraPolySph","fraPolySph") 
     34        AddModelToStrings("FractalPolySphere","coef_fraPolySph","parameters_fraPolySph","fraPolySph") 
    3535End 
    3636 
     
    6767         
    6868        SetDataFolder root: 
    69         AddModelToStrings("SmearedFractalPolySphere","smear_coef_fraPolySph","fraPolySph") 
     69        AddModelToStrings("SmearedFractalPolySphere","smear_coef_fraPolySph","smear_parameters_fraPolySph","fraPolySph") 
    7070End 
    7171 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/GaussLorentzGel_v40.ipf

    r445 r510  
    3737        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3838         
    39         AddModelToStrings("GaussLorentzGel","coef_GL_Gel","GL_Gel") 
     39        AddModelToStrings("GaussLorentzGel","coef_GL_Gel","parameters_GL_Gel","GL_Gel") 
    4040// 
    4141End 
     
    7373         
    7474        SetDataFolder root: 
    75         AddModelToStrings("SmearedGaussLorentzGel","smear_coef_GL_Gel","GL_Gel") 
     75        AddModelToStrings("SmearedGaussLorentzGel","smear_coef_GL_Gel","smear_parameters_GL_Gel","GL_Gel") 
    7676End 
    7777 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/LamellarParacrystal_v40.ipf

    r445 r510  
    3636        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3737         
    38         AddModelToStrings("Lamellar_ParaCrystal","coef_LamParaCryst","LamParaCryst") 
     38        AddModelToStrings("Lamellar_ParaCrystal","coef_LamParaCryst","parameters_LamParaCryst","LamParaCryst") 
    3939// 
    4040End 
     
    7777         
    7878        SetDataFolder root: 
    79         AddModelToStrings("SmearedLamellar_ParaCrystal","smear_coef_LamParaCryst","LamParaCryst") 
     79        AddModelToStrings("SmearedLamellar_ParaCrystal","smear_coef_LamParaCryst","smear_parameters_LamParaCryst","LamParaCryst") 
    8080End 
    8181 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyCore_and_NShells_v40.ipf

    r444 r510  
    4848        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4949         
    50         AddModelToStrings("PolyOneShell","coef_PolyOneShell","PolyOneShell") 
     50        AddModelToStrings("PolyOneShell","coef_PolyOneShell","parameters_PolyOneShell","PolyOneShell") 
    5151// 
    5252End 
     
    7373        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    7474         
    75         AddModelToStrings("PolyTwoShell","coef_PolyTwoShell","PolyTwoShell") 
     75        AddModelToStrings("PolyTwoShell","coef_PolyTwoShell","parameters_PolyTwoShell","PolyTwoShell") 
    7676// 
    7777End 
     
    9898        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    9999         
    100         AddModelToStrings("PolyThreeShell","coef_PolyThreeShell","PolyThreeShell") 
     100        AddModelToStrings("PolyThreeShell","coef_PolyThreeShell","parameters_PolyThreeShell","PolyThreeShell") 
    101101// 
    102102End 
     
    123123        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    124124         
    125         AddModelToStrings("PolyFourShell","coef_PolyFourShell","PolyFourShell") 
     125        AddModelToStrings("PolyFourShell","coef_PolyFourShell","parameters_PolyFourShell","PolyFourShell") 
    126126// 
    127127End 
     
    169169         
    170170        SetDataFolder root: 
    171         AddModelToStrings("SmearedPolyOneShell","smear_coef_PolyOneShell","PolyOneShell") 
     171        AddModelToStrings("SmearedPolyOneShell","smear_coef_PolyOneShell","smear_parameters_PolyOneShell","PolyOneShell") 
    172172End 
    173173 
     
    203203         
    204204        SetDataFolder root: 
    205         AddModelToStrings("SmearedPolyTwoShell","smear_coef_PolyTwoShell","PolyTwoShell") 
     205        AddModelToStrings("SmearedPolyTwoShell","smear_coef_PolyTwoShell","smear_parameters_PolyTwoShell","PolyTwoShell") 
    206206End 
    207207 
     
    238238         
    239239        SetDataFolder root: 
    240         AddModelToStrings("SmearedPolyThreeShell","smear_coef_PolyThreeShell","PolyThreeShell") 
     240        AddModelToStrings("SmearedPolyThreeShell","smear_coef_PolyThreeShell","smear_parameters_PolyThreeShell","PolyThreeShell") 
    241241End 
    242242 
     
    272272         
    273273        SetDataFolder root: 
    274         AddModelToStrings("SmearedPolyFourShell","smear_coef_PolyFourShell","PolyFourShell") 
     274        AddModelToStrings("SmearedPolyFourShell","smear_coef_PolyFourShell","smear_parameters_PolyFourShell","PolyFourShell") 
    275275End 
    276276 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyGaussCoil_v40.ipf

    r445 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("PolyGaussCoil","coef_pgc","pgc") 
     34        AddModelToStrings("PolyGaussCoil","coef_pgc","parameters_pgc","pgc") 
    3535End 
    3636 
     
    6969         
    7070        SetDataFolder root: 
    71         AddModelToStrings("SmearedPolyGaussCoil","smear_coef_pgc","pgc") 
     71        AddModelToStrings("SmearedPolyGaussCoil","smear_coef_pgc","smear_parameters_pgc","pgc") 
    7272End 
    7373 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/PolyGaussShell_v40.ipf

    r445 r510  
    3737        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3838         
    39         AddModelToStrings("GaussianShell","coef_GaussianShell","GaussianShell") 
     39        AddModelToStrings("GaussianShell","coef_GaussianShell","parameters_GaussianShell","GaussianShell") 
    4040// 
    4141End 
     
    7878         
    7979        SetDataFolder root: 
    80         AddModelToStrings("SmearedGaussianShell","smear_coef_GaussianShell","GaussianShell") 
     80        AddModelToStrings("SmearedGaussianShell","smear_coef_GaussianShell","smear_parameters_GaussianShell","GaussianShell") 
    8181End 
    8282 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/SC_ParaCrystal_v40.ipf

    r451 r510  
    4949        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    5050         
    51         AddModelToStrings("SC_ParaCrystal","coef_SC_ParaCrystal","SC_ParaCrystal") 
     51        AddModelToStrings("SC_ParaCrystal","coef_SC_ParaCrystal","parameters_SC_ParaCrystal","SC_ParaCrystal") 
    5252// 
    5353End 
     
    9494         
    9595        SetDataFolder root: 
    96         AddModelToStrings("SmearedSC_ParaCrystal","smear_coef_SC_ParaCrystal","SC_ParaCrystal") 
     96        AddModelToStrings("SmearedSC_ParaCrystal","smear_coef_SC_ParaCrystal","smear_parameters_SC_ParaCrystal","SC_ParaCrystal") 
    9797End 
    9898 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Spherocylinder_v40.ipf

    r449 r510  
    4343        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4444         
    45         AddModelToStrings("Spherocylinder","coef_SphCyl","SphCyl") 
     45        AddModelToStrings("Spherocylinder","coef_SphCyl","parameters_SphCyl","SphCyl") 
    4646// 
    4747End 
     
    8080         
    8181        SetDataFolder root: 
    82         AddModelToStrings("SmearedSpherocylinder","smear_coef_SphCyl","SphCyl") 
     82        AddModelToStrings("SmearedSpherocylinder","smear_coef_SphCyl","smear_parameters_SphCyl","SphCyl") 
    8383End 
    8484 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/TwoLorentzian_v40.ipf

    r445 r510  
    3737        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3838         
    39         AddModelToStrings("TwoLorentzian","coef_TwoLorentzian","TwoLorentzian") 
     39        AddModelToStrings("TwoLorentzian","coef_TwoLorentzian","parameters_TwoLorentzian","TwoLorentzian") 
    4040// 
    4141End 
     
    7878         
    7979        SetDataFolder root: 
    80         AddModelToStrings("SmearedTwoLorentzian","smear_coef_TwoLorentzian","TwoLorentzian") 
     80        AddModelToStrings("SmearedTwoLorentzian","smear_coef_TwoLorentzian","smear_parameters_TwoLorentzian","TwoLorentzian") 
    8181End 
    8282 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/Two_Power_Law_v40.ipf

    r465 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("TwoPowerLaw","coef_TwoPowerLaw","TwoPowerLaw") 
     34        AddModelToStrings("TwoPowerLaw","coef_TwoPowerLaw","parameters_TwoPowerLaw","TwoPowerLaw") 
    3535// 
    3636End 
     
    7070         
    7171        SetDataFolder root: 
    72         AddModelToStrings("SmearedTwoPowerLaw","smear_coef_TwoPowerLaw","TwoPowerLaw") 
     72        AddModelToStrings("SmearedTwoPowerLaw","smear_coef_TwoPowerLaw","smear_parameters_TwoPowerLaw","TwoPowerLaw") 
    7373// 
    7474End     // end macro PlotSmearedTwoPowerLaw 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/CSParallelepiped_v40.ipf

    r504 r510  
    5151        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    5252         
    53         AddModelToStrings("CSParallpiped","coef_CSParallpiped","CSParallpiped") 
     53        AddModelToStrings("CSParallpiped","coef_CSParallpiped","parameters_CSParallpiped","CSParallpiped") 
    5454// 
    5555End 
     
    9393 
    9494        SetDataFolder root: 
    95         AddModelToStrings("SmearedCSParallpiped","smear_coef_CSParallpiped","CSParallpiped") 
     95        AddModelToStrings("SmearedCSParallpiped","smear_coef_CSParallpiped","smear_parameters_CSParallpiped","CSParallpiped") 
    9696End 
    9797 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/PolyCoreBicelle_v40.ipf

    r501 r510  
    4242        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4343         
    44         AddModelToStrings("PolyCoreBicelle","coef_PCBicelle","PCBicelle") 
     44        AddModelToStrings("PolyCoreBicelle","coef_PCBicelle","parameters_PCBicelle","PCBicelle") 
    4545End 
    4646 
     
    8080         
    8181        SetDataFolder root: 
    82         AddModelToStrings("SmearedPolyCoreBicelle","smear_coef_PCBicelle","PCBicelle") 
     82        AddModelToStrings("SmearedPolyCoreBicelle","smear_coef_PCBicelle","smear_parameters_PCBicelle","PCBicelle") 
    8383End 
    8484/////////////////////////////////////////////////////////////////////////////// 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/OblateCoreShell_Sq_v40.ipf

    r379 r510  
    3333        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3434         
    35         AddModelToStrings("Oblate_HS","coef_OEF_HS","OEF_HS") 
     35        AddModelToStrings("Oblate_HS","coef_OEF_HS","parameters_OEF_HS","OEF_HS") 
    3636End 
    3737 
     
    6969         
    7070        SetDataFolder root: 
    71         AddModelToStrings("SmearedOblate_HS","smear_coef_OEF_HS","OEF_HS") 
     71        AddModelToStrings("SmearedOblate_HS","smear_coef_OEF_HS","smear_parameters_OEF_HS","OEF_HS") 
    7272End 
    7373         
     
    132132        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    133133         
    134         AddModelToStrings("Oblate_SW","coef_OEF_SW","OEF_SW") 
     134        AddModelToStrings("Oblate_SW","coef_OEF_SW","parameters_OEF_SW","OEF_SW") 
    135135End 
    136136 
     
    168168         
    169169        SetDataFolder root: 
    170         AddModelToStrings("SmearedOblate_SW","smear_coef_OEF_SW","OEF_SW") 
     170        AddModelToStrings("SmearedOblate_SW","smear_coef_OEF_SW","smear_parameters_OEF_SW","OEF_SW") 
    171171End 
    172172 
     
    238238        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    239239         
    240         AddModelToStrings("Oblate_SC","coef_OEF_SC","OEF_SC") 
     240        AddModelToStrings("Oblate_SC","coef_OEF_SC","parameters_OEF_SC","OEF_SC") 
    241241End 
    242242 
     
    279279         
    280280        SetDataFolder root: 
    281         AddModelToStrings("SmearedOblate_SC","smear_coef_OEF_SC","OEF_SC") 
     281        AddModelToStrings("SmearedOblate_SC","smear_coef_OEF_SC","smear_parameters_OEF_SC","OEF_SC") 
    282282End 
    283283 
     
    347347        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    348348         
    349         AddModelToStrings("Oblate_SHS","coef_OEF_SHS","OEF_SHS") 
     349        AddModelToStrings("Oblate_SHS","coef_OEF_SHS","parameters_OEF_SHS","OEF_SHS") 
    350350End 
    351351 
     
    383383         
    384384        SetDataFolder root: 
    385         AddModelToStrings("SmearedOblate_SHS","smear_coef_OEF_SHS","OEF_SHS") 
     385        AddModelToStrings("SmearedOblate_SHS","smear_coef_OEF_SHS","smear_parameters_OEF_SHS","OEF_SHS") 
    386386End 
    387387         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/OblateCoreShell_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("OblateForm","coef_oef","oef") 
     34        AddModelToStrings("OblateForm","coef_oef","parameters_oef","oef") 
    3535End 
    3636 
     
    6868         
    6969        SetDataFolder root: 
    70         AddModelToStrings("SmearedOblateForm","smear_coef_oef","oef") 
     70        AddModelToStrings("SmearedOblateForm","smear_coef_oef","smear_parameters_oef","oef") 
    7171End 
    7272 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Peak_Gauss_model_v40.ipf

    r379 r510  
    2626        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    2727         
    28         AddModelToStrings("Peak_Gauss_Model","coef_Peak_Gauss","Peak_Gauss") 
     28        AddModelToStrings("Peak_Gauss_Model","coef_Peak_Gauss","parameters_Peak_Gauss","Peak_Gauss") 
    2929// 
    3030End 
     
    6363         
    6464        SetDataFolder root: 
    65         AddModelToStrings("SmearedPeak_Gauss_Model","smear_coef_Peak_Gauss","Peak_Gauss") 
     65        AddModelToStrings("SmearedPeak_Gauss_Model","smear_coef_Peak_Gauss","smear_parameters_Peak_Gauss","Peak_Gauss") 
    6666End 
    6767 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Peak_Lorentz_model_v40.ipf

    r379 r510  
    2626        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    2727         
    28         AddModelToStrings("Peak_Lorentz_Model","coef_Peak_Lorentz","Peak_Lorentz") 
     28        AddModelToStrings("Peak_Lorentz_Model","coef_Peak_Lorentz","parameters_Peak_Lorentz","Peak_Lorentz") 
    2929// 
    3030End 
     
    6262        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)   
    6363         
    64         AddModelToStrings("SmearedPeak_Lorentz_Model","smear_coef_Peak_Lorentz","Peak_Lorentz") 
     64        AddModelToStrings("SmearedPeak_Lorentz_Model","smear_coef_Peak_Lorentz","smear_parameters_Peak_Lorentz","Peak_Lorentz") 
    6565End 
    6666 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyCoreShellRatio_Sq_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("PolyCSRatio_HS","coef_PCR_HS","PCR_HS") 
     34        AddModelToStrings("PolyCSRatio_HS","coef_PCR_HS","parameters_PCR_HS","PCR_HS") 
    3535End 
    3636 
     
    6868         
    6969        SetDataFolder root: 
    70         AddModelToStrings("SmearedPolyCSRatio_HS","smear_coef_PCR_HS","PCR_HS") 
     70        AddModelToStrings("SmearedPolyCSRatio_HS","smear_coef_PCR_HS","smear_parameters_PCR_HS","PCR_HS") 
    7171End 
    7272         
     
    139139        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    140140         
    141         AddModelToStrings("PolyCSRatio_SW","coef_PCR_SW","PCR_SW") 
     141        AddModelToStrings("PolyCSRatio_SW","coef_PCR_SW","parameters_PCR_SW","PCR_SW") 
    142142End 
    143143 
     
    175175         
    176176        SetDataFolder root: 
    177         AddModelToStrings("SmearedPolyCSRatio_SW","smear_coef_PCR_SW","PCR_SW") 
     177        AddModelToStrings("SmearedPolyCSRatio_SW","smear_coef_PCR_SW","smear_parameters_PCR_SW","PCR_SW") 
    178178End 
    179179         
     
    254254        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    255255         
    256         AddModelToStrings("PolyCSRatio_SC","coef_PCR_SC","PCR_SC") 
     256        AddModelToStrings("PolyCSRatio_SC","coef_PCR_SC","parameters_PCR_SC","PCR_SC") 
    257257End 
    258258 
     
    295295         
    296296        SetDataFolder root: 
    297         AddModelToStrings("SmearedPolyCSRatio_SC","smear_coef_PCR_SC","PCR_SC") 
     297        AddModelToStrings("SmearedPolyCSRatio_SC","smear_coef_PCR_SC","smear_parameters_PCR_SC","PCR_SC") 
    298298End 
    299299 
     
    370370        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    371371         
    372         AddModelToStrings("PolyCSRatio_SHS","coef_PCR_SHS","PCR_SHS") 
     372        AddModelToStrings("PolyCSRatio_SHS","coef_PCR_SHS","parameters_PCR_SHS","PCR_SHS") 
    373373End 
    374374 
     
    406406         
    407407        SetDataFolder root: 
    408         AddModelToStrings("SmearedPolyCSRatio_SHS","smear_coef_PCR_SHS","PCR_SHS") 
     408        AddModelToStrings("SmearedPolyCSRatio_SHS","smear_coef_PCR_SHS","smear_parameters_PCR_SHS","PCR_SHS") 
    409409End 
    410410 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyCoreShellRatio_v40.ipf

    r379 r510  
    3434        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3535         
    36         AddModelToStrings("PolyCoreShellRatio","coef_pcr","pcr") 
     36        AddModelToStrings("PolyCoreShellRatio","coef_pcr","parameters_pcr","pcr") 
    3737End 
    3838 
     
    7070         
    7171        SetDataFolder root: 
    72         AddModelToStrings("SmearedPolyCoreShellRatio","smear_coef_pcr","pcr") 
     72        AddModelToStrings("SmearedPolyCoreShellRatio","smear_coef_pcr","smear_parameters_pcr","pcr") 
    7373End 
    7474 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyCore_Sq_v40.ipf

    r379 r510  
    3333        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3434         
    35         AddModelToStrings("PolyCore_HS","coef_PCF_HS","PCF_HS") 
     35        AddModelToStrings("PolyCore_HS","coef_PCF_HS","parameters_PCF_HS","PCF_HS") 
    3636End 
    3737 
     
    6969         
    7070        SetDataFolder root: 
    71         AddModelToStrings("SmearedPolyCore_HS","smear_coef_PCF_HS","PCF_HS") 
     71        AddModelToStrings("SmearedPolyCore_HS","smear_coef_PCF_HS","smear_parameters_PCF_HS","PCF_HS") 
    7272End 
    7373         
     
    140140        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    141141         
    142         AddModelToStrings("PolyCore_SW","coef_PCF_SW","PCF_SW") 
     142        AddModelToStrings("PolyCore_SW","coef_PCF_SW","parameters_PCF_SW","PCF_SW") 
    143143End 
    144144 
     
    176176         
    177177        SetDataFolder root: 
    178         AddModelToStrings("SmearedPolyCore_SW","smear_coef_PCF_SW","PCF_SW") 
     178        AddModelToStrings("SmearedPolyCore_SW","smear_coef_PCF_SW","smear_parameters_PCF_SW","PCF_SW") 
    179179End 
    180180         
     
    255255        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    256256         
    257         AddModelToStrings("PolyCore_SC","coef_PCF_SC","PCF_SC") 
     257        AddModelToStrings("PolyCore_SC","coef_PCF_SC","parameters_PCF_SC","PCF_SC") 
    258258End 
    259259 
     
    296296         
    297297        SetDataFolder root: 
    298         AddModelToStrings("SmearedPolyCore_SC","smear_coef_PCF_SC","PCF_SC") 
     298        AddModelToStrings("SmearedPolyCore_SC","smear_coef_PCF_SC","smear_parameters_PCF_SC","PCF_SC") 
    299299End 
    300300 
     
    371371        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    372372         
    373         AddModelToStrings("PolyCore_SHS","coef_PCF_SHS","PCF_SHS") 
     373        AddModelToStrings("PolyCore_SHS","coef_PCF_SHS","parameters_PCF_SHS","PCF_SHS") 
    374374End 
    375375 
     
    407407         
    408408        SetDataFolder root: 
    409         AddModelToStrings("SmearedPolyCore_SHS","smear_coef_PCF_SHS","PCF_SHS") 
     409        AddModelToStrings("SmearedPolyCore_SHS","smear_coef_PCF_SHS","smear_parameters_PCF_SHS","PCF_SHS") 
    410410End 
    411411         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyCore_v40.ipf

    r379 r510  
    3636        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3737         
    38         AddModelToStrings("PolyCoreForm","coef_pcf","pcf") 
     38        AddModelToStrings("PolyCoreForm","coef_pcf","parameters_pcf","pcf") 
    3939End 
    4040 
     
    7272         
    7373        SetDataFolder root: 
    74         AddModelToStrings("SmearedPolyCoreForm","smear_coef_pcf","pcf") 
     74        AddModelToStrings("SmearedPolyCoreForm","smear_coef_pcf","smear_parameters_pcf","pcf") 
    7575End 
    7676 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyHardSphereInten_v40.ipf

    r379 r510  
    3333        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3434         
    35         AddModelToStrings("PolyHardSpheres","coef_phs","phs") 
     35        AddModelToStrings("PolyHardSpheres","coef_phs","parameters_phs","phs") 
    3636End 
    3737 
     
    6969         
    7070        SetDataFolder root: 
    71         AddModelToStrings("SmearedPolyHardSpheres","smear_coef_phs","phs") 
     71        AddModelToStrings("SmearedPolyHardSpheres","smear_coef_phs","smear_parameters_phs","phs") 
    7272End 
    7373 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyRectSphere_Sq_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("PolyRectSphere_HS","coef_RECT_HS","RECT_HS") 
     34        AddModelToStrings("PolyRectSphere_HS","coef_RECT_HS","parameters_RECT_HS","RECT_HS") 
    3535End 
    3636 
     
    6868         
    6969        SetDataFolder root: 
    70         AddModelToStrings("SmearedPolyRectSphere_HS","smear_coef_RECT_HS","RECT_HS") 
     70        AddModelToStrings("SmearedPolyRectSphere_HS","smear_coef_RECT_HS","smear_parameters_RECT_HS","RECT_HS") 
    7171End 
    7272         
     
    136136        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    137137         
    138         AddModelToStrings("PolyRectSphere_SW","coef_RECT_SW","RECT_SW") 
     138        AddModelToStrings("PolyRectSphere_SW","coef_RECT_SW","parameters_RECT_SW","RECT_SW") 
    139139End 
    140140 
     
    172172         
    173173        SetDataFolder root: 
    174         AddModelToStrings("SmearedPolyRectSphere_SW","smear_coef_RECT_SW","RECT_SW") 
     174        AddModelToStrings("SmearedPolyRectSphere_SW","smear_coef_RECT_SW","smear_parameters_RECT_SW","RECT_SW") 
    175175End 
    176176         
     
    248248        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    249249         
    250         AddModelToStrings("PolyRectSphere_SC","coef_RECT_SC","RECT_SC") 
     250        AddModelToStrings("PolyRectSphere_SC","coef_RECT_SC","parameters_RECT_SC","RECT_SC") 
    251251End 
    252252 
     
    289289         
    290290        SetDataFolder root: 
    291         AddModelToStrings("SmearedPolyRectSphere_SC","smear_coef_RECT_SC","RECT_SC") 
     291        AddModelToStrings("SmearedPolyRectSphere_SC","smear_coef_RECT_SC","smear_parameters_RECT_SC","RECT_SC") 
    292292End 
    293293 
     
    361361        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    362362         
    363         AddModelToStrings("PolyRectSphere_SHS","coef_RECT_SHS","RECT_SHS") 
     363        AddModelToStrings("PolyRectSphere_SHS","coef_RECT_SHS","parameters_RECT_SHS","RECT_SHS") 
    364364End 
    365365 
     
    397397         
    398398        SetDataFolder root: 
    399         AddModelToStrings("SmearedPolyRectSphere_SHS","smear_coef_RECT_SHS","RECT_SHS") 
     399        AddModelToStrings("SmearedPolyRectSphere_SHS","smear_coef_RECT_SHS","smear_parameters_RECT_SHS","RECT_SHS") 
    400400End 
    401401         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/PolyRectSphere_v40.ipf

    r379 r510  
    3434        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3535         
    36         AddModelToStrings("PolyRectSpheres","coef_rect","rect") 
     36        AddModelToStrings("PolyRectSpheres","coef_rect","parameters_rect","rect") 
    3737End 
    3838 
     
    7171         
    7272        SetDataFolder root: 
    73         AddModelToStrings("SmearedPolyRectSpheres","smear_coef_rect","rect") 
     73        AddModelToStrings("SmearedPolyRectSpheres","smear_coef_rect","smear_parameters_rect","rect") 
    7474End 
    7575 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Power_Law_model_v40.ipf

    r379 r510  
    2727        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    2828         
    29         AddModelToStrings("Power_Law_Model","coef_Power_Law","Power_Law") 
     29        AddModelToStrings("Power_Law_Model","coef_Power_Law","parameters_Power_Law","Power_Law") 
    3030// 
    3131End 
     
    6565         
    6666        SetDataFolder root: 
    67         AddModelToStrings("SmearedPower_Law_Model","smear_coef_Power_Law","Power_Law") 
     67        AddModelToStrings("SmearedPower_Law_Model","smear_coef_Power_Law","smear_parameters_Power_Law","Power_Law") 
    6868// 
    6969End     // end macro PlotSmearedPower_Law 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/ProlateCoreShell_Sq_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("Prolate_HS","coef_PEF_HS","PEF_HS") 
     34        AddModelToStrings("Prolate_HS","coef_PEF_HS","parameters_PEF_HS","PEF_HS") 
    3535End 
    3636 
     
    6868         
    6969        SetDataFolder root: 
    70         AddModelToStrings("SmearedProlate_HS","smear_coef_PEF_HS","PEF_HS") 
     70        AddModelToStrings("SmearedProlate_HS","smear_coef_PEF_HS","smear_parameters_PEF_HS","PEF_HS") 
    7171End 
    7272         
     
    131131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    132132         
    133         AddModelToStrings("Prolate_SW","coef_PEF_SW","PEF_SW") 
     133        AddModelToStrings("Prolate_SW","coef_PEF_SW","parameters_PEF_SW","PEF_SW") 
    134134End 
    135135 
     
    167167         
    168168        SetDataFolder root: 
    169         AddModelToStrings("SmearedProlate_SW","smear_coef_PEF_SW","PEF_SW") 
     169        AddModelToStrings("SmearedProlate_SW","smear_coef_PEF_SW","smear_parameters_PEF_SW","PEF_SW") 
    170170End 
    171171         
     
    237237        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    238238         
    239         AddModelToStrings("Prolate_SC","coef_PEF_SC","PEF_SC") 
     239        AddModelToStrings("Prolate_SC","coef_PEF_SC","parameters_PEF_SC","PEF_SC") 
    240240End 
    241241 
     
    278278         
    279279        SetDataFolder root: 
    280         AddModelToStrings("SmearedProlate_SC","smear_coef_PEF_SC","PEF_SC") 
     280        AddModelToStrings("SmearedProlate_SC","smear_coef_PEF_SC","smear_parameters_PEF_SC","PEF_SC") 
    281281End 
    282282 
     
    346346        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    347347         
    348         AddModelToStrings("Prolate_SHS","coef_PEF_SHS","PEF_SHS") 
     348        AddModelToStrings("Prolate_SHS","coef_PEF_SHS","parameters_PEF_SHS","PEF_SHS") 
    349349End 
    350350 
     
    382382         
    383383        SetDataFolder root: 
    384         AddModelToStrings("SmearedProlate_SHS","smear_coef_PEF_SHS","PEF_SHS") 
     384        AddModelToStrings("SmearedProlate_SHS","smear_coef_PEF_SHS","smear_parameters_PEF_SHS","PEF_SHS") 
    385385End 
    386386         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/ProlateCoreShell_v40.ipf

    r379 r510  
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3232         
    33         AddModelToStrings("ProlateForm","coef_pef","pef") 
     33        AddModelToStrings("ProlateForm","coef_pef","parameters_pef","pef") 
    3434End 
    3535 
     
    6767         
    6868        SetDataFolder root: 
    69         AddModelToStrings("SmearedProlateForm","smear_coef_pef","pef") 
     69        AddModelToStrings("SmearedProlateForm","smear_coef_pef","smear_parameters_pef","pef") 
    7070End 
    7171 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/SmearedRPA_v40.ipf

    r400 r510  
    6868        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    6969         
    70         AddModelToStrings("RPAForm","coef_rpa","rpa") 
     70        AddModelToStrings("RPAForm","coef_rpa","parameters_rpa","rpa") 
    7171End 
    7272 
     
    142142         
    143143        SetDataFolder root: 
    144         AddModelToStrings("SmearedRPAForm","smear_coef_rpa","rpa") 
     144        AddModelToStrings("SmearedRPAForm","smear_coef_rpa","smear_parameters_rpa","rpa") 
    145145End 
    146146 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Sphere_Sq_v40.ipf

    r379 r510  
    3333        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3434         
    35         AddModelToStrings("Sphere_HS","coef_S_HS","S_HS") 
     35        AddModelToStrings("Sphere_HS","coef_S_HS","parameters_S_HS","S_HS") 
    3636End 
    3737 
     
    6969         
    7070        SetDataFolder root: 
    71         AddModelToStrings("SmearedSphere_HS","smear_coef_S_HS","S_HS") 
     71        AddModelToStrings("SmearedSphere_HS","smear_coef_S_HS","smear_parameters_S_HS","S_HS") 
    7272End 
    7373 
     
    129129 
    130130        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    131         AddModelToStrings("Sphere_SW","coef_S_SW","S_SW") 
     131        AddModelToStrings("Sphere_SW","coef_S_SW","parameters_S_SW","S_SW") 
    132132End 
    133133 
     
    165165         
    166166        SetDataFolder root: 
    167         AddModelToStrings("SmearedSphere_SW","smear_coef_S_SW","S_SW") 
     167        AddModelToStrings("SmearedSphere_SW","smear_coef_S_SW","smear_parameters_S_SW","S_SW") 
    168168End 
    169169         
     
    230230        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    231231         
    232         AddModelToStrings("Sphere_SC","coef_S_SC","S_SC") 
     232        AddModelToStrings("Sphere_SC","coef_S_SC","parameters_S_SC","S_SC") 
    233233End 
    234234 
     
    271271         
    272272        SetDataFolder root: 
    273         AddModelToStrings("SmearedSphere_SC","smear_coef_S_SC","S_SC") 
     273        AddModelToStrings("SmearedSphere_SC","smear_coef_S_SC","smear_parameters_S_SC","S_SC") 
    274274End 
    275275         
     
    335335        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    336336         
    337         AddModelToStrings("Sphere_SHS","coef_S_SHS","S_SHS") 
     337        AddModelToStrings("Sphere_SHS","coef_S_SHS","parameters_S_SHS","S_SHS") 
    338338End 
    339339 
     
    371371         
    372372        SetDataFolder root: 
    373         AddModelToStrings("SmearedSphere_SHS","smear_coef_S_SHS","S_SHS") 
     373        AddModelToStrings("SmearedSphere_SHS","smear_coef_S_SHS","smear_parameters_S_SHS","S_SHS") 
    374374End 
    375375 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Sphere_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("SphereForm","coef_sf","sf") 
     34        AddModelToStrings("SphereForm","coef_sf","parameters_sf","sf") 
    3535End 
    3636 
     
    6565         
    6666        SetDataFolder root: 
    67         AddModelToStrings("SmearedSphereForm","smear_coef_sf","sf") 
     67        AddModelToStrings("SmearedSphereForm","smear_coef_sf","smear_parameters_sf","sf") 
    6868End 
    6969 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/SquareWellStruct_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("SquareWellStruct","coef_sws","sws") 
     34        AddModelToStrings("SquareWellStruct","coef_sws","parameters_sws","sws") 
    3535End 
    3636 
     
    115115      Return struc 
    116116End 
    117  
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/StackedDiscs_v40.ipf

    r379 r510  
    3939        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    4040         
    41         AddModelToStrings("StackedDiscs","coef_scyl","scyl") 
     41        AddModelToStrings("StackedDiscs","coef_scyl","parameters_scyl","scyl") 
    4242End 
    4343/////////////////////////////////////////////////////////// 
     
    7676         
    7777        SetDataFolder root: 
    78         AddModelToStrings("SmearedStackedDiscs","smear_coef_scyl","scyl") 
     78        AddModelToStrings("SmearedStackedDiscs","smear_coef_scyl","smear_parameters_scyl","scyl") 
    7979End 
    8080 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/Teubner_v40.ipf

    r379 r510  
    2929        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3030 
    31         AddModelToStrings("TeubnerStreyModel","coef_ts","ts") 
     31        AddModelToStrings("TeubnerStreyModel","coef_ts","parameters_ts","ts") 
    3232End 
    3333 
     
    6666         
    6767        SetDataFolder root: 
    68         AddModelToStrings("SmearedTeubnerStreyModel","smear_coef_ts","ts") 
     68        AddModelToStrings("SmearedTeubnerStreyModel","smear_coef_ts","smear_parameters_ts","ts") 
    6969End 
    7070 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/UniformEllipsoid_Sq_v40.ipf

    r379 r510  
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3333         
    34         AddModelToStrings("Ellipsoid_HS","coef_EOR_HS","EOR_HS") 
     34        AddModelToStrings("Ellipsoid_HS","coef_EOR_HS","parameters_EOR_HS","EOR_HS") 
    3535End 
    3636 
     
    6868         
    6969        SetDataFolder root: 
    70         AddModelToStrings("SmearedEllipsoid_HS","smear_coef_EOR_HS","EOR_HS") 
     70        AddModelToStrings("SmearedEllipsoid_HS","smear_coef_EOR_HS","smear_parameters_EOR_HS","EOR_HS") 
    7171End 
    7272         
     
    129129        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    130130         
    131         AddModelToStrings("Ellipsoid_SW","coef_EOR_SW","EOR_SW") 
     131        AddModelToStrings("Ellipsoid_SW","coef_EOR_SW","parameters_EOR_SW","EOR_SW") 
    132132End 
    133133 
     
    165165         
    166166        SetDataFolder root: 
    167         AddModelToStrings("SmearedEllipsoid_SW","smear_coef_EOR_SW","EOR_SW") 
     167        AddModelToStrings("SmearedEllipsoid_SW","smear_coef_EOR_SW","smear_parameters_EOR_SW","EOR_SW") 
    168168End 
    169169         
     
    232232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    233233         
    234         AddModelToStrings("Ellipsoid_SC","coef_EOR_SC","EOR_SC") 
     234        AddModelToStrings("Ellipsoid_SC","coef_EOR_SC","parameters_EOR_SC","EOR_SC") 
    235235End 
    236236 
     
    273273         
    274274        SetDataFolder root: 
    275         AddModelToStrings("SmearedEllipsoid_SC","smear_coef_EOR_SC","EOR_SC") 
     275        AddModelToStrings("SmearedEllipsoid_SC","smear_coef_EOR_SC","smear_parameters_EOR_SC","EOR_SC") 
    276276End 
    277277 
     
    337337        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    338338         
    339         AddModelToStrings("Ellipsoid_SHS","coef_EOR_SHS","EOR_SHS") 
     339        AddModelToStrings("Ellipsoid_SHS","coef_EOR_SHS","parameters_EOR_SHS","EOR_SHS") 
    340340End 
    341341 
     
    373373         
    374374        SetDataFolder root: 
    375         AddModelToStrings("SmearedEllipsoid_SHS","smear_coef_EOR_SHS","EOR_SHS") 
     375        AddModelToStrings("SmearedEllipsoid_SHS","smear_coef_EOR_SHS","smear_parameters_EOR_SHS","EOR_SHS") 
    376376End 
    377377         
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/UniformEllipsoid_v40.ipf

    r379 r510  
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    3232         
    33         AddModelToStrings("EllipsoidForm","coef_eor","eor") 
     33        AddModelToStrings("EllipsoidForm","coef_eor","parameters_eor","eor") 
    3434End 
    3535/////////////////////////////////////////////////////////// 
     
    6767         
    6868        SetDataFolder root: 
    69         AddModelToStrings("SmearedEllipsoidForm","smear_coef_eor","eor") 
     69        AddModelToStrings("SmearedEllipsoidForm","smear_coef_eor","smear_parameters_eor","eor") 
    7070End 
    7171 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

    r495 r510  
    348348                        Variable popNum = pa.popNum 
    349349                        String popStr = pa.popStr 
    350                         String suffix = getModelSuffix(popStr) 
     350                        ControlInfo/W=WrapperPanel popup_1 
     351                        String funcStr=S_Value 
     352                        String suffix = getModelSuffix(funcStr) 
    351353                        ControlInfo/W=WrapperPanel popup_0 
    352354                        String folderStr=S_Value 
     
    402404                        // get them onto the table 
    403405                        // how do I get the parameter name? 
    404                         String param = WaveList("*parameters_"+suffix, "", "TEXT:1," )          //this is *hopefully* one wave 
     406                        String param = getFunctionParams(funcStr) 
    405407                        AppendtoTable/W=wrapperPanel#T0 $param,$(popStr) 
    406408                        AppendToTable/W=wrapperPanel#T0 $("Hold_"+suffix),$("LoLim_"+suffix),$("HiLim_"+suffix),$("epsilon_"+suffix) 
     
    483485 
    484486 
    485  
    486 // always pass this the coefficient string 
    487 // 
    488 // either "coef_" 
    489 // or "smear_coef_" 
     487// always pass this the function string 
     488// 
     489Function/S getFunctionParams(funcStr) 
     490        String funcStr 
     491 
     492        SVAR listStr=root:Packages:NIST:paramKWStr 
     493        String paramStr = StringByKey(funcStr, listStr  ,"=",";",0) 
     494 
     495        return(paramStr) 
     496End 
     497 
     498// always pass this the function string 
    490499// 
    491500Function/S getFunctionCoef(funcStr) 
     
    498507End 
    499508 
    500 // always pass this the coefficient string 
    501 // 
    502 // either "coef_" 
    503 // or "smear_coef_" 
     509// always pass this the Function string 
    504510// 
    505511// does NOT return the leading "_" as part of the suffix 
    506 Function/S getModelSuffix(coefStr) 
    507         String coefStr 
     512Function/S getModelSuffix(funcStr) 
     513        String funcStr 
    508514 
    509515        SVAR listStr=root:Packages:NIST:suffixKWStr 
    510         String suffixStr = StringByKey(coefStr, listStr  ,"=",";",0) 
     516        String suffixStr = StringByKey(funcStr, listStr  ,"=",";",0) 
    511517 
    512518        return(suffixStr) 
    513 //      Variable pos,start=0 
    514  
    515 //      if(stringmatch(coefStr,"smear_*") == 1) 
    516 //              start=7 //look forwards to find "_", skipping "smear_coe" if necessary 
    517 //      endif 
    518 //      pos=Strsearch(coefStr,"_",start,0) 
    519         //Print start, pos 
    520 //      return(coefStr[pos,strlen(coefStr)-1]) 
    521519End 
    522520 
     
    616614        STRUCT WMButtonAction &ba 
    617615 
    618         String coefStr,suffix,yWStr,xWStr,folderStr 
     616        String coefStr,suffix,yWStr,xWStr,folderStr,funcStr 
    619617         
    620618        switch( ba.eventCode ) 
     
    622620                        ControlInfo/W=WrapperPanel popup_2 
    623621                        coefStr=S_Value 
    624                         suffix = getModelSuffix(coefStr) 
     622                         
     623                        ControlInfo/W=WrapperPanel popup_1 
     624                        funcStr=S_Value 
     625                        suffix = getModelSuffix(funcStr) 
    625626                         
    626627                        // check for smeared or smeared function 
     
    724725        Variable useCursors,useEps,useConstr 
    725726 
    726         String suffix=getModelSuffix(coefStr) 
     727        String suffix=getModelSuffix(funcStr) 
    727728         
    728729        SetDataFolder $("root:"+folderStr) 
Note: See TracChangeset for help on using the changeset viewer.