Changeset b297ba9 in sasmodels for sasmodels/models/parallelepiped.py

Timestamp:

Mar 20, 2019 5:03:50 PM (5 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:

4e28511

Parents:

0d362b7

Message:

lint

File:

• sasmodels/models/parallelepiped.py (modified) (5 diffs)

sasmodels/models/parallelepiped.py

@@ -180 +180 @@
    14 (1961) 185-211
 .. [#] R Nayuk and K Huber, *Z. Phys. Chem.*, 226 (2012) 837-854
-L. Onsager, Ann. New York Acad. Sci. 51, 627-659 (1949). 
+L. Onsager, Ann. New York Acad. Sci. 51, 627-659 (1949).
 
 Authorship and Verification
@@ -192 +192 @@
 
 import numpy as np
-from numpy import pi, inf, sqrt, sin, cos
+from numpy import inf
 
 name = "parallelepiped"
@@ -233 +233 @@
 have_Fq = True
 effective_radius_type = [
-    "equivalent cylinder excluded volume", "equivalent volume sphere", 
+    "equivalent cylinder excluded volume", "equivalent volume sphere",
     "half length_a", "half length_b", "half length_c",
     "equivalent circular cross-section", "half ab diagonal", "half diagonal",
@@ -239 +239 @@
 
 def random():
+    """Return a random parameter set for the model."""
     length = 10**np.random.uniform(1, 4.7, size=3)
     pars = dict(
@@ -261 +262 @@
 # rkh 7/4/17 add random unit test for 2d, note make all params different,
 # 2d values not tested against other codes or models
-qx, qy = 0.2 * cos(pi/6.), 0.2 * sin(pi/6.)
+qx, qy = 0.2 * np.cos(np.pi/6.), 0.2 * np.sin(np.pi/6.)
 tests = [[{}, 0.2, 0.17758004974],
          [{}, [0.2], [0.17758004974]],