Skip to content

fix: replace regex probe model check with ProbeType lookup in ephys_precluster #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tabedzki merged 1 commit into from
Aug 11, 2026
Merged

fix: replace regex probe model check with ProbeType lookup in ephys_precluster #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions element_array_ephys/ephys_precluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import importlib
import inspect
import re

import datajoint as dj
import numpy as np
Expand Down Expand Up @@ -218,6 +217,8 @@ def make(self, key):
f" in {session_dir}"
)

supported_probe_types = probe.ProbeType.fetch("probe_type")

if acq_software == "SpikeGLX":
for meta_filepath in ephys_meta_filepaths:
spikeglx_meta = spikeglx.SpikeGLXMeta(meta_filepath)
Expand All @@ -228,7 +229,7 @@ def make(self, key):
"No SpikeGLX data found for probe insertion: {}".format(key)
)

if re.search("(1.0|2.0|2013)", spikeglx_meta.probe_model):
if spikeglx_meta.probe_model in supported_probe_types:
probe_type = spikeglx_meta.probe_model
electrode_query = probe.ProbeType.Electrode & {"probe_type": probe_type}

Expand Down Expand Up @@ -277,7 +278,7 @@ def make(self, key):
"No Open Ephys data found for probe insertion: {}".format(key)
)

if re.search("(1.0|2.0)", probe_data.probe_model):
if probe_data.probe_model in supported_probe_types:
probe_type = probe_data.probe_model
electrode_query = probe.ProbeType.Electrode & {"probe_type": probe_type}

Expand Down
1 change: 1 addition & 0 deletions element_array_ephys/probe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ def create_neuropixels_probe_types():
"neuropixels 2.0 - MS",
"2013",
"NP2004",
"NP2014",
):
if not (ProbeType & {"probe_type": probe_type}):
create_neuropixels_probe(probe_type)
Expand Down
Loading