Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class TestSpikeLocationsExtension(AnalyzerExtensionCommonTestSuite):
dict(method="center_of_mass", spike_retriever_kwargs=dict(channel_from_template=True)),
dict(method="center_of_mass", spike_retriever_kwargs=dict(channel_from_template=False)),
dict(method="monopolar_triangulation"),
dict(method="grid_convolution"),
dict(method="grid_convolution", method_kwargs=dict(n_peaks=100)),
],
)
def test_extension(self, params):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ def get_localization_pipeline_nodes(
# How do you get peaks

method_kwargs = method_kwargs.copy()
n_peaks = method_kwargs.pop("n_peaks", None)
if n_peaks is not None:
prototype_extra_kwargs = {"n_peaks": n_peaks}
else:
prototype_extra_kwargs = {}
method_kwargs["prototype"], _, _ = get_prototype_and_waveforms_from_peaks(
recording,
peaks=peaks_or_spikes,
Expand All @@ -68,6 +73,7 @@ def get_localization_pipeline_nodes(
channel_index_array=channel_index_array,
job_kwargs=job_kwargs,
seed=seed,
**prototype_extra_kwargs,
)

localization_nodes = method_class(recording, parents=[peak_source, extract_dense_waveforms], **method_kwargs)
Expand Down
9 changes: 7 additions & 2 deletions src/spikeinterface/sortingcomponents/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,23 +130,28 @@ def get_prototype_and_waveforms_from_peaks(
nbefore = ms_to_samples(ms_before, recording.sampling_frequency)
nafter = ms_to_samples(ms_after, recording.sampling_frequency)

few_peaks = select_peaks(
few_peaks, few_indices = select_peaks(
peaks,
recording=recording,
method="uniform",
n_peaks=n_peaks,
margin=(nbefore, nafter),
channel_index_array=channel_index_array,
return_indices=True,
seed=seed,
)
if channel_index_array is not None:
few_channel_index_array = channel_index_array[few_indices]
else:
few_channel_index_array = None
waveforms = extract_waveform_at_max_channel(
recording,
few_peaks,
ms_before=ms_before,
ms_after=ms_after,
job_kwargs=job_kwargs,
job_name="waveform prototype",
channel_index_array=channel_index_array,
channel_index_array=few_channel_index_array,
)

with np.errstate(divide="ignore", invalid="ignore"):
Expand Down
Loading