Changeset 71b751d in sasmodels for sasmodels/models/cylinder.c

Timestamp:

Aug 14, 2018 12:09:34 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

86aa992

Parents:

2f8cbb9

Message:

update remaining form factors to use Fq interface

File:

• sasmodels/models/cylinder.c (modified) (4 diffs)

sasmodels/models/cylinder.c

@@ -8 +8 @@
 
 static double
-fq(double qab, double qc, double radius, double length)
+_fq(double qab, double qc, double radius, double length)
 {
     return sas_2J1x_x(qab*radius) * sas_sinx_x(qc*0.5*length);
 }
 
-static double
-orient_avg_1D(double q, double radius, double length)
+static void
+Fq(double q,
+    double *F1,
+    double *F2,
+    double sld,
+    double solvent_sld,
+    double radius,
+    double length)
 {
     // translate a point in [-1,1] to a point in [0, pi/2]
@@ -20 +26 @@
     const double zb = M_PI_4;
 
-    double total = 0.0;
+    double total_F1 = 0.0;
+    double total_F2 = 0.0;
     for (int i=0; i<GAUSS_N ;i++) {
         const double theta = GAUSS_Z[i]*zm + zb;
@@ -26 +33 @@
         // theta (theta,phi) the projection of the cylinder on the detector plane
         SINCOS(theta , sin_theta, cos_theta);
-        const double form = fq(q*sin_theta, q*cos_theta, radius, length);
-        total += GAUSS_W[i] * form * form * sin_theta;
+        const double form = _fq(q*sin_theta, q*cos_theta, radius, length);
+        total_F1 += GAUSS_W[i] * form * sin_theta;
+        total_F2 += GAUSS_W[i] * form * form * sin_theta;
     }
     // translate dx in [-1,1] to dx in [lower,upper]
-    return total*zm;
+    total_F1 *= zm;
+    total_F2 *= zm;
+    const double s = (sld - solvent_sld) * form_volume(radius, length);
+    *F1 = 1e-2 * s * total_F1;
+    *F2 = 1e-4 * s * s * total_F2;
 }
 
-static double
-Iq(double q,
-    double sld,
-    double solvent_sld,
-    double radius,
-    double length)
-{
-    const double s = (sld - solvent_sld) * form_volume(radius, length);
-    return 1.0e-4 * s * s * orient_avg_1D(q, radius, length);
-}
+
 
 static double
@@ -51 +54 @@
     double length)
 {
+    const double form = _fq(qab, qc, radius, length);
     const double s = (sld-solvent_sld) * form_volume(radius, length);
-    const double form = fq(qab, qc, radius, length);
     return 1.0e-4 * square(s * form);
 }
+