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

sasmodels/models/core_shell_sphere.c

@@ -1 @@
-double form_volume(double radius, double thickness);
-double Iq(double q, double radius, double thickness, double core_sld, double shell_sld, double solvent_sld);
+static double
+form_volume(double radius, double thickness)
+{
+    return M_4PI_3 * cube(radius + thickness);
+}
 
-double Iq(double q, double radius, double thickness, double core_sld, double shell_sld, double solvent_sld) {
-
-
-    double intensity = core_shell_kernel(q,
+static void
+Fq(double q, double *F1, double *F2, double radius,
+   double thickness, double core_sld, double shell_sld, double solvent_sld) {
+    double form = core_shell_fq(q,
                               radius,
                               thickness,
@@ -11 +14 @@
                               shell_sld,
                               solvent_sld);
-    return intensity;
+    *F1 = 1.0e-2*form;
+    *F2 = 1.0e-4*form*form;
 }
-
-double form_volume(double radius, double thickness)
-{
-    return M_4PI_3 * cube(radius + thickness);
-}