Remove try-except

SpikeInterface · Oct 30, 2023 · 1b9ab35 · 1b9ab35
1 parent 9a37e57
commit 1b9ab35
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/spikeinterface/extractors/neoextractors/openephys.py b/src/spikeinterface/extractors/neoextractors/openephys.py
@@ -186,12 +186,11 @@ def __init__(
                 else:
                     self.set_probe(probe, in_place=True)
 
-                # this try-except handles a breaking change in probeinterface after v0.2.18
-                # in the new version, the Neuropixels model name is stored in the "model_name" attribute,
+                # this handles a breaking change in probeinterface after v0.2.18
+                # in the new version, the Neuropixels model name is stored in the "model_name" annotation,
                 # rather than in the "probe_name" annotation
-                try:
-                    model_name = probe.model_name
-                except Exception as e:
+                model_name = probe.annotations.get("model_name", None)
+                if model_name is None:
                     model_name = probe.annotations["probe_name"]
 
                 # load num_channels_per_adc depending on probe type