Changeset 86aa992 in sasmodels for sasmodels/models/sphere.py

Timestamp:

Aug 14, 2018 12:09:49 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:

6d90684

Parents:

71b751d (diff), d089a00 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into beta_approx

File:

• sasmodels/models/sphere.py (modified) (1 diff)

sasmodels/models/sphere.py

@@ -67 +67 @@
              ]
 
-source = ["lib/sas_3j1x_x.c", "lib/sphere_form.c"]
+source = ["lib/sas_3j1x_x.c"]
+have_Fq = True
 
-# No volume normalization despite having a volume parameter
-# This should perhaps be volume normalized?
-form_volume = """
-    return sphere_volume(radius);
-    """
+c_code = """
+static double form_volume(double radius)
+{
+    return M_4PI_3*cube(radius);
+}
 
-Iq = """
-    return sphere_form(q, radius, sld, sld_solvent);
-    """
+static void Fq(double q, double *f1, double *f2, double sld, double sld_solvent, double radius)
+{
+    const double bes = sas_3j1x_x(q*radius);
+    const double contrast = (sld - sld_solvent);
+    const double form = contrast * form_volume(radius) * bes;
+    *f1 = 1.0e-2*form;
+    *f2 = 1.0e-4*form*form;
+}
+"""
 
 def ER(radius):