Changeset ba7302a in sasmodels for sasmodels/data.py

Timestamp:

Oct 12, 2017 4:39:39 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c

Parents:

2573fa1 (diff), 09141ff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into flexible-cylinder

File:

• sasmodels/data.py (modified) (2 diffs)

sasmodels/data.py

@@ -44 +44 @@
     Data = Union["Data1D", "Data2D", "SesansData"]
 
-def load_data(filename):
+def load_data(filename, index=0):
     # type: (str) -> Data
     """
@@ -55 +55 @@
         filename, indexstr = filename[:-1].split('[')
         index = int(indexstr)
-    else:
-        index = None
     datasets = loader.load(filename)
-    if datasets is None:
+    if not datasets:  # None or []
         raise IOError("Data %r could not be loaded" % filename)
     if not isinstance(datasets, list):
         datasets = [datasets]
-    if index is None and len(datasets) > 1:
-        raise ValueError("Need to specify filename[index] for multipart data")
-    data = datasets[index if index is not None else 0]
-    if hasattr(data, 'x'):
-        data.qmin, data.qmax = data.x.min(), data.x.max()
-        data.mask = (np.isnan(data.y) if data.y is not None
-                     else np.zeros_like(data.x, dtype='bool'))
-    elif hasattr(data, 'qx_data'):
-        data.mask = ~data.mask
-    return data
+    for data in datasets:
+        if hasattr(data, 'x'):
+            data.qmin, data.qmax = data.x.min(), data.x.max()
+            data.mask = (np.isnan(data.y) if data.y is not None
+                        else np.zeros_like(data.x, dtype='bool'))
+        elif hasattr(data, 'qx_data'):
+            data.mask = ~data.mask
+    return datasets[index] if index != 'all' else datasets