Changeset 4962519 in sasmodels for sasmodels/models/teubner_strey.py

Timestamp:

Oct 14, 2016 6:49:58 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

14838a3

Parents:

a5b6997

Message:

use square and cube instead of pow()

File:

• sasmodels/models/teubner_strey.py (modified) (2 diffs)

sasmodels/models/teubner_strey.py

@@ -71 +71 @@
 
 import numpy as np
-from numpy import inf,power,pi
+from numpy import inf, pi
 
 name = "teubner_strey"
@@ -93 +93 @@
     drho2 = (sld-sld_solvent)*(sld-sld_solvent)
     k = 2.0*pi*xi/d
-    a2 = power(1.0+power(k,2.0),2.0)
-    c1 = -2.0*xi*xi*power(k,2.0)+2*xi*xi
-    c2 = power(xi,4.0)
+    a2 = (1.0 + k**2)**2
+    c1 = 2.0*xi**2 * (1.0 - k**2)
+    c2 = xi**4
     prefactor = 8.0*pi*volfraction*(1.0-volfraction)*drho2*c2/xi
     #k2 = (2.0*pi/d)*(2.0*pi/d)