fix squeeze bug (turns 1-value arrays into 0-dimensional arrays)

Author: m-beau

npyx/__pycache__/spk_t.cpython-37.pyc

@@ -53,7 +53,7 @@ def ids(dp, unit, sav=True, prnt=False, subset_selection='all', again=False):
         except:pass
     if type(unit) is int:
         spike_clusters = np.load(Path(dp,"spike_clusters.npy"))
-        indices = np.nonzero(spike_clusters==unit)[0].squeeze()
+        indices = np.nonzero(spike_clusters==unit)[0]
     if type(unit) not in [str, np.str_, int]:
         print('WARNING unit {} type ({}) not handled!'.format(unit, type(unit)))
         return
@@ -114,11 +114,11 @@ def trn(dp, unit, sav=True, prnt=False, subset_selection='all', again=False, enf
             if ds_table.shape[0]>1: # If several datasets in prophyler
                 spike_clusters_samples = np.load(Path(dp, 'merged_clusters_spikes.npy'))
                 dataset_mask=(spike_clusters_samples[:, 0]==ds_i); unit_mask=(spike_clusters_samples[:, 1]==unt)
-                train = spike_clusters_samples[dataset_mask&unit_mask, 2].squeeze().astype(np.int64)
+                train = spike_clusters_samples[dataset_mask&unit_mask, 2].astype(np.int64)
             else:
                 spike_clusters = np.load(Path(ds_table['dp'][0],"spike_clusters.npy"))
                 spike_samples = np.load(Path(ds_table['dp'][0],'spike_times.npy'))
-                train = spike_samples[spike_clusters==unt].squeeze()
+                train = spike_samples[spike_clusters==unt]
         else:
             try:unit=int(unit)
             except:pass

npyx/__pycache__/spk_wvf.cpython-37.pyc

@@ -403,6 +403,7 @@ def get_ids_subset(dp, unit, n_waveforms, batch_size_waveforms, subset_selection
         else:
             assert n_waveforms > 0
             spike_ids = ids(dp, unit)
+            assert any(spike_ids)
             if subset_selection == 'regular':
                 # Regular subselection.
                 if batch_size_waveforms is None or len(spike_ids) <= max(batch_size_waveforms, n_waveforms):