Changeset 2d81cfe in sasmodels for sasmodels/models/ellipsoid.py

Timestamp:

Nov 29, 2017 11:13:23 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

237b800f

Parents:

a839b22

Message:

lint

File:

• sasmodels/models/ellipsoid.py (modified) (4 diffs)

sasmodels/models/ellipsoid.py

@@ -123 +123 @@
 from __future__ import division
 
+import numpy as np
 from numpy import inf, sin, cos, pi
 
@@ -163 +164 @@
 
 def ER(radius_polar, radius_equatorial):
-    import numpy as np
     # see equation (26) in A.Isihara, J.Chem.Phys. 18(1950)1446-1449
     ee = np.empty_like(radius_polar)
@@ -185 +185 @@
 
 def random():
-    import numpy as np
-    V = 10**np.random.uniform(5, 12)
+    volume = 10**np.random.uniform(5, 12)
     radius_polar = 10**np.random.uniform(1.3, 4)
-    radius_equatorial = np.sqrt(V/radius_polar) # ignore 4/3 pi
+    radius_equatorial = np.sqrt(volume/radius_polar) # ignore 4/3 pi
     pars = dict(
         #background=0, sld=0, sld_solvent=1,
@@ -208 +207 @@
 qx = q*cos(pi/6.0)
 qy = q*sin(pi/6.0)
-tests = [[{}, 0.05, 54.8525847025],
-        [{'theta':80., 'phi':10.}, (qx, qy), 1.74134670026],
-        ]
+tests = [
+    [{}, 0.05, 54.8525847025],
+    [{'theta':80., 'phi':10.}, (qx, qy), 1.74134670026],
+]
 del qx, qy  # not necessary to delete, but cleaner