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

Timestamp:

Aug 14, 2018 10:09:34 AM (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_ellipsoid.c (modified) (3 diffs)

sasmodels/models/core_shell_ellipsoid.c

@@ -38 +38 @@
 }
 
-static double
-Iq(double q,
+static void
+Fq(double q,
+    double *F1,
+    double *F2,
     double radius_equat_core,
     double x_core,
@@ -58 +60 @@
     const double m = 0.5;
     const double b = 0.5;
-    double total = 0.0;     //initialize intergral
+    double total_F1 = 0.0;     //initialize intergral
+    double total_F2 = 0.0;     //initialize intergral
     for(int i=0;i<GAUSS_N;i++) {
         const double cos_theta = GAUSS_Z[i]*m + b;
@@ -66 +69 @@
             equat_shell, polar_shell,
             sld_core_shell, sld_shell_solvent);
-        total += GAUSS_W[i] * fq * fq;
+        total_F1 += GAUSS_W[i] * fq;
+        total_F2 += GAUSS_W[i] * fq * fq;
     }
-    total *= m;
+    total_F1 *= m;
+    total_F2 *= m;
 
     // convert to [cm-1]
-    return 1.0e-4 * total;
+    *F1 = 1.0e-2 * total_F1;
+    *F2 = 1.0e-4 * total_F2;
 }
+
 
 static double