Changeset ad90df9 in sasmodels for sasmodels/models/sphere.py

Timestamp:

Mar 1, 2016 8:23:21 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

e6f1410, 7d4b2ae

Parents:

50e1e40

Message:

refactor sphere/fcc/bcc/sc_crystal to use common code

File:

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

sasmodels/models/sphere.py

@@ -78 +78 @@
              ]
 
-source = ["lib/sph_j1c.c"]
+source = ["lib/sph_j1c.c", "lib/sphere_form.c"]
 
 # No volume normalization despite having a volume parameter
 # This should perhaps be volume normalized?
 form_volume = """
-    return M_4PI_3*cube(radius);
+    return sphere_volume(radius);
     """
 
 Iq = """
-    const double qr = q*radius;
-    const double bes = sph_j1c(qr);
-    const double fq = bes * (sld - solvent_sld) * form_volume(radius);
-    return 1.0e-4*fq*fq;
+    return sphere_form(q, radius, sld, solvent_sld);
     """