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

    r198 r200  
    2525         
    2626        // Setup parameter table for model function 
    27         make/O/T/N=15 parameters_CSCyl2D 
    28         Make/O/D/N=15 coef_CSCyl2D 
     27//      make/O/T/N=15 parameters_CSCyl2D 
     28//      Make/O/D/N=15 coef_CSCyl2D 
     29        make/O/T/N=14 parameters_CSCyl2D 
     30        Make/O/D/N=14 coef_CSCyl2D 
    2931         
    3032        coef_CSCyl2D[0] = 1.0 
     
    4244        coef_CSCyl2D[12] = 0.0 
    4345        coef_CSCyl2D[13] = 0.0 
    44         coef_CSCyl2D[14] = 10 
     46        //hard-wire the number of integration points 
     47//      coef_CSCyl2D[14] = 10 
    4548         
    4649        parameters_CSCyl2D[0] = "Scale" 
     
    5861        parameters_CSCyl2D[12] = "Sigma of polydisp in Theta [rad]" 
    5962        parameters_CSCyl2D[13] = "Sigma of polydisp in Phi [rad]" 
    60         parameters_CSCyl2D[14] = "Num of polydisp points" 
     63//      parameters_CSCyl2D[14] = "Num of polydisp points" 
    6164         
    6265        Edit parameters_CSCyl2D,coef_CSCyl2D                                     
     
    103106//       
    104107//#if exists("CoreShellCylinderModel_D") 
    105 //      zw = CoreShellCylinderModel_D(cw,xw,yw) 
     108//      Make/O/D/N=15 CSCyl2D_tmp 
     109//      CSCyl2D_tmp = cw 
     110//      CSCyl2D_tmp[14] = 25 
     111// 
     112//      zw = CoreShellCylinderModel_D(CSCyl2D_tmp,xw,yw) 
     113//       
     114////    zw = CoreShellCylinderModel_D(cw,xw,yw) 
    106115//#else 
    107116//      Abort "You do not have the SANS Analysis XOP installed" 
     
    117126         
    118127#if exists("CoreShellCylinderModel_D")                  //to hide the function if XOP not installed 
    119         zw[p1,p2]= CoreShellCylinderModel_D(cw,xw,yw) 
     128 
     129        Make/O/D/N=15 CSCyl2D_tmp 
     130        CSCyl2D_tmp = cw 
     131        CSCyl2D_tmp[14] = 25 
     132 
     133        zw[p1,p2]= CoreShellCylinderModel_D(CSCyl2D_tmp,xw,yw) 
     134         
    120135#endif 
    121136 
Note: See TracChangeset for help on using the changeset viewer.