Skip to content

Commit fde7709

Browse files
authored
Merge pull request #4010 from alejoe91/fix-get-neo-blocks-streams
Fix get_neo_* functions
2 parents 1e966d0 + 23d8400 commit fde7709

2 files changed

Lines changed: 19 additions & 5 deletions

File tree

src/spikeinterface/extractors/neoextractors/__init__.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,18 @@
8686
SpikeGLXEventExtractor: dict(wrapper_string="read_spikeglx_event", wrapper_class=read_spikeglx_event),
8787
MaxwellEventExtractor: dict(wrapper_string="read_maxwell_event", wrapper_class=read_maxwell_event),
8888
}
89+
90+
91+
# Utils dicts used for get_neo_extractor and get_neo_streams
92+
neo_recording_class_dict = {
93+
rec_class.__name__.replace("Recording", "").replace("Extractor", "").lower(): rec_class
94+
for rec_class in neo_recording_extractors_dict.keys()
95+
}
96+
neo_sorting_class_dict = {
97+
sort_class.__name__.replace("Sorting", "").replace("Extractor", "").lower(): sort_class
98+
for sort_class in neo_sorting_extractors_dict.keys()
99+
}
100+
neo_event_class_dict = {
101+
event_class.__name__.replace("Event", "").replace("Extractor", "").lower(): event_class
102+
for event_class in neo_event_extractors_dict.keys()
103+
}

src/spikeinterface/extractors/neoextractors/neo_utils.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,10 @@ def get_neo_num_blocks(extractor_name, *args, **kwargs) -> int:
5656

5757

5858
def get_neo_extractor(extractor_name):
59-
from spikeinterface.extractors.extractor_classes import recording_extractor_full_dict
59+
from spikeinterface.extractors.neoextractors import neo_recording_class_dict
6060

61-
assert extractor_name in recording_extractor_full_dict, (
62-
f"{extractor_name} not an extractor name:" f"\n{list(recording_extractor_full_dict.keys())}"
61+
assert extractor_name in neo_recording_class_dict, (
62+
f"{extractor_name} not an extractor name:" f"\n{list(neo_recording_class_dict.keys())}"
6363
)
64-
neo_extractor = recording_extractor_full_dict[extractor_name]
65-
assert issubclass(neo_extractor, NeoBaseRecordingExtractor), f"{extractor_name} is not a NEO recording extractor!"
64+
neo_extractor = neo_recording_class_dict[extractor_name]
6665
return neo_extractor

0 commit comments

Comments
 (0)