Changeset 2b9e63f in sasmodels for sasmodels/models/cylinder.c

Timestamp:

Oct 19, 2016 7:36:31 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:

217590b

Parents:

b829b16 (diff), 9cc7fca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket776

File:

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

sasmodels/models/cylinder.c

@@ -18 +18 @@
     const double qr = q*radius;
     const double qh = q*0.5*length; 
-    return  sas_J1c(qr*sn) * sinc(qh*cn) ;
+    return sas_J1c(qr*sn) * sinc(qh*cn);
 }
 
@@ -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);
+    //printf("sn: %g cn: %g\n", 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));
+    const double form = fq(q, sin_alpha, cos_alpha, radius, length);
+    return 1.0e-4 * square(s * form);
 }