Skip to content

Commit

Permalink
try fix for epochs
Browse files Browse the repository at this point in the history
  • Loading branch information
Mathieu Scheltienne committed Nov 28, 2024
1 parent 1c60e82 commit e8c4cbb
Showing 1 changed file with 21 additions and 8 deletions.
29 changes: 21 additions & 8 deletions src/mne_lsl/stream/epochs.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,9 @@ def _acquire(self) -> None:
return
# split the different acquisition scenarios to retrieve new events to add to
# the buffer.
data, ts = self._stream.get_data(exclude=())
data, ts = _remove_empty_elements(data, ts)
data, ts = _remove_empty_elements(
self._stream._buffer[:, :].T, self._stream._timestamps[:]
)
if self._event_stream is None:
picks_events = _picks_to_idx(
self._stream._info, self._event_channels, exclude="bads"
Expand All @@ -461,10 +462,16 @@ def _acquire(self) -> None:
self._event_stream is not None
and self._event_stream._info["sfreq"] != 0
):
data_events, ts_events = self._event_stream.get_data(
picks=self._event_channels, exclude=()
picks = _picks_to_idx(
self._event_stream._info,
self._event_channels,
none="all",
exclude=(),
)
data_events, ts_events = _remove_empty_elements(
self._event_stream._buffer[:, picks].T,
self._event_stream._timestamps[:],
)
data_events, ts_events = _remove_empty_elements(data_events, ts_events)
events = _find_events_in_stim_channels(
data_events, self._event_channels, self._info["sfreq"]
)
Expand All @@ -484,10 +491,16 @@ def _acquire(self) -> None:
# don't select only the new events as they might all fall outside of
# the attached stream ts buffer, instead always look through all
# available events.
data_events, ts_events = self._event_stream.get_data(
picks=self._event_channels, exclude=()
picks = _picks_to_idx(
self._event_stream._info,
self._event_channels,
none="all",
exclude=(),
)
data_events, ts_events = _remove_empty_elements(
self._event_stream._buffer[:, picks].T,
self._event_stream._timestamps[:],
)
data_events, ts_events = _remove_empty_elements(data_events, ts_events)
events = np.vstack(
[
np.arange(ts_events.size, dtype=np.int64),
Expand Down

0 comments on commit e8c4cbb

Please sign in to comment.