Skip to content

Commit 250ea6a

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/separate_open_ephys' into separate_open_ephys
2 parents 4b7418a + b819f5c commit 250ea6a

3 files changed

Lines changed: 3 additions & 10 deletions

File tree

tests/data/openephys/OE_OneBox-NP2014-binary/Record_Node_101/experiment1/recording1/structure.oebin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7845,4 +7845,4 @@
78457845
}
78467846
],
78477847
"spikes": []
7848-
}
7848+
}

tests/data/openephys/OE_OneBox-NP2014-binary/Record_Node_101/settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,4 +533,4 @@
533533
<COLOR ID="807" R="0" G="0" B="0" />
534534
</PROCESSORLIST>
535535
<UICOMPONENT isProcessorListOpen="1" isEditorViewportOpen="1" />
536-
</SETTINGS>
536+
</SETTINGS>

tests/test_io/test_openephys.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -679,14 +679,7 @@ def test_read_openephys_onebox_nonsequential_wiring():
679679
have sequential order where identity wiring is accidentally correct.
680680
"""
681681
settings = data_path / "OE_OneBox-NP2014-binary" / "Record_Node_101" / "settings.xml"
682-
oebin = (
683-
data_path
684-
/ "OE_OneBox-NP2014-binary"
685-
/ "Record_Node_101"
686-
/ "experiment1"
687-
/ "recording1"
688-
/ "structure.oebin"
689-
)
682+
oebin = data_path / "OE_OneBox-NP2014-binary" / "Record_Node_101" / "experiment1" / "recording1" / "structure.oebin"
690683
stream_name = "OneBox-111.ProbeA"
691684

692685
probe = read_openephys(settings, stream_name=stream_name, oebin_file=oebin)

0 commit comments

Comments
 (0)