Changeset 533 for sans/Dev

Timestamp:

Jul 7, 2009 6:33:13 PM (14 years ago)

Author:

srkline

Message:

changed DAB function to remove correlated parameters. Documentation was changed, but has yet to be uploaded.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/DAB_model_v40.ipf (modified) (5 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/DAB_model_v40.ipf

@@ -5 +5 @@
 //      C. Glinka, 11-22-98
 ////////////////
+
+// SRK 6 JUL 2009 - converted the definition of the scale factor (A) to be
+// independent of the correlation length. Changed the Igor, XOP, and documentation
 
 
@@ -18 +21 @@
         Make/O/D/n=(num) xwave_DAB, ywave_DAB
         xwave_DAB =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num))
-        Make/O/D coef_DAB = {10.0, 40, 1.0}
+        Make/O/D coef_DAB = {0.00015625, 40, 1.0}
         make/o/t parameters_DAB = {"Scale Factor, A ", "Correlation Length (A)", "Incoherent Bgd (cm-1)"}
         Edit parameters_DAB, coef_DAB
@@ -48 +51 @@
         
         // Setup parameter table for model function
-        Make/O/D smear_coef_DAB = {10.0, 40, 1.0}                                       //model  coef values to match unsmeared model above
+        Make/O/D smear_coef_DAB = {0.00015625, 40, 1.0}                                 //model  coef values to match unsmeared model above
         make/o/t smear_parameters_DAB = {"Scale Factor, A ", "Correlation Length (A)", "Incoherent Bgd (cm-1)"}// parameter names
         Edit smear_parameters_DAB,smear_coef_DAB                                        //display parameters in a table
@@ -82 +85 @@
 End
 
+// Izero is really now scale*range^3
+//
 Function fDAB_model(w,x) : FitFunc
         Wave w
@@ -100 +105 @@
 //      do the calculation and return the function value
         
-        inten = Izero/(1 + (qval*range)^2)^2 + incoh
+        inten = (Izero*range^3)/(1 + (qval*range)^2)^2 + incoh
         Return (inten)
 End