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

    r198 r200  
    22#pragma IgorVersion=6.0 
    33 
     4// 
     5// !!! FOR THE ELLIPSOID, THE ANGLE THETA IS DEFINED FROM ???? 
    46// 
    57// The plotting macro sets up TWO dependencies 
     
    2527         
    2628        // Setup parameter table for model function 
    27         make/O/T/N=12 parameters_Ellip2D 
    28         Make/O/D/N=12 coef_Ellip2D 
     29//      make/O/T/N=12 parameters_Ellip2D 
     30//      Make/O/D/N=12 coef_Ellip2D 
     31        make/O/T/N=11 parameters_Ellip2D 
     32        Make/O/D/N=11 coef_Ellip2D 
    2933         
    3034        coef_Ellip2D[0] = 1.0 
     
    3943        coef_Ellip2D[9] = 0.0 
    4044        coef_Ellip2D[10] = 0.0 
    41         coef_Ellip2D[11] = 10 
     45        // hard-wire the number of integration points 
     46//      coef_Ellip2D[11] = 10 
    4247         
    4348        parameters_Ellip2D[0] = "Scale" 
     
    5257        parameters_Ellip2D[9] = "Sigma of polydisp in Theta [rad]" 
    5358        parameters_Ellip2D[10] = "Sigma of polydisp in Phi [rad]" 
    54         parameters_Ellip2D[11] = "Num of polydisp points" 
     59         
     60//      parameters_Ellip2D[11] = "Num of polydisp points" 
    5561 
    5662         
     
    98104//       
    99105//#if exists("EllipsoidModel_D") 
    100 //      zw = EllipsoidModel_D(cw,xw,yw) 
     106// 
     107//      Make/O/D/N=12 Ellip2D_tmp 
     108//      Ellip2D_tmp = cw 
     109//      Ellip2D_tmp[11] = 25 
     110//       
     111//      zw = EllipsoidModel_D(Ellip2D_tmp,xw,yw) 
     112//       
     113////    zw = EllipsoidModel_D(cw,xw,yw) 
    101114//#else 
    102115//      Abort "You do not have the SANS Analysis XOP installed" 
     
    112125         
    113126#if exists("EllipsoidModel_D")                  //to hide the function if XOP not installed 
    114         zw[p1,p2]= EllipsoidModel_D(cw,xw,yw) 
     127 
     128        Make/O/D/N=12 Ellip2D_tmp 
     129        Ellip2D_tmp = cw 
     130        Ellip2D_tmp[11] = 25 
     131         
     132        zw[p1,p2]= EllipsoidModel_D(Ellip2D_tmp,xw,yw) 
     133         
    115134#endif 
    116135 
Note: See TracChangeset for help on using the changeset viewer.