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

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

File:

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

sasmodels/models/capped_cylinder.c

@@ -45 +45 @@
     // translate dx in [-1,1] to dx in [lower,upper]
     const double integral = total*zm;
-    const double cap_Fq = 2*M_PI*cube(radius_cap)*integral;
+    const double cap_Fq = 2.0*M_PI*cube(radius_cap)*integral;
     return cap_Fq;
 }
@@ -56 +56 @@
     const double bj = sas_J1c(q*radius*sin_alpha);
     const double si = sinc(q*half_length*cos_alpha);
-    const double cyl_Fq = 2.*M_PI*radius*radius*half_length*bj*si;
+    const double cyl_Fq = 2.0*M_PI*radius*radius*half_length*bj*si;
     const double Aq = cap_Fq + cyl_Fq;
     return Aq;