Skip to content

Commit 51f0246

Browse files
authored
Merge pull request #1430 from alejoe91/fix-open-ephys-events
Open Ephys: read events from all streams
2 parents 8a3b9b7 + 3cf300f commit 51f0246

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

neo/rawio/openephysbinaryrawio.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ def explore_folder(dirname, experiment_names=None):
549549
for info in rec_structure["continuous"]:
550550
# when multi Record Node the stream name also contains
551551
# the node name to make it unique
552-
oe_stream_name = Path(info["folder_name"]).name # remove trailing slash
552+
oe_stream_name = info["folder_name"].split("/")[0] # remove trailing slash
553553
if len(node_name) > 0:
554554
stream_name = node_name + "#" + oe_stream_name
555555
else:
@@ -580,8 +580,13 @@ def explore_folder(dirname, experiment_names=None):
580580
if (root / "events").exists() and len(rec_structure["events"]) > 0:
581581
recording["streams"]["events"] = {}
582582
for info in rec_structure["events"]:
583-
oe_stream_name = Path(info["folder_name"]).name # remove trailing slash
584-
stream_name = node_name + "#" + oe_stream_name
583+
# when multi Record Node the stream name also contains
584+
# the node name to make it unique
585+
oe_stream_name = info["folder_name"].split("/")[0] # remove trailing slash
586+
if len(node_name) > 0:
587+
stream_name = node_name + "#" + oe_stream_name
588+
else:
589+
stream_name = oe_stream_name
585590

586591
event_stream = info.copy()
587592
for name in _possible_event_stream_names:

0 commit comments

Comments
 (0)