Changeset 356
 Timestamp:
 May 8, 2008 3:39:29 PM (14 years ago)
 Location:
 sans/XOP_Dev/SANSAnalysis/lib
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

sans/XOP_Dev/SANSAnalysis/lib/libCylinder.c
r235 r356 925 925 926 926 /* 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 qdependent resolution!! 929 930 */ 927  now the proper resolution effects are used  the "default" resolution is turned off (= 0) and the 928 model is smeared just like any other function 929 */ 931 930 double 932 931 LamellarPS(double dp[], double q) … … 940 939 941 940 Euler = 0.5772156649; // Euler's constant 942 dQDefault = 0.0025; //[=] 1/A, qresolution, default value 941 // dQDefault = 0.0025; //[=] 1/A, qresolution, default value 942 dQDefault = 0.0; 943 943 dQ = dQDefault; 944 944 … … 996 996 997 997 /* 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 qdependent resolution!! 1000 1001 */ 998  now the proper resolution effects are used  the "default" resolution is turned off (= 0) and the 999 model is smeared just like any other function 1000 */ 1002 1001 double 1003 1002 LamellarPS_HG(double dp[], double q) … … 1010 1009 1011 1010 Euler = 0.5772156649; // Euler's constant 1012 dQDefault = 0.0025; //[=] 1/A, qresolution, default value 1011 // dQDefault = 0.0025; //[=] 1/A, qresolution, default value 1012 dQDefault = 0.0; 1013 1013 dQ = dQDefault; 1014 1014 
sans/XOP_Dev/SANSAnalysis/lib/libStructureFactor.c
r97 r356 663 663 b = hcyl/2.0; 664 664 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); 666 666 ddd = 3.0*t1*t2; 667 667 diam = pow(ddd,(1.0/3.0));
Note: See TracChangeset
for help on using the changeset viewer.