Changeset ad90df9 in sasmodels for sasmodels/models/fcc.c

Timestamp:

Mar 1, 2016 6: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/fcc.c (modified) (3 diffs)

sasmodels/models/fcc.c

@@ -41 +41 @@
 
 double form_volume(double radius){
-    return 1.333333333333333*M_PI*radius*radius*radius;
+    return sphere_volume(radius);
 }
 
@@ -51 +51 @@
         //Volume fraction calculated from lattice symmetry and sphere radius
         const double s1 = dnn*sqrt(2.0);
-        const double latticescale = 4.0*(4.0/3.0)*M_PI*(radius*radius*radius)/(s1*s1*s1);
+        const double latticescale = 4.0*sphere_volume(radius/s1);
 
     const double va = 0.0;
@@ -112 +112 @@
 
   //the occupied volume of the lattice
-  const double latticescale = 2.0*(4.0/3.0)*M_PI*(radius*radius*radius)/(s1*s1*s1);
+  const double latticescale = 2.0*sphere_volume(radius/s1);
   // q vector
   // q_z = 0.0; // for SANS; assuming qz is negligible