Changeset ad90df9 in sasmodels for sasmodels/models/lib/sphere_form.c

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/lib/sphere_form.c (modified) (1 diff)

sasmodels/models/lib/sphere_form.c

@@ -1 @@
-double
+inline double
+sphere_volume(double radius)
+{
+    return M_4PI_3*cube(radius);
+}
+
+inline double
 sphere_form(double q, double radius, double sld, double solvent_sld)
 {
-    const double qr = q*radius;
-    double sn, cn;
-    SINCOS(qr, sn, cn);
-    const double vol = 1.333333333333333*M_PI*radius*radius*radius;
-    const double bes = (qr == 0.0 ? 1.0 : 3.0*(sn-qr*cn)/(qr*qr*qr));
-    const double fq = bes * (sld - solvent_sld)*vol;
-    return 1.0e-4*fq*fq;
+    const double fq = sphere_volume(radius) * sph_j1c(q*radius);
+    const double contrast = (sld - solvent_sld);
+    return 1.0e-4*square(contrast * fq);
 }
-
-// Do we even need the paracrystal form?
-// The only difference is the return value at r=0
-double
-sphere_form_paracrystal(double q, double radius, double delrho)
-{
-    const double qr = q*radius;
-    const double vol = 1.333333333333333*M_PI*radius*radius*radius;
-        const double f = vol*delrho*delrho*1.0e-4;
-    double sn, cn;
-    SINCOS(qr, sn, cn);
-        const double bes = (qr == 0.0 ? f : 3.0*(sn-qr*cn)/(qr*qr*qr));
-        const double fq = bes*delrho*vol;
-        return fq*fq * 1.0e-4;
-}