Changeset 2d81cfe in sasmodels for sasmodels/models/cylinder.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/cylinder.py (modified) (4 diffs)

sasmodels/models/cylinder.py

@@ -64 +64 @@
 
     Angles $\theta$ and $\phi$ orient the cylinder relative
-    to the beam line coordinates, where the beam is along the $z$ axis. Rotation $\theta$, initially 
+    to the beam line coordinates, where the beam is along the $z$ axis. Rotation $\theta$, initially
     in the $xz$ plane, is carried out first, then rotation $\phi$ about the $z$ axis. Orientation distributions
     are described as rotations about two perpendicular axes $\delta_1$ and $\delta_2$
@@ -133 +133 @@
               ["theta", "degrees", 60, [-360, 360], "orientation",
                "cylinder axis to beam angle"],
-              ["phi", "degrees",   60, [-360, 360], "orientation",
+              ["phi", "degrees", 60, [-360, 360], "orientation",
                "rotation about beam"],
              ]
 
-source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c",  "cylinder.c"]
+source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", "cylinder.c"]
 
 def ER(radius, length):
@@ -147 +147 @@
 
 def random():
-    import numpy as np
-    V = 10**np.random.uniform(5, 12)
-    length = 10**np.random.uniform(-2, 2)*V**0.333
-    radius = np.sqrt(V/length/np.pi)
+    volume = 10**np.random.uniform(5, 12)
+    length = 10**np.random.uniform(-2, 2)*volume**0.333
+    radius = np.sqrt(volume/length/np.pi)
     pars = dict(
         #scale=1,
@@ -172 +171 @@
 qx, qy = 0.2 * np.cos(2.5), 0.2 * np.sin(2.5)
 # After redefinition of angles, find new tests values.  Was 10 10 in old coords
-tests = [[{}, 0.2, 0.042761386790780453],
-        [{}, [0.2], [0.042761386790780453]],
-#  new coords
-        [{'theta':80.1534480601659, 'phi':10.1510817110481}, (qx, qy), 0.03514647218513852],
-        [{'theta':80.1534480601659, 'phi':10.1510817110481}, [(qx, qy)], [0.03514647218513852]],
-# old coords   [{'theta':10.0, 'phi':10.0}, (qx, qy), 0.03514647218513852],
-#              [{'theta':10.0, 'phi':10.0}, [(qx, qy)], [0.03514647218513852]],
-        ]
+tests = [
+    [{}, 0.2, 0.042761386790780453],
+    [{}, [0.2], [0.042761386790780453]],
+    #  new coords
+    [{'theta':80.1534480601659, 'phi':10.1510817110481}, (qx, qy), 0.03514647218513852],
+    [{'theta':80.1534480601659, 'phi':10.1510817110481}, [(qx, qy)], [0.03514647218513852]],
+    # old coords
+    #[{'theta':10.0, 'phi':10.0}, (qx, qy), 0.03514647218513852],
+    #[{'theta':10.0, 'phi':10.0}, [(qx, qy)], [0.03514647218513852]],
+]
 del qx, qy  # not necessary to delete, but cleaner
 # ADDED by:  RKH  ON: 18Mar2016 renamed sld's etc