Changeset 40a87fa in sasmodels for sasmodels/models/polymer_excl_volume.py

Timestamp:

Aug 8, 2016 11:24:11 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2472141

Parents:

2d65d51

Message:

lint and latex cleanup

File:

• sasmodels/models/polymer_excl_volume.py (modified) (2 diffs)

sasmodels/models/polymer_excl_volume.py

@@ -106 +106 @@
 
 # pylint: disable=bad-whitespace, line-too-long
-#             ["name", "units", default, [lower, upper], "type", "description"],
-parameters = [["rg",        "Ang", 60.0, [0, inf],    "", "Radius of Gyration"],
-              ["porod_exp", "",     3.0, [-inf, inf], "", "Porod exponent"],
-             ]
+#   ["name", "units", default, [lower, upper], "type", "description"],
+parameters = [
+    ["rg",        "Ang", 60.0, [0, inf],    "", "Radius of Gyration"],
+    ["porod_exp", "",     3.0, [-inf, inf], "", "Porod exponent"],
+]
 # pylint: enable=bad-whitespace, line-too-long
 
@@ -120 +121 @@
     :return:          Calculated intensity
     """
-    u = (q*rg)**2 * (2.0/porod_exp + 1.0) * (2.0/porod_exp + 2.0)/6.0
+    usub = (q*rg)**2 * (2.0/porod_exp + 1.0) * (2.0/porod_exp + 2.0)/6.0
     with errstate(divide='ignore', invalid='ignore'):
-        upow = power(u, -0.5*porod_exp)
-        iq = (porod_exp*upow *
-              (gamma(0.5*porod_exp)*gammainc(0.5*porod_exp, u) -
-               upow*gamma(porod_exp)*gammainc(porod_exp, u)))
-    iq[q <= 0] = 1.0
+        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[q <= 0] = 1.0
 
-    return iq
+    return result
 
 Iq.vectorized = True  # Iq accepts an array of q values
-
 
 tests = [