Changeset 71b751d in sasmodels for sasmodels/models/core_shell_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/core_shell_cylinder.c (modified) (3 diffs)

sasmodels/models/core_shell_cylinder.c

@@ -13 +13 @@
 }
 
-static double
-Iq(double q,
+static void
+Fq(double q,
+    double *F1,
+    double *F2,
     double core_sld,
     double shell_sld,
@@ -29 +31 @@
     const double shell_h = (0.5*length + thickness);
     const double shell_vd = form_volume(radius,thickness,length) * (shell_sld-solvent_sld);
-    double total = 0.0;
+    double total_F1 = 0.0;
+    double total_F2 = 0.0;
     for (int i=0; i<GAUSS_N ;i++) {
         // translate a point in [-1,1] to a point in [0, pi/2]
@@ -40 +43 @@
         const double fq = _cyl(core_vd, core_r*qab, core_h*qc)
             + _cyl(shell_vd, shell_r*qab, shell_h*qc);
-        total += GAUSS_W[i] * fq * fq * sin_theta;
+        total_F1 += GAUSS_W[i] * fq * sin_theta;
+        total_F2 += GAUSS_W[i] * fq * fq * sin_theta;
     }
     // translate dx in [-1,1] to dx in [lower,upper]
     //const double form = (upper-lower)/2.0*total;
-    return 1.0e-4 * total * M_PI_4;
+    *F1 = 1.0e-2 * total_F1 * M_PI_4;
+    *F2 = 1.0e-4 * total_F2 * M_PI_4;
 }
-
 
 static double