Skip to content

Commit 8d04e10

Browse files
committed
revert: 🎨 replace SI_READERS with si_extractor
1 parent 6e20a11 commit 8d04e10

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

element_array_ephys/spike_sorting/si_spike_sorting.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ def activate(
4747

4848
SI_SORTERS = [s.replace("_", ".") for s in si.sorters.sorter_dict.keys()]
4949

50-
SI_READERS = {
51-
"Open Ephys": si.extractors.read_openephys,
52-
"SpikeGLX": si.extractors.read_spikeglx,
53-
"Intan": si.extractors.read_intan,
54-
}
55-
5650

5751
@schema
5852
class PreProcessing(dj.Imported):
@@ -108,9 +102,7 @@ def make(self, key):
108102
output_dir = find_full_path(ephys.get_ephys_root_data_dir(), output_dir)
109103
recording_dir = output_dir / sorter_name / "recording"
110104
recording_dir.mkdir(parents=True, exist_ok=True)
111-
recording_file = (
112-
recording_dir / "si_recording.pkl"
113-
) # recording cache to be created for each key
105+
recording_file = recording_dir / "si_recording.pkl"
114106

115107
# Create SI recording extractor object
116108
if acq_software == "SpikeGLX":
@@ -125,12 +117,16 @@ def make(self, key):
125117
assert len(oe_probe.recording_info["recording_files"]) == 1
126118
data_dir = oe_probe.recording_info["recording_files"][0]
127119
else:
128-
raise NotImplementedError(f"Not implemented for {acq_software}")
120+
si_extractor: si.extractors.neoextractors = (
121+
si.extractors.extractorlist.recording_extractor_full_dict[
122+
acq_software.replace(" ", "").lower()
123+
]
124+
) # data extractor object
129125

130126
stream_names, stream_ids = si.extractors.get_neo_streams(
131127
acq_software.strip().lower(), folder_path=data_dir
132128
)
133-
si_recording: si.BaseRecording = SI_READERS[acq_software](
129+
si_recording: si.BaseRecording = si_extractor[acq_software](
134130
folder_path=data_dir, stream_name=stream_names[0]
135131
)
136132

0 commit comments

Comments
 (0)