Skip to content

Commit e8c4cbb

Browse files
author
Mathieu Scheltienne
committed
try fix for epochs
1 parent 1c60e82 commit e8c4cbb

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

src/mne_lsl/stream/epochs.py

+21-8
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,9 @@ def _acquire(self) -> None:
439439
return
440440
# split the different acquisition scenarios to retrieve new events to add to
441441
# the buffer.
442-
data, ts = self._stream.get_data(exclude=())
443-
data, ts = _remove_empty_elements(data, ts)
442+
data, ts = _remove_empty_elements(
443+
self._stream._buffer[:, :].T, self._stream._timestamps[:]
444+
)
444445
if self._event_stream is None:
445446
picks_events = _picks_to_idx(
446447
self._stream._info, self._event_channels, exclude="bads"
@@ -461,10 +462,16 @@ def _acquire(self) -> None:
461462
self._event_stream is not None
462463
and self._event_stream._info["sfreq"] != 0
463464
):
464-
data_events, ts_events = self._event_stream.get_data(
465-
picks=self._event_channels, exclude=()
465+
picks = _picks_to_idx(
466+
self._event_stream._info,
467+
self._event_channels,
468+
none="all",
469+
exclude=(),
470+
)
471+
data_events, ts_events = _remove_empty_elements(
472+
self._event_stream._buffer[:, picks].T,
473+
self._event_stream._timestamps[:],
466474
)
467-
data_events, ts_events = _remove_empty_elements(data_events, ts_events)
468475
events = _find_events_in_stim_channels(
469476
data_events, self._event_channels, self._info["sfreq"]
470477
)
@@ -484,10 +491,16 @@ def _acquire(self) -> None:
484491
# don't select only the new events as they might all fall outside of
485492
# the attached stream ts buffer, instead always look through all
486493
# available events.
487-
data_events, ts_events = self._event_stream.get_data(
488-
picks=self._event_channels, exclude=()
494+
picks = _picks_to_idx(
495+
self._event_stream._info,
496+
self._event_channels,
497+
none="all",
498+
exclude=(),
499+
)
500+
data_events, ts_events = _remove_empty_elements(
501+
self._event_stream._buffer[:, picks].T,
502+
self._event_stream._timestamps[:],
489503
)
490-
data_events, ts_events = _remove_empty_elements(data_events, ts_events)
491504
events = np.vstack(
492505
[
493506
np.arange(ts_events.size, dtype=np.int64),

0 commit comments

Comments
 (0)