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

sasmodels/models/mass_fractal.py

@@ -51 +51 @@
 D Mildner and P Hall, *J. Phys. D: Appl. Phys.*,
 19 (1986) 1535-1545 Equation(9)
-
-
 """
 
+import numpy as np
 from numpy import inf
 
@@ -89 +88 @@
 
 def random():
-    import numpy as np
     radius = 10**np.random.uniform(0.7, 4)
     cutoff_length = 10**np.random.uniform(0.7, 2)*radius
     # TODO: fractal dimension should range from 1 to 6
     fractal_dim_mass = 2*np.random.beta(3, 4) + 1
-    Vf = 10**np.random.uniform(-4, -1)
+    #volfrac = 10**np.random.uniform(-4, -1)
     pars = dict(
         #background=0,
-        scale=1, #1e5*Vf/radius**(fractal_dim_mass),
+        scale=1, #1e5*volfrac/radius**(fractal_dim_mass),
         radius=radius,
         cutoff_length=cutoff_length,