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

sasmodels/models/polymer_excl_volume.py

@@ -90 +90 @@
 B Hammouda, *SANS from Homogeneous Polymer Mixtures - A Unified Overview,
 Advances in Polym. Sci.* 106(1993) 87-133
-
 """
 
+import numpy as np
 from numpy import inf, power, errstate
 from scipy.special import gammainc, gamma
@@ -124 +124 @@
     with errstate(divide='ignore', invalid='ignore'):
         upow = power(usub, -0.5*porod_exp)
-        result= (porod_exp*upow *
-                 (gamma(0.5*porod_exp)*gammainc(0.5*porod_exp, usub) -
-                  upow*gamma(porod_exp)*gammainc(porod_exp, usub)))
+        result = (porod_exp*upow *
+                  (gamma(0.5*porod_exp)*gammainc(0.5*porod_exp, usub) -
+                   upow*gamma(porod_exp)*gammainc(porod_exp, usub)))
     result[q <= 0] = 1.0
 
@@ -134 +134 @@
 
 def random():
-    import numpy as np
     rg = 10**np.random.uniform(0, 4)
     porod_exp = np.random.uniform(1e-3, 6)