From c64e39cef8433a284cec8478c3a0f564f507bb06 Mon Sep 17 00:00:00 2001 From: zm711 <92116279+zm711@users.noreply.github.com> Date: Wed, 29 May 2024 13:58:52 +0100 Subject: [PATCH] another instance of parent_sorting --- src/spikeinterface/curation/curationsorting.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/spikeinterface/curation/curationsorting.py b/src/spikeinterface/curation/curationsorting.py index 6011c9ccee..4d83998bde 100644 --- a/src/spikeinterface/curation/curationsorting.py +++ b/src/spikeinterface/curation/curationsorting.py @@ -2,7 +2,6 @@ from collections import namedtuple from collections.abc import Iterable -from warnings import warn import numpy as np @@ -123,7 +122,7 @@ def merge(self, units_to_merge, new_unit_id=None, delta_time_ms=0.4): elif new_unit_id not in units_to_merge: assert new_unit_id not in current_sorting.unit_ids, f"new_unit_id already exists!" new_sorting = MergeUnitsSorting( - parent_sorting=current_sorting, + sorting=current_sorting, units_to_merge=units_to_merge, new_unit_ids=[new_unit_id], delta_time_ms=delta_time_ms,