Changeset 5bddd89 in sasmodels for sasmodels/models/ellipsoid.c

Timestamp:

Oct 14, 2016 4:05:39 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:

9068f4c

Parents:

0b717c5

Message:

use ORIENT macro for remaining symmetric models

File:

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

sasmodels/models/ellipsoid.c

@@ -49 +49 @@
     double phi)
 {
-    double sn, cn;
-
-    const double q = sqrt(qx*qx + qy*qy);
-    SINCOS(phi*M_PI_180, sn, cn);
-    const double cos_alpha = (q==0. ? 1.0 : (cn*qx + sn*qy)*sin(theta*M_PI_180)/q);
-    const double alpha = acos(cos_alpha);
-    SINCOS(alpha, sn, cn);
-    const double form = _ellipsoid_kernel(q, radius_polar, radius_equatorial, sn);
+    double q, sin_alpha, cos_alpha;
+    ORIENT_SYMMETRIC(qx, qy, theta, phi, q, sin_alpha, cos_alpha);
+    const double form = _ellipsoid_kernel(q, radius_polar, radius_equatorial, sin_alpha);
     const double s = (sld - sld_solvent) * form_volume(radius_polar, radius_equatorial);