Changeset 356 for sans/XOP_Dev


Ignore:
Timestamp:
May 8, 2008 3:39:29 PM (14 years ago)
Author:
srkline
Message:

bug fix in DiamCyl?
Converted Lamellar_PS and Lamellar_PS_HG to be normal, unsmeared functions so that they can be properly smeared with the true instrument resolution.

Location:
sans/XOP_Dev/SANSAnalysis/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sans/XOP_Dev/SANSAnalysis/lib/libCylinder.c

    r235 r356  
    925925 
    926926/*      LamellarPSX  :  calculates the form factor of a lamellar structure - with S(q) effects included 
    927 ------- 
    928 ------- resolution effects ARE included, but only a CONSTANT default value, not the real q-dependent resolution!! 
    929  
    930         */ 
     927--- now the proper resolution effects are used - the "default" resolution is turned off (= 0) and the 
     928model is smeared just like any other function 
     929*/ 
    931930double 
    932931LamellarPS(double dp[], double q) 
     
    940939         
    941940        Euler = 0.5772156649;           // Euler's constant 
    942         dQDefault = 0.0025;             //[=] 1/A, q-resolution, default value 
     941//      dQDefault = 0.0025;             //[=] 1/A, q-resolution, default value 
     942        dQDefault = 0.0; 
    943943        dQ = dQDefault; 
    944944         
     
    996996 
    997997/*      LamellarPS_HGX  :  calculates the form factor of a lamellar structure - with S(q) effects included 
    998 ------- 
    999 ------- resolution effects ARE included, but only a CONSTANT default value, not the real q-dependent resolution!! 
    1000  
    1001         */ 
     998--- now the proper resolution effects are used - the "default" resolution is turned off (= 0) and the 
     999model is smeared just like any other function 
     1000*/ 
    10021001double 
    10031002LamellarPS_HG(double dp[], double q) 
     
    10101009         
    10111010        Euler = 0.5772156649;           // Euler's constant 
    1012         dQDefault = 0.0025;             //[=] 1/A, q-resolution, default value 
     1011//      dQDefault = 0.0025;             //[=] 1/A, q-resolution, default value 
     1012        dQDefault = 0.0; 
    10131013        dQ = dQDefault; 
    10141014         
  • sans/XOP_Dev/SANSAnalysis/lib/libStructureFactor.c

    r97 r356  
    663663        b = hcyl/2.0; 
    664664        t1 = a*a*2.0*b/2.0; 
    665         t2 = 1.0 + (b/a)*(1.0+a/b)*(1.0+pi*a/b/2.0); 
     665        t2 = 1.0 + (b/a)*(1.0+a/b/2.0)*(1.0+pi*a/b/2.0); 
    666666        ddd = 3.0*t1*t2; 
    667667        diam = pow(ddd,(1.0/3.0)); 
Note: See TracChangeset for help on using the changeset viewer.