Changeset 3a48772 in sasmodels for sasmodels/models/lib

Timestamp:

Oct 14, 2016 3:23:40 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

a5b6997

Parents:

b716cc6

Message:

use predefined constants for fractions of pi

Location:

sasmodels/models/lib

Files:

• core_shell.c (modified) (2 diffs)
• gfn.c (modified) (3 diffs)

sasmodels/models/lib/core_shell.c

@@ -17 +17 @@
     const double core_contrast = core_sld - shell_sld;
     const double core_bes = sph_j1c(core_qr);
-    const double core_volume = 4.0 * M_PI / 3.0 * radius * radius * radius;
+    const double core_volume = M_4PI_3 * cube(radius);
     double f = core_volume * core_bes * core_contrast;
 
@@ -24 +24 @@
     const double shell_contrast = shell_sld - solvent_sld;
     const double shell_bes = sph_j1c(shell_qr);
-    const double shell_volume = 4.0 * M_PI / 3.0 * pow((radius + thickness), 3);
+    const double shell_volume = M_4PI_3 * cube(radius + thickness);
     f += shell_volume * shell_bes * shell_contrast;
     return f * f * 1.0e-4;

sasmodels/models/lib/gfn.c

@@ -12 +12 @@
 {
     // local variables
-    const double pi43=4.0/3.0*M_PI;
     const double aa = crmaj;
     const double bb = crmin;
@@ -20 +19 @@
     //const double siq = (uq == 0.0 ? 1.0 : 3.0*(sin(uq)/uq/uq - cos(uq)/uq)/uq);
     const double siq = sph_j1c(uq);
-    const double vc = pi43*aa*aa*bb;
+    const double vc = M_4PI_3*aa*aa*bb;
     const double gfnc = siq*vc*delpc;
 
     const double ut2 = (trmin*trmin*xx*xx + trmaj*trmaj*(1.0-xx*xx));
     const double ut= sqrt(ut2)*qq;
-    const double vt = pi43*trmaj*trmaj*trmin;
+    const double vt = M_4PI_3*trmaj*trmaj*trmin;
     //const double sit = (ut == 0.0 ? 1.0 : 3.0*(sin(ut)/ut/ut - cos(ut)/ut)/ut);
     const double sit = sph_j1c(ut);
@@ -33 +32 @@
     const double result = tgfn*tgfn;
 
-    return (result);
+    return result;
 }