Changeset 1b5e020 in sasmodels

Timestamp:

Aug 27, 2017 9:11:41 AM (7 years ago)

Author:

Jose Borreguero <borreguero@…>

Children:

41917b8

Parents:

df30106

Message:

decorator to numpyze positional arguments

File:

• sasmodels/models/tabulated.py (modified) (3 diffs)

sasmodels/models/tabulated.py

@@ -73 +73 @@
 
 
+def numpyze(calc_I):
+    """
+    Transform positional arguments into numpy arrays
+    :param calc_I: Intensities calculator
+    :return: function acting on the transformed positional arguments
+    """
+    def wrapper(*args, **kwargs):
+        numpy_args = [np.array(arg, dtype=np.float) for arg in args]
+        return calc_I(*numpy_args, **kwargs)
+
+
+@numpyze
 def Iq(q, scale=1.0):
     """
@@ -79 +91 @@
     :return:      calculated intensities
     """
-    q_a = np.array(q, dtype='float')
-    return scale * _attr['itp'](q_a)
+    return scale * _attr['itp'](q)
 
 Iq.vectorized = True  # Iq accepts an array of q values
 
 
+@numpyze
 def Iqxy(qx, qy, scale=1.0):
     """
@@ -92 +104 @@
     :return:      calculated intensities
     """
-    qx_a = np.array(qx, dtype='float')
-    qy_a = np.array(qy, dtype='float')
-    return scale * _attr['itp'](qx_a, qy_a)
+    return scale * _attr['itp'](qx, qy)
     pass