Changeset 40a87fa in sasmodels for sasmodels/models/two_power_law.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/two_power_law.py (modified) (3 diffs)

sasmodels/models/two_power_law.py

@@ -14 +14 @@
 where $q_c$ = the location of the crossover from one slope to the other,
 $A$ = the scaling coefficent that sets the overall intensity of the lower Q
-power law region, $m1$ = power law exponent at low Q, and $m2$ = power law 
+power law region, $m1$ = power law exponent at low Q, and $m2$ = power law
 exponent at high Q.  The scaling of the second power law region (coefficent C)
 is then automatically scaled to match the first by following formula:
@@ -62 +62 @@
 category = "shape-independent"
 
-#            ["name", "units", default, [lower, upper], "type", "description"],
-parameters = [["coefficent_1",  "",         1.0, [-inf, inf], "",
-               "coefficent A in low Q region"],
-              ["crossover",     "1/Ang",    0.04,[0, inf],    "",
-               "crossover location"],
-              ["power_1",       "",         1.0, [0, inf],    "",
-               "power law exponent at low Q"],
-              ["power_2",       "",         4.0, [0, inf],    "",
-               "power law exponent at high Q"],
-             ]
+# pylint: disable=bad-whitespace, line-too-long
+#   ["name", "units", default, [lower, upper], "type", "description"],
+parameters = [
+    ["coefficent_1", "",       1.0, [-inf, inf], "", "coefficent A in low Q region"],
+    ["crossover",    "1/Ang",  0.04,[0, inf],    "", "crossover location"],
+    ["power_1",      "",       1.0, [0, inf],    "", "power law exponent at low Q"],
+    ["power_2",      "",       4.0, [0, inf],    "", "power law exponent at high Q"],
+    ]
+# pylint: enable=bad-whitespace, line-too-long
 
 
@@ -89 +88 @@
     :return:                    Calculated intensity
     """
-    iq = empty(q.shape, 'd')
-    idx = (q <= crossover)
+    result= empty(q.shape, 'd')
+    index = (q <= crossover)
     with errstate(divide='ignore'):
         coefficent_2 = coefficent_1 * power(crossover, power_2 - power_1)
-        iq[idx] = coefficent_1 * power(q[idx], -power_1)
-        iq[~idx] = coefficent_2 * power(q[~idx], -power_2)
-    return iq
+        result[index] = coefficent_1 * power(q[index], -power_1)
+        result[~index] = coefficent_2 * power(q[~index], -power_2)
+    return result
 
 Iq.vectorized = True  # Iq accepts an array of q values