diff --git a/src/spikeinterface/extractors/neoextractors/openephys.py b/src/spikeinterface/extractors/neoextractors/openephys.py index f421d285f5..739425b6c7 100644 --- a/src/spikeinterface/extractors/neoextractors/openephys.py +++ b/src/spikeinterface/extractors/neoextractors/openephys.py @@ -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: diff --git a/src/spikeinterface/extractors/neoextractors/spikegadgets.py b/src/spikeinterface/extractors/neoextractors/spikegadgets.py index 1f1f808ba8..95c3a6886b 100644 --- a/src/spikeinterface/extractors/neoextractors/spikegadgets.py +++ b/src/spikeinterface/extractors/neoextractors/spikegadgets.py @@ -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 @@ -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