Changeset a807206 in sasmodels for sasmodels/models/ellipsoid.c

Timestamp:

Sep 30, 2016 10:42:06 PM (8 years ago)

Author:

butler

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:

caddb14, 5031ca3

Parents:

2222134

Message:

updating more parameter names addressing #649

File:

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

sasmodels/models/ellipsoid.c

@@ -1 @@
-double form_volume(double rpolar, double requatorial);
-double Iq(double q, double sld, double solvent_sld, double rpolar, double requatorial);
-double Iqxy(double qx, double qy, double sld, double solvent_sld,
-    double rpolar, double requatorial, double theta, double phi);
+double form_volume(double radius_polar, double radius_equatorial);
+double Iq(double q, double sld, double sld_solvent, double radius_polar, double radius_equatorial);
+double Iqxy(double qx, double qy, double sld, double sld_solvent,
+    double radius_polar, double radius_equatorial, double theta, double phi);
 
-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 _ellipsoid_kernel(double q, double radius_polar, double radius_equatorial, double sin_alpha);
+double _ellipsoid_kernel(double q, double radius_polar, double radius_equatorial, double sin_alpha)
 {
-    double ratio = rpolar/requatorial;
-    const double u = q*requatorial*sqrt(1.0
+    double ratio = radius_polar/radius_equatorial;
+    const double u = q*radius_equatorial*sqrt(1.0
                    + sin_alpha*sin_alpha*(ratio*ratio - 1.0));
     const double f = sph_j1c(u);
@@ -15 +15 @@
 }
 
-double form_volume(double rpolar, double requatorial)
+double form_volume(double radius_polar, double radius_equatorial)
 {
-    return M_4PI_3*rpolar*requatorial*requatorial;
+    return M_4PI_3*radius_polar*radius_equatorial*radius_equatorial;
 }
 
 double Iq(double q,
     double sld,
-    double solvent_sld,
-    double rpolar,
-    double requatorial)
+    double sld_solvent,
+    double radius_polar,
+    double radius_equatorial)
 {
     // translate a point in [-1,1] to a point in [0, 1]
@@ -33 +33 @@
         //const double sin_alpha = (Gauss76Z[i]*(upper-lower) + upper + lower)/2;
         const double sin_alpha = Gauss76Z[i]*zm + zb;
-        total += Gauss76Wt[i] * _ellipsoid_kernel(q, rpolar, requatorial, sin_alpha);
+        total += Gauss76Wt[i] * _ellipsoid_kernel(q, radius_polar, radius_equatorial, sin_alpha);
     }
     // translate dx in [-1,1] to dx in [lower,upper]
     const double form = total*zm;
-    const double s = (sld - solvent_sld) * form_volume(rpolar, requatorial);
+    const double s = (sld - sld_solvent) * form_volume(radius_polar, radius_equatorial);
     return 1.0e-4 * s * s * form;
 }
@@ -43 +43 @@
 double Iqxy(double qx, double qy,
     double sld,
-    double solvent_sld,
-    double rpolar,
-    double requatorial,
+    double sld_solvent,
+    double radius_polar,
+    double radius_equatorial,
     double theta,
     double phi)
@@ -55 +55 @@
     // 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);
-    const double s = (sld - solvent_sld) * form_volume(rpolar, requatorial);
+    const double form = _ellipsoid_kernel(q, radius_polar, radius_equatorial, cos_alpha);
+    const double s = (sld - sld_solvent) * form_volume(radius_polar, radius_equatorial);
 
     return 1.0e-4 * form * s * s;