get_units bug

Author: m-beau

build/lib/npyx/spk_t.py

@@ -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

build/lib/npyx/spk_wvf.py

@@ -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):

dist/npyx-1.2.tar.gz

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: npyx
-Version: 1.2
+Version: 1.21
 Summary: Python routines dealing with Neuropixels data.
 Home-page: https://github.com/Npix-routines/NeuroPyxels
 Author: Maxime Beau
@@ -19,7 +19,7 @@ Description: # routines
         Python version has to be >=3.7 ot there will be imports issues!
 
         Useful link to [create a python package from a git repository](https://towardsdatascience.com/build-your-first-open-source-python-project-53471c9942a7)
-        In particular, to upload
+        
         ## Installation:
         Using a conda environment is very much advised. Instructions here: [manage conda environments](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html)
         - from a local repository (recommended if plans to work on it/regularly pull upgrades)
@@ -75,22 +75,21 @@ Description: # routines
         setup(name='npyx',
               version='1.0',... # change to 1.1 or whatev
         ```
-        Then re-generate the distribution files for the new version using twine:
+        Then delete the old distribution files before re-generating them for the new version using twine:
         ```
+        rm -r ./dist
+        rm -r ./build
+        rm -r ./npyx.egg-info
         python setup.py sdist bdist_wheel # this will generate version 1.1 wheel without overwriting version 1.0 wheel in ./dist
         ```
-        Before pushing them to PyPI (it will keep track of older versions!)
+        Before pushing them to PyPI (older versions are saved online!)
         ```
         $ twine upload dist/*
         Uploading distributions to https://upload.pypi.org/legacy/
         Enter your username: your-username
         Enter your password: 
-        Uploading npyx-1.0-py3-none-any.whl
-        100%|█████████████████████████████████████████████████████████| 156k/156k [00:01<00:00, 154kB/s]
         Uploading npyx-1.1-py3-none-any.whl
         100%|████████████████████████████████████████████████████████| 156k/156k [00:01<00:00, 96.8kB/s]
-        Uploading npyx-1.0.tar.gz
-        100%|█████████████████████████████████████████████████████████| 149k/149k [00:00<00:00, 169kB/s]
         Uploading npyx-1.1.tar.gz
         100%|█████████████████████████████████████████████████████████| 150k/150k [00:01<00:00, 142kB/s]