Changeset f4cf580 in sasmodels for sasmodels/models/sphere.py

Timestamp:

Sep 2, 2014 1:15:40 PM (10 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:

87985ca

Parents:

5d4777d

Message:

resolve remaining differences between sasview and sasmodels

File:

• sasmodels/models/sphere.py (modified) (1 diff)

sasmodels/models/sphere.py

@@ -30 +30 @@
 
 Iq = """
+    const real qr = q*radius;
     real sn, cn;
-    const real qr = q*radius;
     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 f = bes * (sld - solvent_sld) * form_volume(radius);
-    return REAL(1.0e-4)*f*f;
+    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;
     """