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
17 changes: 2 additions & 15 deletions src/spikeinterface/postprocessing/template_similarity.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,6 @@ def _compute_similarity_matrix_numpy(
overlapping_templates = np.flatnonzero(np.sum(local_mask, 1))
tgt_templates = tgt_sliced_templates[overlapping_templates]
for gcount, j in enumerate(overlapping_templates):
# symmetric values are handled later
if same_array and j < i:
# no need exhaustive looping when same template
continue
src = src_template[:, local_mask[j]].reshape(1, -1)
tgt = (tgt_templates[gcount][:, local_mask[j]]).reshape(1, -1)

Expand All @@ -259,10 +255,8 @@ def _compute_similarity_matrix_numpy(
distances[count, i, j] = 1 - distances[count, i, j]

if same_array:
distances[count, j, i] = distances[count, i, j]
distances[num_shifts_both_sides - count - 1, j, i] = distances[count, i, j]

if same_array and num_shifts != 0:
distances[num_shifts_both_sides - count - 1] = distances[count].T
return distances


Expand Down Expand Up @@ -331,10 +325,6 @@ def _compute_similarity_matrix_numba(
for gcount in range(len(overlapping_templates)):

j = overlapping_templates[gcount]
# symmetric values are handled later
if same_array and j < i:
# no need exhaustive looping when same template
continue
src = src_template[:, local_mask[j]].flatten()
tgt = (tgt_templates[gcount][:, local_mask[j]]).flatten()

Expand Down Expand Up @@ -370,10 +360,7 @@ def _compute_similarity_matrix_numba(
distances[count, i, j] = 1 - distances[count, i, j]

if same_array:
distances[count, j, i] = distances[count, i, j]

if same_array and num_shifts != 0:
distances[num_shifts_both_sides - count - 1] = distances[count].T
distances[num_shifts_both_sides - count - 1, j, i] = distances[count, i, j]

return distances

Expand Down
1 change: 0 additions & 1 deletion src/spikeinterface/sorters/internal/lupin.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ def _run_from_folder(cls, sorter_output_folder, params, verbose):
from spikeinterface.sortingcomponents.peak_detection import detect_peaks
from spikeinterface.sortingcomponents.peak_selection import select_peaks
from spikeinterface.sortingcomponents.clustering.main import find_clusters_from_peaks, clustering_methods
from spikeinterface.sortingcomponents.tools import remove_empty_templates
from spikeinterface.preprocessing import correct_motion
from spikeinterface.sortingcomponents.motion import InterpolateMotionRecording
from spikeinterface.sortingcomponents.tools import clean_templates, compute_sparsity_from_peaks_and_label
Expand Down