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

Timestamp:

Oct 30, 2014 10:33:53 AM (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/lamellar.py (modified) (2 diffs)

sasmodels/models/lamellar.py

@@ -77 +77 @@
 # This should perhaps be volume normalized?
 form_volume = """
-    return REAL(1.0);
+    return 1.0;
     """
 
 Iq = """
-    const real sub = sld - solvent_sld;
-    const real qsq = q*q;
-    return REAL(4.0e-4)*M_PI*sub*sub/qsq * (REAL(1.0)-cos(q*thickness))
+    const double sub = sld - solvent_sld;
+    const double qsq = q*q;
+    return 4.0e-4*M_PI*sub*sub/qsq * (1.0-cos(q*thickness))
         / (thickness*qsq);
     """
@@ -89 +89 @@
 Iqxy = """
     // never called since no orientation or magnetic parameters.
-    return REAL(-1.0);
+    return -1.0;
     """