Changeset 71b751d in sasmodels for sasmodels/models/sphere.py

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/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
 
 c_code = """
 static double form_volume(double radius)
 {
-    return sphere_volume(radius);
+    return M_4PI_3*cube(radius);
 }
 
-static void Fq(double q, double *F1,double *F2, double sld, double solvent_sld, double radius)
+static void Fq(double q, double *f1, double *f2, double sld, double sld_solvent, 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;
+    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;
 }
 """
-
-# TODO: figure this out by inspection
-have_Fq = True
 
 def ER(radius):