Changeset 356 for sans/XOP_Dev/SANSAnalysis

Timestamp:

May 8, 2008 3:39:29 PM (15 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:

• libCylinder.c (modified) (4 diffs)
• libStructureFactor.c (modified) (1 diff)

sans/XOP_Dev/SANSAnalysis/lib/libCylinder.c

@@ -925 +925 @@
 
 /*      LamellarPSX  :  calculates the form factor of a lamellar structure - with S(q) effects included
--------
-------- resolution effects ARE included, but only a CONSTANT default value, not the real q-dependent resolution!!
-
-        */
+--- now the proper resolution effects are used - the "default" resolution is turned off (= 0) and the
+model is smeared just like any other function
+*/
 double
 LamellarPS(double dp[], double q)
@@ -940 +939 @@
         
         Euler = 0.5772156649;           // Euler's constant
-        dQDefault = 0.0025;             //[=] 1/A, q-resolution, default value
+//      dQDefault = 0.0025;             //[=] 1/A, q-resolution, default value
+        dQDefault = 0.0;
         dQ = dQDefault;
         
@@ -996 +996 @@
 
 /*      LamellarPS_HGX  :  calculates the form factor of a lamellar structure - with S(q) effects included
--------
-------- resolution effects ARE included, but only a CONSTANT default value, not the real q-dependent resolution!!
-
-        */
+--- now the proper resolution effects are used - the "default" resolution is turned off (= 0) and the
+model is smeared just like any other function
+*/
 double
 LamellarPS_HG(double dp[], double q)
@@ -1010 +1009 @@
         
         Euler = 0.5772156649;           // Euler's constant
-        dQDefault = 0.0025;             //[=] 1/A, q-resolution, default value
+//      dQDefault = 0.0025;             //[=] 1/A, q-resolution, default value
+        dQDefault = 0.0;
         dQ = dQDefault;
         

sans/XOP_Dev/SANSAnalysis/lib/libStructureFactor.c

@@ -663 +663 @@
         b = hcyl/2.0;
         t1 = a*a*2.0*b/2.0;
-        t2 = 1.0 + (b/a)*(1.0+a/b)*(1.0+pi*a/b/2.0);
+        t2 = 1.0 + (b/a)*(1.0+a/b/2.0)*(1.0+pi*a/b/2.0);
         ddd = 3.0*t1*t2;
         diam = pow(ddd,(1.0/3.0));