Ignore:
Timestamp:
Jan 11, 2008 5:07:24 PM (15 years ago)
Author:
srkline
Message:

Changes to Igor functions to convert models to take individual SLD's rather than contrast.

Individual SLD's are easier to work with - since they are experimental values, contrast is not.

Concurrent changes have been made to the XOPs (the library) so that all calculations are the same.

File:
1 edited

Legend:

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

    r166 r236  
    3131        Make/O/D/n=(num) xwave_triax, ywave_triax 
    3232        xwave_triax =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    33         Make/O/D coef_triax = {1,35,100,400,6e-6,0}                     //CH#2 
    34         make/o/t parameters_triax = {"Scale Factor","Semi-axis A [smallest]()","Semi-axis B ()","Semi-axis C [largest]()","Contrast (^-2)","Incoherent Bgd (cm-1)"} //CH#3 
     33        Make/O/D coef_triax = {1,35,100,400,1e-6,6.3e-6,0}                      //CH#2 
     34        make/o/t parameters_triax = {"Scale Factor","Semi-axis A [smallest]()","Semi-axis B ()","Semi-axis C [largest]()","SLD ellipsoid (^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"}       //CH#3 
    3535        Edit parameters_triax, coef_triax 
    3636         
     
    6262         
    6363        // Setup parameter table for model function 
    64         Make/O/D smear_coef_triax = {1,35,100,400,6e-6,0}               //CH#4 
    65         make/o/t smear_parameters_triax = {"Scale Factor","A ()","B ()","C ()","Contrast (^-2)","Incoherent Bgd (cm-1)"} 
     64        Make/O/D smear_coef_triax = {1,35,100,400,1e-6,6.3e-6,0}                //CH#4 
     65        make/o/t smear_parameters_triax = {"Scale Factor","Semi-axis A [smallest]()","Semi-axis B ()","Semi-axis C [largest]()","SLD ellipsoid (^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"} 
    6666        Edit smear_parameters_triax,smear_coef_triax                                    //display parameters in a table 
    6767         
     
    112112        //[2] semi-axis B (A) 
    113113        //[3] semi-axis C (A) 
    114         //[4] contrast (A^-2) 
    115         //[5] incoherent background (cm^-1) 
     114        //[4] sld ellipsoid (A^-2) 
     115        //[5] sld solvent 
     116        //[6] incoherent background (cm^-1) 
    116117//      give them nice names 
    117         Variable scale,aa,bb,cc,contr,bkg,inten,qq,ii,arg,mu 
     118        Variable scale,aa,bb,cc,contr,bkg,inten,qq,ii,arg,mu,slde,slds 
    118119        scale = w[0] 
    119120        aa = w[1] 
    120121        bb = w[2] 
    121122        cc = w[3] 
    122         contr = w[4] 
    123         bkg = w[5] 
     123        slde = w[4] 
     124        slds = w[5] 
     125        bkg = w[6] 
     126         
     127        contr = slde-slds 
    124128         
    125129        Variable/G root:gDumY=0,root:gDumX=0 
Note: See TracChangeset for help on using the changeset viewer.