Merge pull request #985 from int-brain-lab/hotfix/3.3.1

SpikeSortingLoader channels from electrodeSites

Author: oliche

brainbox/io/one.py

@@ -1021,10 +1021,10 @@ def load_channels(self, **kwargs):
         self.download_spike_sorting_object(obj='channels', missing='ignore', **kwargs)
         channels = self._load_object(self.files['channels'], wildcards=self.one.wildcards)
         if 'electrodeSites' in self.files:  # if common dict keys, electrodeSites prevails
-            esites = channels | self._load_object(self.files['electrodeSites'], wildcards=self.one.wildcards)
-            if alfio.check_dimensions(esites) != 0:
-                esites = self._load_object(self.files['electrodeSites'], wildcards=self.one.wildcards)
-                esites['rawInd'] = np.arange(esites[list(esites.keys())[0]].shape[0])
+            channels = channels | self._load_object(self.files['electrodeSites'], wildcards=self.one.wildcards)
+            if alfio.check_dimensions(channels) != 0:
+                channels = self._load_object(self.files['electrodeSites'], wildcards=self.one.wildcards)
+                channels['rawInd'] = np.arange(channels[list(channels.keys())[0]].shape[0])
         if 'brainLocationIds_ccf_2017' not in channels:
             _logger.debug(f"loading channels from alyx for {self.files['channels']}")
             _channels, self.histology = _load_channel_locations_traj(

ibllib/__init__.py

@@ -2,7 +2,7 @@
 import logging
 import warnings
 
-__version__ = '3.3.0'
+__version__ = '3.3.1'
 warnings.filterwarnings('always', category=DeprecationWarning, module='ibllib')
 
 # if this becomes a full-blown library we should let the logging configuration to the discretion of the dev

release_notes.md

@@ -1,3 +1,8 @@
+## Release Note 3.3.1
+
+### Bugfixes
+- SpikeSortingLoader: returns channels from 'electrodeSites' if available (it always was the intention...)
+
 ## Release Note 3.3.0
 
 ### features