Changeset 0d6e865 in sasmodels for sasmodels/models/ellipsoid.c

Timestamp:

Oct 11, 2016 1:42:00 PM (8 years ago)

Author:

dirk

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

1fdb555

Parents:

19e7ca7

Message:

Rewriting selected models in spherical coordinates. This fixes ticket #492 for these models.

File:

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

sasmodels/models/ellipsoid.c

@@ -52 +52 @@
 
     const double q = sqrt(qx*qx + qy*qy);
-    SINCOS(theta*M_PI_180, sn, cn);
-    // TODO: check if this is actually sin(alpha), not cos(alpha)
-    const double cos_alpha = cn*cos(phi*M_PI_180)*(qx/q) + sn*(qy/q);
-    const double form = _ellipsoid_kernel(q, radius_polar, radius_equatorial, cos_alpha);
+    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);
     const double s = (sld - sld_solvent) * form_volume(radius_polar, radius_equatorial);