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

…erging_units
SpikeInterface · Jun 26, 2024 · 73e8eaa · 73e8eaa
2 parents 84812d5 + df44a0a
commit 73e8eaa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/spikeinterface/core/sorting_tools.py b/src/spikeinterface/core/sorting_tools.py
@@ -5,7 +5,6 @@
 from spikeinterface.core import NumpySorting
 
 
-
 def spike_vector_to_spike_trains(spike_vector: list[np.array], unit_ids: np.array) -> dict[dict[str, np.array]]:
     """
     Computes all spike trains for all units/segments from a spike vector list.
@@ -267,7 +266,7 @@ def apply_merges_to_sorting(sorting, units_to_merge, new_unit_ids=None, censor_m
 
     spikes = sorting.to_spike_vector().copy()
     to_keep = np.ones(len(spikes), dtype=bool)
-    
+
     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)

diff --git a/src/spikeinterface/core/tests/test_sortinganalyzer.py b/src/spikeinterface/core/tests/test_sortinganalyzer.py
@@ -244,7 +244,7 @@ def _check_sorting_analyzers(sorting_analyzer, original_sorting, cache_folder):
         else:
             folder = None
         sorting_analyzer4 = sorting_analyzer.merge_units(
-            units_to_merge=[[0, 1]], new_unit_ids=[50], format=format, folder=folder, mode='hard'
+            units_to_merge=[[0, 1]], new_unit_ids=[50], format=format, folder=folder, mode="hard"
         )
 
     # test compute with extension-specific params