Merge branch 'merging_units' of github.com:yger/spikeinterface into m…

…erging_units

src/spikeinterface/core/analyzer_extension_core.py

@@ -277,7 +277,6 @@ def _rearange_waveforms(self, new_sorting_analyzer, units_to_merge, unit_ids, ke
         for unit_id1, to_be_merged in zip(unit_ids, units_to_merge):
 
             chan_inds_new = new_sorting_analyzer.sparsity.unit_id_to_channel_indices[unit_id1]
-            print(chan_inds_new.size)
 
             for unit_id2 in to_be_merged:
                 unit_ind2 = self.sorting_analyzer.sorting.id_to_index(unit_id2)
@@ -328,7 +327,6 @@ def _merge_extension_data(
 
             keep_unit_indices = self.sorting_analyzer.sorting.ids_to_indices(keep_unit_ids)
             keep_spike_mask = np.isin(some_spikes["unit_index"], keep_unit_indices)
-            print(new_data['waveforms'].shape, np.where(keep_spike_mask)[-1], len(keep_spike_mask), np.sum(keep_spike_mask))
             new_data["waveforms"][keep_spike_mask, :, :old_num_chans] = waveforms[keep_spike_mask]
 
             # We only recompute waveforms for new units that might have a new sparsity mask. Could be
@@ -356,7 +354,6 @@ def _merge_extension_data(
             new_waveforms = self._get_waveforms(
                 new_sorting_analyzer, new_unit_ids_large, verbose, **job_kwargs
             )
-            print(new_waveforms.shape, np.where(updated_spike_mask)[-1], len(updated_spike_mask), np.sum(updated_spike_mask))
             new_data["waveforms"][updated_spike_mask] = new_waveforms
 
             ## For the units with smaller masks, we need to rearrange the waveforms
@@ -367,7 +364,6 @@ def _merge_extension_data(
             new_waveforms = self._rearange_waveforms(
                 new_sorting_analyzer, old_units_to_merge_small, new_unit_ids_small, kept_indices, verbose, **job_kwargs
             )
-            print(new_waveforms.shape, np.where(updated_spike_mask)[-1], len(updated_spike_mask), np.sum(updated_spike_mask))
             new_data["waveforms"][updated_spike_mask] = new_waveforms
 
         else:

src/spikeinterface/core/sorting_tools.py

@@ -225,7 +225,7 @@ def random_spikes_selection(
 def get_ids_after_merging(sorting, units_to_merge, new_unit_ids):
 
     assert len(new_unit_ids) == len(units_to_merge), "new_unit_ids should have the same len as units_to_merge"
-    
+
     merged_unit_ids = set(sorting.unit_ids)
     for count in range(len(units_to_merge)):
         assert len(units_to_merge[count]) > 1, "A merge should have at least two units"
@@ -269,6 +269,7 @@ def apply_merges_to_sorting(sorting, units_to_merge, new_unit_ids=None, censor_m
         to_keep = np.ones(len(spikes), dtype=bool)
 
     from spikeinterface.curation.curation_tools import get_new_unit_ids_for_merges
+
     new_unit_ids = get_new_unit_ids_for_merges(sorting, units_to_merge, new_unit_ids)
 
     all_unit_ids = get_ids_after_merging(sorting, units_to_merge, new_unit_ids)

src/spikeinterface/core/sortinganalyzer.py

@@ -856,6 +856,7 @@ def merge_units(
         assert merging_mode in ["soft", "hard"], "Merging mode should be either soft or hard"
 
         from spikeinterface.curation.curation_tools import get_new_unit_ids_for_merges
+
         new_unit_ids = get_new_unit_ids_for_merges(self.sorting, units_to_merge, new_unit_ids)
 
         if not isinstance(units_to_merge[0], (list, tuple)):

src/spikeinterface/curation/curation_tools.py

@@ -134,6 +134,7 @@ def find_duplicated_spikes(
     else:
         raise ValueError(f"Method '{method}' isn't a valid method for find_duplicated_spikes. Use one of {_methods}")
 
+
 def get_new_unit_ids_for_merges(sorting, units_to_merge, new_unit_ids):
 
     all_removed_ids = []
@@ -166,5 +167,5 @@ def get_new_unit_ids_for_merges(sorting, units_to_merge, new_unit_ids):
         else:
             # dtype int
             new_unit_ids = list(max(sorting.unit_ids) + 1 + np.arange(num_merge, dtype=dtype))
-    
-    return new_unit_ids
+
+    return new_unit_ids

src/spikeinterface/curation/mergeunitssorting.py

@@ -50,8 +50,8 @@ def __init__(self, sorting, units_to_merge, new_unit_ids=None, properties_policy
         keep_unit_ids = [u for u in parents_unit_ids if u not in all_removed_ids]
 
         from .curation_tools import get_new_unit_ids_for_merges
-        new_unit_ids = get_new_unit_ids_for_merges(sorting, units_to_merge, new_unit_ids)
 
+        new_unit_ids = get_new_unit_ids_for_merges(sorting, units_to_merge, new_unit_ids)
 
         assert len(new_unit_ids) == num_merge, "new_unit_ids must have the same size as units_to_merge"