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

sasmodels/models/lib/core_shell.c

@@ -7 +7 @@
 ********************************************************************/
 static
-double core_shell_kernel(double q,
+double core_shell_fq(double q,
                          double radius,
                          double thickness,
                          double core_sld,
                          double shell_sld,
-                         double solvent_sld) {
+                         double solvent_sld)
+{
     // Core first, then add in shell
     const double core_qr = q * radius;
@@ -26 +27 @@
     const double shell_volume = M_4PI_3 * cube(radius + thickness);
     f += shell_volume * shell_bes * shell_contrast;
-    return f * f * 1.0e-4;
+    return f;
 }
+
+// Deprecated function: use core_shell_fq instead.
+static
+double core_shell_kernel(double q,
+                         double radius,
+                         double thickness,
+                         double core_sld,
+                         double shell_sld,
+                         double solvent_sld)
+{
+    const double fq = core_shell_fq(q, radius, thickness, core_sld, shell_sld, solvent_sld);
+    return 1.0e-4 * fq*fq;
+}