Changeset ad90df9 in sasmodels for sasmodels/models/sc_crystal.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/sc_crystal.c (modified) (3 diffs)

sasmodels/models/sc_crystal.c

@@ -20 +20 @@
 double form_volume(double radius)
 {
-    return 1.333333333333333*M_PI*radius*radius*radius;
+    return sphere_volume(radius);
 }
 
@@ -95 +95 @@
 
         //Volume fraction calculated from lattice symmetry and sphere radius
-        const double latticeScale = (4.0/3.0)*M_PI*(radius*radius*radius)/pow(dnn,3);
-
-        //answer *= sphere_form_paracrystal(q, radius,contrast)*latticeScale;
+        // NB: 4/3 pi r^3 / dnn^3 = 4/3 pi(r/dnn)^3
+        const double latticeScale = sphere_volume(radius/dnn);
+
         answer *= sphere_form(q, radius, sphere_sld, solvent_sld)*latticeScale;
 
@@ -180 +180 @@
 
     //consider scales
-    const double latticeScale = (4.0/3.0)*M_PI*(radius*radius*radius)/pow(dnn,3.0);
+    const double latticeScale = sphere_volume(radius/dnn);
     answer *= latticeScale;