Changeset 5bddd89 in sasmodels for sasmodels/models/core_shell_ellipsoid.c

Timestamp:

Oct 14, 2016 2:05:39 PM (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:

9068f4c

Parents:

0b717c5

Message:

use ORIENT macro for remaining symmetric models

File:

• sasmodels/models/core_shell_ellipsoid.c (modified) (7 diffs)

sasmodels/models/core_shell_ellipsoid.c

@@ -32 +32 @@
     const double equat_shell = radius_equat_core + thick_shell;
     const double polar_shell = radius_equat_core*x_core + thick_shell*x_polar_shell;
-    double vol = 4.0*M_PI/3.0*equat_shell*equat_shell*polar_shell;
+    double vol = M_4PI_3*equat_shell*equat_shell*polar_shell;
     return vol;
 }
@@ -60 +60 @@
 
     for(int i=0;i<N_POINTS_76;i++) {
-        double zi = ( Gauss76Z[i]*(uplim-lolim) + uplim + lolim )/2.0;
+        double zi = 0.5*( Gauss76Z[i]*(uplim-lolim) + uplim + lolim );
         double yyy = Gauss76Wt[i] * gfn4(zi,
                                   radius_equat_core,
@@ -72 +72 @@
     }
 
-    double answer = (uplim-lolim)/2.0*summ;
+    double answer = 0.5*(uplim-lolim)*summ;
     //convert to [cm-1]
     answer *= 1.0e-4;
@@ -80 +80 @@
 
 static double
-core_shell_ellipsoid_xt_kernel_2d(double q, double q_x, double q_y,
+core_shell_ellipsoid_xt_kernel_2d(double qx, double qy,
           double radius_equat_core,
           double x_core,
@@ -91 +91 @@
           double phi)
 {
-    //convert angle degree to radian
-    theta = theta * M_PI_180;
-    phi = phi * M_PI_180;
-
-    // ellipsoid orientation, the axis of the rotation is consistent with the ploar axis.
-    const double cyl_x = sin(theta) * cos(phi);
-    const double cyl_y = sin(theta) * sin(phi);
+    double q, sin_alpha, cos_alpha;
+    ORIENT_SYMMETRIC(qx, qy, theta, phi, q, sin_alpha, cos_alpha);
 
     const double sldcs = core_sld - shell_sld;
     const double sldss = shell_sld- solvent_sld;
-
-    // Compute the angle btw vector q and the
-    // axis of the cylinder
-    const double cos_val = cyl_x*q_x + cyl_y*q_y;
 
     const double polar_core = radius_equat_core*x_core;
@@ -112 +103 @@
     // Call the IGOR library function to get the kernel:
     // MUST use gfn4 not gf2 because of the def of params.
-    double answer = gfn4(cos_val,
+    double answer = gfn4(cos_alpha,
                   radius_equat_core,
                   polar_core,
@@ -160 +151 @@
           double phi)
 {
-    double q;
-    q = sqrt(qx*qx+qy*qy);
-    double intensity = core_shell_ellipsoid_xt_kernel_2d(q, qx/q, qy/q,
+    double intensity = core_shell_ellipsoid_xt_kernel_2d(qx, qy,
                        radius_equat_core,
                        x_core,