Don't use public get_data in epoch acquisition to avoid resetting the number of new samples #371
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mscheltienne
added
🐞 bug
mscheltienne
commented
Nov 29, 2024
Comment on lines
+1011
to
+1074
| @pytest.fixture | ||
| def sinfo_marker() -> StreamInfo: | ||
| """Stream info for a marker stream.""" | ||
| sinfo = StreamInfo( | ||
| name="events", | ||
| stype="marker", | ||
| n_channels=1, | ||
| sfreq=0, | ||
| dtype=np.int8, | ||
| source_id=uuid.uuid4().hex, | ||
| ) | ||
| sinfo.set_channel_names(["marker"]) | ||
| return sinfo | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def outlet_marker(sinfo_marker: StreamInfo) -> Generator[StreamOutlet, None, None]: | ||
| """Stream outlet for a marker stream.""" | ||
| outlet = StreamOutlet(sinfo_marker) | ||
| yield outlet | ||
| outlet._del() | ||
| del outlet | ||
|
|
||
|
|
||
| def test_epochs_single_event(mock_lsl_stream, outlet_marker: StreamOutlet): | ||
| """Test epochs with a single event.""" | ||
| stream = StreamLSL( | ||
| 3, name=mock_lsl_stream.name, source_id=mock_lsl_stream.source_id | ||
| ).connect(acquisition_delay=0.1) | ||
| sinfo = outlet_marker.get_sinfo() | ||
| event_stream = StreamLSL(2, name=sinfo.name, source_id=sinfo.source_id).connect( | ||
| acquisition_delay=0.1 | ||
| ) | ||
| epochs = EpochsStream( | ||
| stream, | ||
| bufsize=5, | ||
| event_id=None, | ||
| event_channels="marker", | ||
| event_stream=event_stream, | ||
| tmin=0, | ||
| tmax=1.5, # large tmax to ensure that the event can't be consumed right away | ||
| baseline=None, | ||
| picks="eeg", | ||
| ).connect(acquisition_delay=0) | ||
| assert epochs.n_new_epochs == 0 | ||
| epochs.acquire() | ||
| time.sleep(0.5) | ||
| epochs.acquire() | ||
| assert epochs.n_new_epochs == 0 | ||
| # push a single event, and then acquire it multiple times | ||
| outlet_marker.push_sample(np.array([1], dtype=sinfo.dtype)) | ||
| time.sleep(0.2) | ||
| epochs.acquire() | ||
| assert epochs.n_new_epochs == 0 | ||
| time.sleep(0.2) | ||
| epochs.acquire() | ||
| assert epochs.n_new_epochs == 0 | ||
| # loop until we get it or timeout | ||
| start = time.monotonic() | ||
| while epochs.n_new_epochs == 0 and time.monotonic() - start < 2.6: | ||
| epochs.acquire() | ||
| time.sleep(0.2) | ||
| assert epochs.n_new_epochs == 1 | ||
| assert event_stream.n_new_samples == 1 |
There was a problem hiding this comment.
@mzgsxs this test reproduces your issue and fails on main while it passes on this PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #369