Changeset 533


Ignore:
Timestamp:
Jul 7, 2009 6:33:13 PM (13 years ago)
Author:
srkline
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/DAB_model_v40.ipf

    r510 r533  
    55//      C. Glinka, 11-22-98 
    66//////////////// 
     7 
     8// SRK 6 JUL 2009 - converted the definition of the scale factor (A) to be 
     9// independent of the correlation length. Changed the Igor, XOP, and documentation 
    710 
    811 
     
    1821        Make/O/D/n=(num) xwave_DAB, ywave_DAB 
    1922        xwave_DAB =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    20         Make/O/D coef_DAB = {10.0, 40, 1.0} 
     23        Make/O/D coef_DAB = {0.00015625, 40, 1.0} 
    2124        make/o/t parameters_DAB = {"Scale Factor, A ", "Correlation Length (A)", "Incoherent Bgd (cm-1)"} 
    2225        Edit parameters_DAB, coef_DAB 
     
    4851         
    4952        // Setup parameter table for model function 
    50         Make/O/D smear_coef_DAB = {10.0, 40, 1.0}                                       //model  coef values to match unsmeared model above 
     53        Make/O/D smear_coef_DAB = {0.00015625, 40, 1.0}                                 //model  coef values to match unsmeared model above 
    5154        make/o/t smear_parameters_DAB = {"Scale Factor, A ", "Correlation Length (A)", "Incoherent Bgd (cm-1)"}// parameter names 
    5255        Edit smear_parameters_DAB,smear_coef_DAB                                        //display parameters in a table 
     
    8285End 
    8386 
     87// Izero is really now scale*range^3 
     88// 
    8489Function fDAB_model(w,x) : FitFunc 
    8590        Wave w 
     
    100105//      do the calculation and return the function value 
    101106         
    102         inten = Izero/(1 + (qval*range)^2)^2 + incoh 
     107        inten = (Izero*range^3)/(1 + (qval*range)^2)^2 + incoh 
    103108        Return (inten) 
    104109End 
Note: See TracChangeset for help on using the changeset viewer.