Changeset 236 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/TriaxialEllipsoid.ipf

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:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/TriaxialEllipsoid.ipf (modified) (3 diffs)

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

@@ -31 +31 @@
         Make/O/D/n=(num) xwave_triax, ywave_triax
         xwave_triax =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num))
-        Make/O/D coef_triax = {1,35,100,400,6e-6,0}                     //CH#2
-        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
+        Make/O/D coef_triax = {1,35,100,400,1e-6,6.3e-6,0}                      //CH#2
+        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
         Edit parameters_triax, coef_triax
         
@@ -62 +62 @@
         
         // Setup parameter table for model function
-        Make/O/D smear_coef_triax = {1,35,100,400,6e-6,0}               //CH#4
-        make/o/t smear_parameters_triax = {"Scale Factor","A ()","B ()","C ()","Contrast (^-2)","Incoherent Bgd (cm-1)"}
+        Make/O/D smear_coef_triax = {1,35,100,400,1e-6,6.3e-6,0}                //CH#4
+        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)"}
         Edit smear_parameters_triax,smear_coef_triax                                    //display parameters in a table
         
@@ -112 +112 @@
         //[2] semi-axis B (A)
         //[3] semi-axis C (A)
-        //[4] contrast (A^-2)
-        //[5] incoherent background (cm^-1)
+        //[4] sld ellipsoid (A^-2)
+        //[5] sld solvent
+        //[6] incoherent background (cm^-1)
 //      give them nice names
-        Variable scale,aa,bb,cc,contr,bkg,inten,qq,ii,arg,mu
+        Variable scale,aa,bb,cc,contr,bkg,inten,qq,ii,arg,mu,slde,slds
         scale = w[0]
         aa = w[1]
         bb = w[2]
         cc = w[3]
-        contr = w[4]
-        bkg = w[5]
+        slde = w[4]
+        slds = w[5]
+        bkg = w[6]
+        
+        contr = slde-slds
         
         Variable/G root:gDumY=0,root:gDumX=0