Changeset 71b751d in sasmodels for sasmodels/models/core_multi_shell.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_multi_shell.c (modified) (2 diffs)

sasmodels/models/core_multi_shell.c

@@ -19 +19 @@
 }
 
-static double
-Iq(double q, double core_sld, double core_radius,
+static void
+Fq(double q, double *F1, double *F2, double core_sld, double core_radius,
    double solvent_sld, double fp_n, double sld[], double thickness[])
 {
@@ -34 +34 @@
   }
   f += M_4PI_3 * cube(r) * (solvent_sld - last_sld) * sas_3j1x_x(q*r);
-  return f * f * 1.0e-4;
+  *F1 = 1e-2 * f;
+  *F2 = 1e-4 * f * f;
 }