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

sasmodels/models/elliptical_cylinder.py

@@ -43 +43 @@
     P(q) = \text{scale}  <F^2> / V
 
-For 2d data the orientation of the particle is required, described using a different set 
-of angles as in the diagrams below, for further details of the calculation and angular 
+For 2d data the orientation of the particle is required, described using a different set
+of angles as in the diagrams below, for further details of the calculation and angular
 dispersions  see :ref:`orientation` .
 
@@ -95 +95 @@
 * **Last Modified by:**
 * **Last Reviewed by:**  Richard Heenan - corrected equation in docs **Date:** December 21, 2016
-
 """
 
+import numpy as np
 from numpy import pi, inf, sqrt, sin, cos
 
@@ -141 +141 @@
 
 def random():
-    import numpy as np
     # V = pi * radius_major * radius_minor * length;
-    V = 10**np.random.uniform(3, 9)
+    volume = 10**np.random.uniform(3, 9)
     length = 10**np.random.uniform(1, 3)
     axis_ratio = 10**np.random.uniform(0, 2)
-    radius_minor = np.sqrt(V/length/axis_ratio)
-    Vf = 10**np.random.uniform(-4, -2)
+    radius_minor = np.sqrt(volume/length/axis_ratio)
+    volfrac = 10**np.random.uniform(-4, -2)
     pars = dict(
         #background=0, sld=0, sld_solvent=1,
-        scale=1e9*Vf/V,
+        scale=1e9*volfrac/volume,
         length=length,
         radius_minor=radius_minor,
@@ -170 +169 @@
       'sld_solvent':1.0, 'background':0.0},
      0.001, 675.504402],
-#    [{'theta':80., 'phi':10.}, (qx, qy), 7.88866563001 ],
+    #[{'theta':80., 'phi':10.}, (qx, qy), 7.88866563001 ],
 ]