Skip to content

Use probeinterface's renamed Neuropixels readers and new probe detectors #4593

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

Open
h-mayorquin wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −15
Open

Use probeinterface's renamed Neuropixels readers and new probe detectors #4593

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
12 changes: 5 additions & 7 deletions src/spikeinterface/extractors/neoextractors/openephys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,14 +321,12 @@ def __init__(
if "NI-DAQmx" not in stream_name:
settings_file = node_structure["experiments"][exp_id]["settings_file"]

if Path(settings_file).is_file():
probe = probeinterface.read_openephys(
settings_file=settings_file, stream_name=oe_stream_name, raise_error=False
if Path(settings_file).is_file() and probeinterface.has_neuropixels_probes(
settings_file, stream_name=oe_stream_name
):
probe = probeinterface.read_openephys_neuropixels(
settings_file=settings_file, stream_name=oe_stream_name
)
else:
probe = None

if probe is not None:
if probe.shank_ids is not None:
self.set_probe(probe, in_place=True, group_mode="by_shank")
else:
Expand Down
10 changes: 2 additions & 8 deletions src/spikeinterface/extractors/neoextractors/spikegadgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
from pathlib import Path

import packaging

import packaging.version
import probeinterface
from spikeinterface.core.core_tools import define_function_from_class

Expand Down Expand Up @@ -56,11 +53,8 @@ def __init__(
)
self._kwargs.update(dict(file_path=str(Path(file_path).absolute()), stream_id=stream_id))

probegroup = None # TODO remove once probeinterface is updated to 0.2.22 in the pyproject.toml
if packaging.version.parse(probeinterface.__version__) > packaging.version.parse("0.2.21"):
probegroup = probeinterface.read_spikegadgets(file_path, raise_error=False)

if probegroup is not None:
if probeinterface.has_spikegadgets_neuropixels_probes(file_path):
probegroup = probeinterface.read_spikegadgets_neuropixels(file_path)
self.set_probegroup(probegroup, in_place=True)

@classmethod
Expand Down
Loading