Changeset 0d6e865 in sasmodels for sasmodels/models/barbell.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/barbell.c (modified) (1 diff)

sasmodels/models/barbell.c

@@ -95 +95 @@
     // Compute angle alpha between q and the cylinder axis
     double sn, cn; // slots to hold sincos function output
-    SINCOS(theta*M_PI_180, sn, cn);
-    const double q = sqrt(qx*qx+qy*qy);
-    const double cos_val = cn*cos(phi*M_PI_180)*(qx/q) + sn*(qy/q);
+    SINCOS(phi*M_PI_180, sn, cn);
+    const double q = sqrt(qx*qx + qy*qy);
+    const double cos_val = (q==0. ? 1.0 : (cn*qx + sn*qy)*sin(theta*M_PI_180)/q);
     const double alpha = acos(cos_val); // rod angle relative to q