Changeset 994d77f in sasmodels for sasmodels/models/sphere.py

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/sphere.py (modified) (2 diffs)

sasmodels/models/sphere.py

@@ -86 +86 @@
 # This should perhaps be volume normalized?
 form_volume = """
-    return REAL(1.333333333333333)*M_PI*radius*radius*radius;
+    return 1.333333333333333*M_PI*radius*radius*radius;
     """
 
 Iq = """
-    const real qr = q*radius;
-    real sn, cn;
+    const double qr = q*radius;
+    double sn, cn;
     SINCOS(qr, sn, cn);
-    const real bes = qr==REAL(0.0) ? REAL(1.0) : REAL(3.0)*(sn-qr*cn)/(qr*qr*qr);
-    const real fq = bes * (sld - solvent_sld) * form_volume(radius);
-    return REAL(1.0e-4)*fq*fq;
+    const double bes = qr==0.0 ? 1.0 : 3.0*(sn-qr*cn)/(qr*qr*qr);
+    const double fq = bes * (sld - solvent_sld) * form_volume(radius);
+    return 1.0e-4*fq*fq;
     """
 
@@ -101 +101 @@
 Iqxy = """
     // never called since no orientation or magnetic parameters.
-    return REAL(-1.0);
+    //return -1.0;
+    return Iq(sqrt(qx*qx + qy*qy), sld, solvent_sld, radius);
     """