Merge branch 'fix-subset' into 'master'

fix bug with subset in get_array()

See merge request !230

doc/changelog.rst

@@ -9,7 +9,7 @@ unreleased
     - fix :issue:`61` regarding sign of XAS in some cases :mr:`207`
     - Use xarray.values instead of .to_numpy() for backward-compatibility :mr:`214`
     - fix :issue:`23` regarding API documentation generation :mr:`221`
-    - fix :issue:`64`` regarding loading a subset of trains :mr:`226`
+    - fix :issue:`64`` regarding loading a subset of trains :mr:`226`, :mr:`230`
 
 - **Improvements**
 

src/toolbox_scs/load.py

@@ -390,10 +390,12 @@ def get_array(run=None, mnemonic=None, stepsize=None,
     """
     if run is None:
         run = open_run(proposalNB, runNB, subset, data=subFolder)
-    if not isinstance(run, ed.DataCollection):
-        raise TypeError(f'run argument has type {type(run)} but '
-                         'expected type is extra_data.DataCollection')
-    run = run.select_trains(subset)
+    else:
+        if not isinstance(run, ed.DataCollection):
+            raise TypeError(f'run argument has type {type(run)} but '
+                            'expected type is extra_data.DataCollection')
+        if subset is not None:
+            run = run.select_trains(subset)
     run_mnemonics = mnemonics_for_run(run)
 
     try: