Changeset 139c528 in sasmodels

Timestamp:

Feb 26, 2016 12:44:42 PM (9 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:

3a45c2c

Parents:

e4d8726

Message:

slightly optimized capped cylinder

File:

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

sasmodels/models/capped_cylinder.c

@@ -22 +22 @@
     const double upper = 1.0;
     const double lower = h/cap_radius; // integral lower bound
+    const double zm = 0.5*(upper-lower);
+    const double zb = 0.5*(upper+lower);
     // cos term in integral is:
     //    cos (q (R t - h + L/2) cos(alpha))
@@ -36 +38 @@
         // translate a point in [-1,1] to a point in [lower,upper]
         //const double t = ( Gauss76Z[i]*(upper-lower) + upper + lower )/2.0;
-        const double t = 0.5*(Gauss76Z[i]*(upper-lower)+upper+lower);
+        const double t = Gauss76Z[i]*zm + zb;
         const double radical = 1.0 - t*t;
         const double arg = qrst*sqrt(radical); // cap bessel function arg