From 20bf14dbc1728246f96a0597d0329cf14c763b97 Mon Sep 17 00:00:00 2001 From: zm711 <92116279+zm711@users.noreply.github.com> Date: Tue, 14 May 2024 15:47:13 -0400 Subject: [PATCH 1/2] use templates is_scaled --- src/spikeinterface/core/template_tools.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/spikeinterface/core/template_tools.py b/src/spikeinterface/core/template_tools.py index 11581a49ce..a6ecca2618 100644 --- a/src/spikeinterface/core/template_tools.py +++ b/src/spikeinterface/core/template_tools.py @@ -148,11 +148,11 @@ def get_template_extremum_channel( channel_ids = templates_or_sorting_analyzer.channel_ids # if SortingAnalyzer need to use global SortingAnalyzer return_scaled otherwise - # we just use the previous default of return_scaled=True (for templates) + # we use the Templates is_scaled if isinstance(templates_or_sorting_analyzer, SortingAnalyzer): return_scaled = templates_or_sorting_analyzer.return_scaled else: - return_scaled = True + return_scaled = templates_or_sorting_analyzer.is_scaled peak_values = get_template_amplitudes( templates_or_sorting_analyzer, peak_sign=peak_sign, mode=mode, return_scaled=return_scaled @@ -196,12 +196,12 @@ def get_template_extremum_channel_peak_shift(templates_or_sorting_analyzer, peak shifts = {} - # We need to use the SortingAnalyzer return_scaled if possible - # otherwise for Templates default to True + # We need to use the SortingAnalyzer return_scaled + # We need to use the Templates is_scaled if isinstance(templates_or_sorting_analyzer, SortingAnalyzer): return_scaled = templates_or_sorting_analyzer.return_scaled else: - return_scaled = True + return_scaled = templates_or_sorting_analyzer.is_scaled templates_array = get_dense_templates_array(templates_or_sorting_analyzer, return_scaled=return_scaled) @@ -257,7 +257,7 @@ def get_template_extremum_amplitude( if isinstance(templates_or_sorting_analyzer, SortingAnalyzer): return_scaled = templates_or_sorting_analyzer.return_scaled else: - return_scaled = True + return_scaled = templates_or_sorting_analyzer.is_scaled extremum_amplitudes = get_template_amplitudes( templates_or_sorting_analyzer, peak_sign=peak_sign, mode=mode, return_scaled=return_scaled From 9423f685cafe57555777b61e80bef2c7bb3f2c17 Mon Sep 17 00:00:00 2001 From: zm711 <92116279+zm711@users.noreply.github.com> Date: Tue, 14 May 2024 16:34:14 -0400 Subject: [PATCH 2/2] add for sparsity too --- src/spikeinterface/core/sparsity.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spikeinterface/core/sparsity.py b/src/spikeinterface/core/sparsity.py index fd13a351ae..415ca42548 100644 --- a/src/spikeinterface/core/sparsity.py +++ b/src/spikeinterface/core/sparsity.py @@ -331,7 +331,7 @@ def from_snr(cls, templates_or_sorting_analyzer, threshold, noise_levels=None, p return_scaled = templates_or_sorting_analyzer.return_scaled elif isinstance(templates_or_sorting_analyzer, Templates): assert noise_levels is not None - return_scaled = True + return_scaled = templates_or_sorting_analyzer.is_scaled mask = np.zeros((unit_ids.size, channel_ids.size), dtype="bool") @@ -369,7 +369,7 @@ def from_ptp(cls, templates_or_sorting_analyzer, threshold, noise_levels=None): return_scaled = templates_or_sorting_analyzer.return_scaled elif isinstance(templates_or_sorting_analyzer, Templates): assert noise_levels is not None - return_scaled = True + return_scaled = templates_or_sorting_analyzer.is_scaled from .template_tools import get_dense_templates_array