Skip to content

Commit b4df8f6

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent bd66943 commit b4df8f6

1 file changed

Lines changed: 25 additions & 25 deletions

File tree

src/probeinterface/neuropixels_tools.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ def _parse_openephys_settings(
13121312
"settings_channel_keys": None,
13131313
"elec_ids": None,
13141314
"shank_ids": None,
1315-
"custom_channel_map": None
1315+
"custom_channel_map": None,
13161316
}
13171317

13181318
if selected_electrodes is not None:
@@ -1321,7 +1321,7 @@ def _parse_openephys_settings(
13211321
if probe_custom_channel_maps is not None:
13221322
# Slice custom channel maps to match the number of selected electrodes
13231323
# (required when SYNC channel is present)
1324-
custom_indices = probe_custom_channel_maps[probe_idx][:len(info["selected_electrode_indices"])]
1324+
custom_indices = probe_custom_channel_maps[probe_idx][: len(info["selected_electrode_indices"])]
13251325
info["custom_channel_map"] = custom_indices
13261326
else:
13271327
# Older plugin versions: reverse-engineer electrode IDs from positions
@@ -1407,7 +1407,7 @@ def _parse_openephys_settings(
14071407
if probe_custom_channel_maps is not None:
14081408
# Slice custom channel maps to match the number of selected electrodes
14091409
# (required when SYNC channel is present)
1410-
custom_indices = probe_custom_channel_maps[probe_idx][:len(info["contact_ids"])]
1410+
custom_indices = probe_custom_channel_maps[probe_idx][: len(info["contact_ids"])]
14111411
info["custom_channel_map"] = custom_indices
14121412

14131413
probes_info.append(info)
@@ -1532,28 +1532,28 @@ def _select_openephys_probe_info(
15321532

15331533
def _slice_openephys_catalogue_probe(full_probe: Probe, probe_info: dict) -> Probe:
15341534
"""
1535-
Slice a full catalogue probe using the electrode selection from probe_info.
1536-
1537-
For SELECTED_ELECTRODES (newer plugin), uses the indices directly.
1538-
For CHANNELS (older plugin), matches reverse-engineered contact_ids to the catalogue.
1539-
1540-
<<<<<<< HEAD
1541-
If the `custom_channel_map` field is present in probe_info, due to a "Channel Map" processor in the signal
1542-
=======
1543-
If the `custom_channel_indices` field is present in probe_info, due to a "Channel Map" processor in the signal
1544-
>>>>>>> 1c54d3c9e9e2aefd2a4e678a1e36a242ccfde719
1545-
chain that comes before the "Record Node", it is applied as a further slice after electrode selection.
1546-
1547-
Parameters
1548-
----------
1549-
full_probe : Probe
1550-
Full catalogue probe from `build_neuropixels_probe`.
1551-
probe_info : dict
1552-
Probe info dict from `_parse_openephys_settings`.
1553-
1554-
Returns
1555-
-------
1556-
probe : Probe
1535+
Slice a full catalogue probe using the electrode selection from probe_info.
1536+
1537+
For SELECTED_ELECTRODES (newer plugin), uses the indices directly.
1538+
For CHANNELS (older plugin), matches reverse-engineered contact_ids to the catalogue.
1539+
1540+
<<<<<<< HEAD
1541+
If the `custom_channel_map` field is present in probe_info, due to a "Channel Map" processor in the signal
1542+
=======
1543+
If the `custom_channel_indices` field is present in probe_info, due to a "Channel Map" processor in the signal
1544+
>>>>>>> 1c54d3c9e9e2aefd2a4e678a1e36a242ccfde719
1545+
chain that comes before the "Record Node", it is applied as a further slice after electrode selection.
1546+
1547+
Parameters
1548+
----------
1549+
full_probe : Probe
1550+
Full catalogue probe from `build_neuropixels_probe`.
1551+
probe_info : dict
1552+
Probe info dict from `_parse_openephys_settings`.
1553+
1554+
Returns
1555+
-------
1556+
probe : Probe
15571557
"""
15581558
custom_channel_map = probe_info.get("custom_channel_map")
15591559
if probe_info["selected_electrode_indices"] is not None:

0 commit comments

Comments
 (0)