Changeset 7e923c2 in sasmodels for sasmodels/models/sphere.py

Timestamp:

Aug 7, 2018 10:45:52 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:

1a7ddc9

Parents:

c036ddb (diff), e9b17b18 (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

@@ -69 +69 @@
 source = ["lib/sas_3j1x_x.c", "lib/sphere_form.c"]
 
-# No volume normalization despite having a volume parameter
-# This should perhaps be volume normalized?
-form_volume = """
+c_code = """
+static double form_volume(double radius)
+{
     return sphere_volume(radius);
-    """
+}
 
-Iq = """
-    return sphere_form(q, radius, sld, sld_solvent);
-    """
+static void Fq(double q, double *F1,double *F2, double sld, double solvent_sld, double radius)
+{
+    const double fq = sas_3j1x_x(q*radius);
+    const double contrast = (sld - solvent_sld);
+    const double form = 1e-2 * contrast * sphere_volume(radius) * fq;
+    *F1 = form;
+    *F2 = form*form;
+}
+"""
+
+# TODO: figure this out by inspection
+have_Fq = True
 
 def ER(radius):