Changeset 513efc5 in sasmodels for sasmodels/models/ellipsoid.c

Timestamp:

Jan 20, 2016 4:50:50 AM (8 years ago)

Author:

piotr

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:

7ed702f

Parents:

30b4ddf

Message:

Code review issues from PK addressed.

Added Taylor expansion utility function.

File:

• sasmodels/models/ellipsoid.c (modified) (1 diff)

sasmodels/models/ellipsoid.c

@@ -7 +7 @@
 double _ellipsoid_kernel(double q, double rpolar, double requatorial, double sin_alpha)
 {
-    double sn, cn;
     double ratio = rpolar/requatorial;
     const double u = q*requatorial*sqrt(1.0
                    + sin_alpha*sin_alpha*(ratio*ratio - 1.0));
-    SINCOS(u, sn, cn);
-    //const double f = ( u==0.0 ? 1.0 : 3.0*(sn-u*cn)/(u*u*u) );
-    const double usq = u*u;
-    const double f = (u < 1.e-1)
-        ? 1.0 + usq*(-3./30. + usq*(3./840. + usq*(-3./45360.)))// + qrsq*(3./3991680.))))
-        : 3.0*(sn/u - cn)/usq;
+    const double f = J1c(u);
+
     return f*f;
 }