Ignore:
Timestamp:
Nov 15, 2007 11:27:16 AM (15 years ago)
Author:
srkline
Message:

Changed 2D model calculations to use a FIXED 25 integration points in an effort to get the number of integration points out of the fitting coefficient wave.

Added "Freeze Model" back to the SANS Models menu

Added the 2D model functions to the list on the model picker

Minor tweaks to the wrapper

File:
1 edited

Legend:

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

    r198 r200  
    2525         
    2626        // Setup parameter table for model function 
    27         make/O/T/N=14 parameters_EllCyl2D 
    28         Make/O/D/N=14 coef_EllCyl2D 
    29                  
     27        //make/O/T/N=14 parameters_EllCyl2D 
     28        //Make/O/D/N=14 coef_EllCyl2D 
     29        make/O/T/N=13 parameters_EllCyl2D 
     30        Make/O/D/N=13 coef_EllCyl2D 
     31         
    3032        coef_EllCyl2D[0] = 1.0 
    3133        coef_EllCyl2D[1] = 20.0 
     
    4143        coef_EllCyl2D[11] = 0.0 
    4244        coef_EllCyl2D[12] = 0.0 
    43         coef_EllCyl2D[13] = 10 
     45         
     46        // now hard-wire the # of integration points 
     47        //coef_EllCyl2D[13] = 25 
    4448                 
    4549        parameters_EllCyl2D[0] = "Scale" 
     
    5660        parameters_EllCyl2D[11] = "Sigma of polydisp in Theta [rad]" 
    5761        parameters_EllCyl2D[12] = "Sigma of polydisp in Phi [rad]" 
    58         parameters_EllCyl2D[13] = "Num of polydisp points" 
     62        //parameters_EllCyl2D[13] = "Num of polydisp points" 
    5963         
    6064        Edit parameters_EllCyl2D,coef_EllCyl2D                                   
     
    101105//       
    102106//#if exists("EllipticalCylinderModel_D") 
    103 //      zw = EllipticalCylinderModel_D(cw,xw,yw) 
     107// 
     108//      Make/O/D/N=14 EllCyl2D_tmp 
     109//      EllCyl2D_tmp = cw 
     110//      EllCyl2D_tmp[13] = 25 
     111//       
     112//      zw = EllipticalCylinderModel_D(EllCyl2D_tmp,xw,yw) 
     113//       
     114////    zw = EllipticalCylinderModel_D(cw,xw,yw) 
    104115//#else 
    105116//      Abort "You do not have the SANS Analysis XOP installed" 
     
    115126         
    116127#if exists("EllipticalCylinderModel_D")                 //to hide the function if XOP not installed 
    117         zw[p1,p2]= EllipticalCylinderModel_D(cw,xw,yw) 
     128 
     129        Make/O/D/N=14 EllCyl2D_tmp 
     130        EllCyl2D_tmp = cw 
     131        EllCyl2D_tmp[13] = 25 
     132         
     133        zw[p1,p2]= EllipticalCylinderModel_D(EllCyl2D_tmp,xw,yw) 
     134         
    118135#endif 
    119136 
Note: See TracChangeset for help on using the changeset viewer.