Merge branch 'main' into fix_chris_bug

Author: h-mayorquin

doc/api.rst

@@ -277,8 +277,6 @@ spikeinterface.comparison
 
     .. autoclass:: CollisionGTComparison
     .. autoclass:: CorrelogramGTComparison
-    .. autoclass:: CollisionGTStudy
-    .. autoclass:: CorrelogramGTStudy
 
 
 

src/spikeinterface/core/baserecordingsnippets.py

@@ -560,7 +560,7 @@ def split_by(self, property="group", outputs="dict"):
             recordings = []
         elif outputs == "dict":
             recordings = {}
-        for value in np.unique(values):
+        for value in np.unique(values).tolist():
             (inds,) = np.nonzero(values == value)
             new_channel_ids = self.get_channel_ids()[inds]
             subrec = self.select_channels(new_channel_ids)

src/spikeinterface/core/sortinganalyzer.py

@@ -1199,7 +1199,10 @@ def merge_units(
 
         if len(merge_unit_groups) == 0:
             # TODO I think we should raise an error or at least make a copy and not return itself
-            return self
+            if return_new_unit_ids:
+                return self, []
+            else:
+                return self
 
         for units in merge_unit_groups:
             # TODO more checks like one units is only in one group