@@ -439,8 +439,9 @@ def _acquire(self) -> None:
439
439
return
440
440
# split the different acquisition scenarios to retrieve new events to add to
441
441
# 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
+ )
444
445
if self ._event_stream is None :
445
446
picks_events = _picks_to_idx (
446
447
self ._stream ._info , self ._event_channels , exclude = "bads"
@@ -461,10 +462,16 @@ def _acquire(self) -> None:
461
462
self ._event_stream is not None
462
463
and self ._event_stream ._info ["sfreq" ] != 0
463
464
):
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 [:],
466
474
)
467
- data_events , ts_events = _remove_empty_elements (data_events , ts_events )
468
475
events = _find_events_in_stim_channels (
469
476
data_events , self ._event_channels , self ._info ["sfreq" ]
470
477
)
@@ -484,10 +491,16 @@ def _acquire(self) -> None:
484
491
# don't select only the new events as they might all fall outside of
485
492
# the attached stream ts buffer, instead always look through all
486
493
# 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 [:],
489
503
)
490
- data_events , ts_events = _remove_empty_elements (data_events , ts_events )
491
504
events = np .vstack (
492
505
[
493
506
np .arange (ts_events .size , dtype = np .int64 ),
0 commit comments