Changeset b297ba9 in sasmodels for sasmodels/models/line.py

Timestamp:

Mar 20, 2019 7:03:50 PM (5 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:

4e28511

Parents:

0d362b7

Message:

lint

File:

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

sasmodels/models/line.py

@@ -58 +58 @@
 
 
-def Iqxy(qx, qy, *args):
+def Iqxy(qx, qy, intercept, slope):
     """
     :param qx:   Input q_x-value
     :param qy:   Input q_y-value
-    :param args: Remaining arguments
+    :param intercept:   Intrecept in linear model
+    :param slope:       Slope in linear model
     :return:     2D-Intensity
     """
     # TODO: SasView documents 2D intensity as Iq(qx)*Iq(qy), but returns Iq(qy)
     # Note: SasView.run([r, theta]) does return Iq(qx)*Iq(qy)
-    return Iq(qx, *args)*Iq(qy, *args)
+    return Iq(qx, intercept, slope)*Iq(qy, intercept, slope)
 
 Iqxy.vectorized = True  # Iqxy accepts an array of qx qy values
@@ -80 +81 @@
 
 def random():
+    """Return a random parameter set for the model."""
     scale = 10**np.random.uniform(0, 3)
     slope = np.random.uniform(-1, 1)*1e2