Skip to content

Commit f655448

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/fix_openephys_naming' into fix_openephys_naming
# Conflicts: # tests/test_io/test_openephys.py
2 parents b8d7064 + a041bc8 commit f655448

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

tests/test_io/test_openephys.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ def _assert_contact_ids_match_canonical_pattern(probe, label=""):
3838
### TESTS ###
3939
def test_NP2_OE_1_0():
4040
# NP2 1-shank
41-
probeA = read_openephys_neuropixels(data_path / "OE_1.0_Neuropix-PXI-multi-probe" / "settings.xml", probe_name="ProbeA")
41+
probeA = read_openephys_neuropixels(
42+
data_path / "OE_1.0_Neuropix-PXI-multi-probe" / "settings.xml", probe_name="ProbeA"
43+
)
4244
probe_dict = probeA.to_dict(array_as_list=True)
4345
validate_probe_dict(probe_dict)
4446
assert probeA.get_shank_count() == 1
@@ -101,7 +103,9 @@ def test_probe_part_number_mismatch_with_catalogue():
101103

102104
def test_NP1_subset():
103105
# NP1 - 200 channels selected by recording_state in Record Node
104-
probe_ap = read_openephys_neuropixels(data_path / "OE_Neuropix-PXI-subset" / "settings.xml", stream_name="ProbeA-AP")
106+
probe_ap = read_openephys_neuropixels(
107+
data_path / "OE_Neuropix-PXI-subset" / "settings.xml", stream_name="ProbeA-AP"
108+
)
105109
probe_dict = probe_ap.to_dict(array_as_list=True)
106110
validate_probe_dict(probe_dict)
107111

@@ -111,7 +115,9 @@ def test_NP1_subset():
111115
assert "adc_group" in probe_ap.contact_annotations
112116
assert "adc_sample_order" in probe_ap.contact_annotations
113117

114-
probe_lf = read_openephys_neuropixels(data_path / "OE_Neuropix-PXI-subset" / "settings.xml", stream_name="ProbeA-LFP")
118+
probe_lf = read_openephys_neuropixels(
119+
data_path / "OE_Neuropix-PXI-subset" / "settings.xml", stream_name="ProbeA-LFP"
120+
)
115121
probe_dict = probe_lf.to_dict(array_as_list=True)
116122
validate_probe_dict(probe_dict)
117123

@@ -492,7 +498,9 @@ def test_read_openephys_contact_ids_match_canonical_pattern():
492498
(see https://github.com/SpikeInterface/probeinterface/pull/383#discussion_r2650588006).
493499
"""
494500
# Path A (SELECTED_ELECTRODES): OE 1.0 dataset
495-
probe = read_openephys_neuropixels(data_path / "OE_1.0_Neuropix-PXI-multi-probe" / "settings.xml", probe_name="ProbeA")
501+
probe = read_openephys_neuropixels(
502+
data_path / "OE_1.0_Neuropix-PXI-multi-probe" / "settings.xml", probe_name="ProbeA"
503+
)
496504
_assert_contact_ids_match_canonical_pattern(probe, "OE_1.0 ProbeA")
497505

498506
# Path B (CHANNELS): NP2 dataset (single shank)
@@ -532,7 +540,9 @@ def test_read_openephys_contact_ids_match_canonical_pattern():
532540

533541
# QuadBase: NP2020 (4 probes)
534542
for i in range(4):
535-
probe = read_openephys_neuropixels(data_path / "OE_Neuropix-PXI-QuadBase" / "settings.xml", probe_name=f"ProbeC-{i+1}")
543+
probe = read_openephys_neuropixels(
544+
data_path / "OE_Neuropix-PXI-QuadBase" / "settings.xml", probe_name=f"ProbeC-{i+1}"
545+
)
536546
_assert_contact_ids_match_canonical_pattern(probe, f"QuadBase ProbeC-{i+1}")
537547

538548

0 commit comments

Comments
 (0)