Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing NP2.4 and NP-Ultra probe part number #243

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Add missing NP2.4 and NP-Ultra probe part number #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bfac0e
Add missing NP2.4 probe part number
alejoe91 Dec 5, 2023
78c90fc
Add missing NP-Ultra model and fix custom_probe naming in OpenEphys
alejoe91 Dec 6, 2023
8a30e6d
Do not use custom probe name if same as serial number
alejoe91 Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/probeinterface/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ def write_csv(file, probe):
),
"x_shift": -11,
},
# Ultra probe
# Ultra probes
"1100": {
"model_name": "Neuropixels Ultra",
"x_pitch": 6,
Expand All @@ -979,6 +979,26 @@ def write_csv(file, probe):
),
"x_shift": -8,
},
"1121": {
"model_name": "Neuropixels Ultra - Type 2",
"x_pitch": 6,
"y_pitch": 3,
"contact_width": 2,
"stagger": 0.0,
"shank_pitch": 0,
"shank_number": 1,
"ncol": 1,
"polygon": polygon_description["default"],
"fields_in_imro_table": (
"channel_ids",
"banks",
"references",
"ap_gains",
"lf_gains",
"ap_hp_filters",
),
"x_shift": 18,
},
# NP-Opto
"1300": {
"model_name": "Neuropixels Opto",
Expand Down Expand Up @@ -1026,9 +1046,11 @@ def write_csv(file, probe):
"NP2003": "2003",
"NP2004": "2004",
"PRB2_1_2_0640_0": "21",
"PRB2_4_2_0640_0": "24",
# Other probes
"NP1100": "1100", # Ultra probe - 1 bank
"NP1110": "1100", # Ultra probe - 16 banks
"NP1121": "1121", # Ultra probe - beta configuration
"NP1300": "1300", # Opto probe
}

Expand Down Expand Up @@ -1533,7 +1555,11 @@ def read_openephys(
"ptype": ptype,
}
# Sequentially assign probe names
np_probe_dict.update({"name": probe_names_used[probe_idx]})
if "custom_probe_name" in np_probe.attrib and np_probe.attrib["custom_probe_name"] != probe_serial_number:
name = np_probe.attrib["custom_probe_name"]
else:
name = probe_names_used[probe_idx]
np_probe_dict.update({"name": name})
np_probes_info.append(np_probe_dict)

# now select correct probe (if multiple)
Expand Down
Loading