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

Timestamp:

Oct 1, 2016 12:42:06 AM (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/triaxial_ellipsoid.c (modified) (5 diffs)

sasmodels/models/triaxial_ellipsoid.c

@@ -1 @@
-double form_volume(double req_minor, double req_major, double rpolar);
-double Iq(double q, double sld, double solvent_sld,
-    double req_minor, double req_major, double rpolar);
-double Iqxy(double qx, double qy, double sld, double solvent_sld,
-    double req_minor, double req_major, double rpolar, double theta, double phi, double psi);
+double form_volume(double radius_equat_minor, double radius_equat_major, double radius_polar);
+double Iq(double q, double sld, double sld_solvent,
+    double radius_equat_minor, double radius_equat_major, double radius_polar);
+double Iqxy(double qx, double qy, double sld, double sld_solvent,
+    double radius_equat_minor, double radius_equat_major, double radius_polar, double theta, double phi, double psi);
 
-//#define INVALID(v) (v.req_minor > v.req_major || v.req_major > v.rpolar)
+//#define INVALID(v) (v.radius_equat_minor > v.radius_equat_major || v.radius_equat_major > v.radius_polar)
 
 
-double form_volume(double req_minor, double req_major, double rpolar)
+double form_volume(double radius_equat_minor, double radius_equat_major, double radius_polar)
 {
-    return 1.333333333333333*M_PI*req_minor*req_major*rpolar;
+    return 1.333333333333333*M_PI*radius_equat_minor*radius_equat_major*radius_polar;
 }
 
 double Iq(double q,
     double sld,
-    double solvent_sld,
-    double req_minor,
-    double req_major,
-    double rpolar)
+    double sld_solvent,
+    double radius_equat_minor,
+    double radius_equat_major,
+    double radius_polar)
 {
     double sn, cn;
@@ -29 +29 @@
         const double x = 0.5*(Gauss76Z[i] + 1.0);
         SINCOS(M_PI_2*x, sn, cn);
-        const double acosx2 = req_minor*req_minor*cn*cn;
-        const double bsinx2 = req_major*req_major*sn*sn;
-        const double c2 = rpolar*rpolar;
+        const double acosx2 = radius_equat_minor*radius_equat_minor*cn*cn;
+        const double bsinx2 = radius_equat_major*radius_equat_major*sn*sn;
+        const double c2 = radius_polar*radius_polar;
 
         double inner = 0.0;
@@ -44 +44 @@
     // translate dx in [-1,1] to dx in [lower,upper]
     const double fqsq = outer*zm;
-    const double s = (sld - solvent_sld) * form_volume(req_minor, req_major, rpolar);
+    const double s = (sld - sld_solvent) * form_volume(radius_equat_minor, radius_equat_major, radius_polar);
     return 1.0e-4 * s * s * fqsq;
 }
@@ -50 +50 @@
 double Iqxy(double qx, double qy,
     double sld,
-    double solvent_sld,
-    double req_minor,
-    double req_major,
-    double rpolar,
+    double sld_solvent,
+    double radius_equat_minor,
+    double radius_equat_major,
+    double radius_polar,
     double theta,
     double phi,
@@ -71 +71 @@
     const double cnu = (-cphi*spsi*stheta + sphi*cpsi)*qxhat + spsi*ctheta*qyhat;
     const double cmu = (-stheta*cpsi*cphi - spsi*sphi)*qxhat + ctheta*cpsi*qyhat;
-    const double t = q*sqrt(req_minor*req_minor*cnu*cnu
-                          + req_major*req_major*cmu*cmu
-                          + rpolar*rpolar*calpha*calpha);
+    const double t = q*sqrt(radius_equat_minor*radius_equat_minor*cnu*cnu
+                          + radius_equat_major*radius_equat_major*cmu*cmu
+                          + radius_polar*radius_polar*calpha*calpha);
     const double fq = sph_j1c(t);
-    const double s = (sld - solvent_sld) * form_volume(req_minor, req_major, rpolar);
+    const double s = (sld - sld_solvent) * form_volume(radius_equat_minor, radius_equat_major, radius_polar);
 
     return 1.0e-4 * square(s * fq);