Changeset 3f832f9 in sasmodels

Timestamp:

Jan 7, 2016 11:46:36 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

a7f909a

Parents:

3c97ff0

Message:

code cleanup

File:

• sasmodels/models/ellipsoid.c (modified) (3 diffs)

sasmodels/models/ellipsoid.c

@@ -4 +4 @@
     double rpolar, double requatorial, double theta, double phi);
 
-double _ellipsoid_kernel(double q, double rpolar, double requatorial, double cos_alpha);
-double _ellipsoid_kernel(double q, double rpolar, double requatorial, double cos_alpha)
+double _ellipsoid_kernel(double q, double rpolar, double requatorial, double sin_alpha);
+double _ellipsoid_kernel(double q, double rpolar, double requatorial, double sin_alpha)
 {
     double sn, cn;
     double ratio = rpolar/requatorial;
     const double u = q*requatorial*sqrt(1.0
-                   + cos_alpha*cos_alpha*(ratio*ratio - 1.0));
+                   + sin_alpha*sin_alpha*(ratio*ratio - 1.0));
     SINCOS(u, sn, cn);
     //const double f = ( u==0.0 ? 1.0 : 3.0*(sn-u*cn)/(u*u*u) );
@@ -35 +35 @@
     double total = 0.0;
     for (int i=0;i<76;i++) {
-        //const double cos_alpha = (Gauss76Z[i]*(upper-lower) + upper + lower)/2;
-        const double cos_alpha = 0.5*(Gauss76Z[i] + 1.0);
-        total += Gauss76Wt[i] * _ellipsoid_kernel(q, rpolar, requatorial, cos_alpha);
+        //const double sin_alpha = (Gauss76Z[i]*(upper-lower) + upper + lower)/2;
+        const double sin_alpha = 0.5*(Gauss76Z[i] + 1.0);
+        total += Gauss76Wt[i] * _ellipsoid_kernel(q, rpolar, requatorial, sin_alpha);
     }
     //const double form = (upper-lower)/2*total;
@@ -57 +57 @@
     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, rpolar, requatorial, cos_alpha);