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

Timestamp:

Nov 29, 2017 1:13:23 PM (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/barbell.py (modified) (3 diffs)

sasmodels/models/barbell.py

@@ -87 +87 @@
 * **Last Reviewed by:** Richard Heenan **Date:** January 4, 2017
 """
+
+import numpy as np
 from numpy import inf, sin, cos, pi
 
@@ -116 +118 @@
 
 def random():
-    import numpy as np
     # TODO: increase volume range once problem with bell radius is fixed
     # The issue is that bell radii of more than about 200 fail at high q
-    V = 10**np.random.uniform(7, 9)
-    bar_volume = 10**np.random.uniform(-4, -1)*V
-    bell_volume = V - bar_volume
+    volume = 10**np.random.uniform(7, 9)
+    bar_volume = 10**np.random.uniform(-4, -1)*volume
+    bell_volume = volume - bar_volume
     bell_radius = (bell_volume/6)**0.3333  # approximate
     min_bar = bar_volume/np.pi/bell_radius**2
@@ -150 +151 @@
 qx = q*cos(pi/6.0)
 qy = q*sin(pi/6.0)
-tests = [[{}, 0.075, 25.5691260532],
-        [{'theta':80., 'phi':10.}, (qx, qy), 3.04233067789],
-        ]
+tests = [
+    [{}, 0.075, 25.5691260532],
+    [{'theta':80., 'phi':10.}, (qx, qy), 3.04233067789],
+]
 del qx, qy  # not necessary to delete, but cleaner