Ignore:
Timestamp:
Mar 31, 2010 2:54:41 PM (13 years ago)
Author:
ajj
Message:

Update to CatVSTable to show sample position, TISANE to fix a couple of startup bugs and FuzzySpheres? to add the lorentzian term.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009
Files:
2 edited

Legend:

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

    r570 r656  
    1111// 
    1212// SRK JUL 2009 
     13// 
     14// Use different volume fraction and radius for hard sphere interaction as Stieger et al. 
     15// 
     16// 
     17// AJJ Feb 2010 
     18 
    1319 
    1420// 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/FuzzySpheres_v40.ipf

    r570 r656  
    1212// 
    1313// SRK JUL 2009 
     14// 
     15// Include lorentzian term for *high* Q component of the scattering. 
     16// 
     17// AJJ Feb 2010 
     18 
     19#include "Lorentz_model_v40" 
    1420 
    1521Proc PlotFuzzySpheres(num,qmin,qmax) 
     
    2127        Make/O/D/N=(num) xwave_fuzz,ywave_fuzz 
    2228        xwave_fuzz = alog( log(qmin) + x*((log(qmax)-log(qmin))/num) ) 
    23         Make/O/D coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6,0.001} 
    24         make/O/T parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","bkg (cm-1 sr-1)"} 
     29        Make/O/D coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6,1,50,0.001} 
     30        make/O/T parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","Lorentz Scale","Lorentz length","bkg (cm-1 sr-1)"} 
    2531        Edit parameters_fuzz,coef_fuzz 
    2632         
     
    4955         
    5056        // Setup parameter table for model function 
    51         Make/O/D smear_coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6,0.001}                                      
    52         make/o/t smear_parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","bkg (cm-1 sr-1)"}   
     57        Make/O/D smear_coef_fuzz = {0.01,60,0.2,10,1e-6,3e-6,1,50,0.001}                                         
     58        make/o/t smear_parameters_fuzz = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","interface thickness (A)","SLD sphere (A-2)","SLD solvent (A-2)","Lorentz Scale","Lorentz length","bkg (cm-1 sr-1)"}  
    5359        Edit smear_parameters_fuzz,smear_coef_fuzz                                       
    5460         
     
    9298        variable xx 
    9399         
    94         Variable scale,rad,pd,sig,rho,rhos,bkg,delrho,sig_surf 
     100        Variable scale,rad,pd,sig,rho,rhos,bkg,delrho,sig_surf,lor_sf,lor_len 
    95101         
    96102        //set up the coefficient values 
     
    103109        rhos=w[5] 
    104110        delrho=rho-rhos 
    105         bkg=w[6] 
     111        bkg=w[8] 
    106112 
    107113         
     
    180186         
    181187        inten *= scale 
     188         
     189        //Lorentzian term 
     190        Make/O/N=3 tmp_lor 
     191        tmp_lor[0] = w[6] 
     192        tmp_lor[1] = w[7] 
     193        tmp_lor[2] = 0 
     194         
     195        inten+=fLorentz_model(tmp_lor,xx) 
     196         
    182197        inten+=bkg 
    183198         
Note: See TracChangeset for help on using the changeset viewer.