Changeset 994d77f in sasmodels for sasmodels/models/cylinder_clone.c

Timestamp:

Oct 30, 2014 12:33:53 PM (9 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:

ef2861b

Parents:

d087487b

Message:

Convert double to float rather than using real

File:

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

sasmodels/models/cylinder_clone.c

@@ -1 @@
-real form_volume(real radius, real length);
-real Iq(real q, real sld, real solvent_sld, real radius, real length);
-real Iqxy(real qx, real qy, real sld, real solvent_sld, real radius, real length, real theta, real phi);
+double form_volume(double radius, double length);
+double Iq(double q, double sld, double solvent_sld, double radius, double length);
+double Iqxy(double qx, double qy, double sld, double solvent_sld, double radius, double length, double theta, double phi);
 
 
@@ -7 +7 @@
 // besarg = q * R * sin(alpha)
 // siarg = q * L/2 * cos(alpha)
-real _cyl(real twovd, real besarg, real siarg, real alpha);
-real _cyl(real twovd, real besarg, real siarg, real alpha)
+double _cyl(double twovd, double besarg, double siarg, double alpha);
+double _cyl(double twovd, double besarg, double siarg, double alpha)
 {
-    const real bj = (besarg == REAL(0.0) ? REAL(0.5) : J1(besarg)/besarg);
-    const real si = (siarg == REAL(0.0) ? REAL(1.0) : sin(siarg)/siarg);
+    const double bj = (besarg == 0.0 ? 0.5 : J1(besarg)/besarg);
+    const double si = (siarg == 0.0 ? 1.0 : sin(siarg)/siarg);
     return twovd*si*bj;
 }
 
-real form_volume(real radius, real length)
+double form_volume(double radius, double length)
 {
     return M_PI*radius*radius*length;
 }
-real Iq(real q,
-    real sldCyl,
-    real sldSolv,
-    real radius,
-    real length)
+double Iq(double q,
+    double sldCyl,
+    double sldSolv,
+    double radius,
+    double length)
 {
-    const real qr = q*radius;
-    const real qh = q*REAL(0.5)*length;
-    const real twovd = REAL(2.0)*(sldCyl-sldSolv)*form_volume(radius, length);
-    real total = REAL(0.0);
-    // real lower=0, upper=M_PI_2;
+    const double qr = q*radius;
+    const double qh = q*0.5*length;
+    const double twovd = 2.0*(sldCyl-sldSolv)*form_volume(radius, length);
+    double total = 0.0;
+    // double lower=0, upper=M_PI_2;
     for (int i=0; i<76 ;i++) {
         // translate a point in [-1,1] to a point in [lower,upper]
-        //const real alpha = ( Gauss76Z[i]*(upper-lower) + upper + lower )/2.0;
-        const real alpha = REAL(0.5)*(Gauss76Z[i]*M_PI_2 + M_PI_2);
-        real sn, cn;
+        //const double alpha = ( Gauss76Z[i]*(upper-lower) + upper + lower )/2.0;
+        const double alpha = 0.5*(Gauss76Z[i]*M_PI_2 + M_PI_2);
+        double sn, cn;
         SINCOS(alpha, sn, cn);
-        const real fq = _cyl(twovd, qr*sn, qh*cn, alpha);
+        const double fq = _cyl(twovd, qr*sn, qh*cn, alpha);
         total += Gauss76Wt[i] * fq * fq * sn;
     }
     // translate dx in [-1,1] to dx in [lower,upper]
-    //const real form = (upper-lower)/2.0*total;
-    return REAL(1.0e8) * total * M_PI_4;
+    //const double form = (upper-lower)/2.0*total;
+    return 1.0e8 * total * M_PI_4;
 }
 
-real Iqxy(real qx, real qy,
-    real sldCyl,
-    real sldSolv,
-    real radius,
-    real length,
-    real cyl_theta,
-    real cyl_phi)
+double Iqxy(double qx, double qy,
+    double sldCyl,
+    double sldSolv,
+    double radius,
+    double length,
+    double cyl_theta,
+    double cyl_phi)
 {
-    real sn, cn; // slots to hold sincos function output
+    double sn, cn; // slots to hold sincos function output
 
     // Compute angle alpha between q and the cylinder axis
@@ -58 +58 @@
     // # The following correction factor exists in sasview, but it can't be
     // # right, so we are leaving it out for now.
-    const real spherical_integration = fabs(cn)*M_PI_2;
-    const real q = sqrt(qx*qx+qy*qy);
-    const real cos_val = cn*cos(cyl_phi*M_PI_180)*(qx/q) + sn*(qy/q);
-    const real alpha = acos(cos_val);
+    const double spherical_integration = fabs(cn)*M_PI_2;
+    const double q = sqrt(qx*qx+qy*qy);
+    const double cos_val = cn*cos(cyl_phi*M_PI_180)*(qx/q) + sn*(qy/q);
+    const double alpha = acos(cos_val);
 
-    const real qr = q*radius;
-    const real qh = q*REAL(0.5)*length;
-    const real twovd = REAL(2.0)*(sldCyl-sldSolv)*form_volume(radius, length);
+    const double qr = q*radius;
+    const double qh = q*0.5*length;
+    const double twovd = 2.0*(sldCyl-sldSolv)*form_volume(radius, length);
     SINCOS(alpha, sn, cn);
-    const real fq = _cyl(twovd, qr*sn, qh*cn, alpha);
-    return REAL(1.0e8) * fq * fq * spherical_integration;
+    const double fq = _cyl(twovd, qr*sn, qh*cn, alpha);
+    return 1.0e8 * fq * fq * spherical_integration;
 }