Changeset 11ca2ab in sasmodels for sasmodels/models/cylinder.c

Timestamp:

Oct 14, 2016 1:13:55 AM (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:

5abbad7

Parents:

a80e64c

git-author:

Paul Kienzle <pkienzle@…> (10/13/16 23:39:19)

git-committer:

Paul Kienzle <pkienzle@…> (10/14/16 01:13:55)

Message:

add macros for theta-phi-psi orientation

File:

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

sasmodels/models/cylinder.c

@@ -33 +33 @@
         // alpha(theta,phi) the projection of the cylinder on the detector plane
         SINCOS(alpha, sn, cn);
-        total += Gauss76Wt[i] * fq(q, sn, cn, radius, length)* fq(q, sn, cn, radius, length) * sn;
+        total += Gauss76Wt[i] * square(fq(q, sn, cn, radius, length)) * sn;
     }
     // translate dx in [-1,1] to dx in [lower,upper]
@@ -58 +58 @@
     double phi)
 {
-    double sn, cn; // slots to hold sincos function output
-
-    // Compute angle alpha between q and the cylinder axis
-    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);
-
-    SINCOS(alpha, sn, cn);
+    double q, sin_alpha, cos_alpha;
+    ORIENT_SYMMETRIC(qx, qy, theta, phi, q, sin_alpha, cos_alpha);
     const double s = (sld-solvent_sld) * form_volume(radius, length);
-    return 1.0e-4 * square(s * fq(q, sn, cn, radius, length));
+    return 1.0e-4 * square(s * fq(q, sin_alpha, cos_alpha, radius, length));
 }