Ignore:
Timestamp:
Apr 12, 2010 9:26:51 AM (12 years ago)
Author:
srkline
Message:

fixed the P*S combinations in Fuzzy Spheres.

File:
1 edited

Legend:

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

    r679 r682  
    1313// SRK JUL 2009 
    1414// 
    15 // Include lorentzian term for *high* Q component of the scattering. 
     15// Include lorentzian term for *high* Q component of the scattering, calculate here, removing the #include 
    1616// 
    1717// AJJ Feb 2010 
    1818 
    19 #include "Lorentz_model_v40" 
     19//#include "Lorentz_model_v40" 
    2020 
    2121Proc PlotFuzzySpheres(num,qmin,qmax) 
     
    9999         
    100100        Variable scale,rad,pd,sig,rho,rhos,bkg,delrho,sig_surf,lor_sf,lor_len 
    101          
     101        Variable I0, L 
     102        I0 = w[0] 
     103        L = w[1] 
     104 
    102105        //set up the coefficient values 
    103106        scale=w[0] 
     
    109112        rhos=w[5] 
    110113        delrho=rho-rhos 
     114        I0 = w[6]               //for the Lorentzian 
     115        L = w[7] 
    111116        bkg=w[8] 
    112117 
     
    187192        inten *= scale 
    188193         
    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) 
     194        //Lorentzian term        
     195        inten += I0/(1 + (xx*L)^2) 
     196         
    196197         
    197198        inten+=bkg 
Note: See TracChangeset for help on using the changeset viewer.