Skip to content

Commit d44dbaa

Browse files
authored
fix(spikeglx): bugfix loading spikeglx data
1 parent cd65539 commit d44dbaa

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

element_array_ephys/ephys_no_curation.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,15 @@ def make(self, key):
338338
supported_probe_types = probe.ProbeType.fetch("probe_type")
339339

340340
if acq_software == "SpikeGLX":
341-
spikeglx_meta_filepath = get_spikeglx_meta_filepath(key)
342-
spikeglx_meta = spikeglx.SpikeGLXMeta(spikeglx_meta_filepath)
341+
for meta_filepath in ephys_meta_filepaths:
342+
spikeglx_meta = spikeglx.SpikeGLXMeta(meta_filepath)
343+
if str(spikeglx_meta.probe_SN) == inserted_probe_serial_number:
344+
spikeglx_meta_filepath = meta_filepath
345+
break
346+
else:
347+
raise FileNotFoundError(
348+
"No SpikeGLX data found for probe insertion: {}".format(key)
349+
)
343350

344351
if spikeglx_meta.probe_model not in supported_probe_types:
345352
raise NotImplementedError(

element_array_ephys/spike_sorting/si_spike_sorting.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,13 @@ def make(self, key):
117117
assert len(oe_probe.recording_info["recording_files"]) == 1
118118
data_dir = oe_probe.recording_info["recording_files"][0]
119119
else:
120-
acq_software = acq_software.replace(" ", "").lower()
121-
si_extractor: si.extractors.neoextractors = (
122-
si.extractors.extractorlist.recording_extractor_full_dict[acq_software]
123-
) # data extractor object
120+
raise NotImplementedError(
121+
f"SpikeInterface processing for {acq_software} not yet implemented."
122+
)
123+
acq_software = acq_software.replace(" ", "").lower()
124+
si_extractor: si.extractors.neoextractors = (
125+
si.extractors.extractorlist.recording_extractor_full_dict[acq_software]
126+
) # data extractor object
124127

125128
stream_names, stream_ids = si.extractors.get_neo_streams(
126129
acq_software, folder_path=data_dir

0 commit comments

Comments
 (0)