Changeset 3a48772 in sasmodels for sasmodels/models/vesicle.c

Timestamp:

Oct 14, 2016 5: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

File:

• sasmodels/models/vesicle.c (modified) (2 diffs)

sasmodels/models/vesicle.c

@@ -8 +8 @@
 {
     //note that for the vesicle model, the volume is ONLY the shell volume
-    double volume;
-    volume =4.*M_PI*(radius+thickness)*(radius+thickness)*(radius+thickness)/3;
-    volume -=4.*M_PI*radius*radius*radius/3.;
-    return volume;
+    return M_4PI_3*(cube(radius+thickness) - cube(radius));
 }
 
@@ -32 +29 @@
     // core first, then add in shell
     contrast = sld_solvent-sld;
-    vol = 4.0*M_PI/3.0*radius*radius*radius;
-    f = vol*sph_j1c(q*radius)*contrast;
+    vol = M_4PI_3*cube(radius);
+    f = vol * sph_j1c(q*radius) * contrast;
  
     //now the shell. No volume normalization as this is done by the caller
     contrast = sld-sld_solvent;
-    vol = 4.0*M_PI/3.0*(radius+thickness)*(radius+thickness)*(radius+thickness);
-    f += vol*sph_j1c(q*(radius+thickness))*contrast;
+    vol = M_4PI_3*cube(radius+thickness);
+    f += vol * sph_j1c(q*(radius+thickness)) * contrast;
 
     //rescale to [cm-1]. 
-    f2 = volfraction*f*f*1.0e-4;
+    f2 = volfraction * f*f*1.0e-4;
     
-    return(f2);
+    return f2;
 }