Merge pull request #2104 from samuelgarcia/fix_main

Fix slicing in merge.py and so tridesclous2 and so test_launcher.py
SpikeInterface · Oct 16, 2023 · 038d1d3 · 038d1d3
2 parents bedaafc + a00ce05
commit 038d1d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/spikeinterface/sorters/tests/test_launcher.py b/src/spikeinterface/sorters/tests/test_launcher.py
@@ -233,15 +233,15 @@ def test_run_sorters_with_dict():
 
 
 if __name__ == "__main__":
-    # setup_module()
+    setup_module()
     job_list = get_job_list()
 
-    # test_run_sorter_jobs_loop(job_list)
+    test_run_sorter_jobs_loop(job_list)
     # test_run_sorter_jobs_joblib(job_list)
     # test_run_sorter_jobs_processpoolexecutor(job_list)
     # test_run_sorter_jobs_multiprocessing(job_list)
     # test_run_sorter_jobs_dask(job_list)
-    test_run_sorter_jobs_slurm(job_list)
+    # test_run_sorter_jobs_slurm(job_list)
 
     # test_run_sorter_by_property()
 

diff --git a/src/spikeinterface/sortingcomponents/clustering/merge.py b/src/spikeinterface/sortingcomponents/clustering/merge.py
@@ -650,10 +650,10 @@ def merge(
         union_chans = np.union1d(target_chans0, target_chans1)
 
         ind0 = list(labels_set).index(label0)
-        template0 = templates[ind0, :, target_chans]
+        template0 = templates[ind0][:, target_chans]
 
         ind1 = list(labels_set).index(label1)
-        template1 = templates[ind1, :, target_chans]
+        template1 = templates[ind1][:, target_chans]
 
         num_samples = template0.shape[0]
         # norm = np.mean(np.abs(template0)) + np.mean(np.abs(template1))