Updating make_epochs to current version of mne #17
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
In stream.py calling the Epochs function has been updated to the current version in mne-python. The making of events from marker stream data has been made more explicit. Minor changes have been made in the send_eeg_data.py demonstration file.
stfnrpplngr
commented
May 30, 2018
| @@ -75,9 +75,8 @@ def make_events(data, marker_stream, event_duration=0): | |||
| lower_time_limit = data[-1, 0] | |||
| upper_time_limit = data[-1, -1] | |||
| # Copy markers into a Numpy ndarray. | |||
| tmp = np.array([row[:] for row in marker_stream.data | |||
| if upper_time_limit >= row[-1] >= lower_time_limit], | |||
| dtype=np.int32) | |||
There was a problem hiding this comment.
Without sticking to integer values, fine grained times (because of a high sampling rate) don't end up in confusing values after rounding.
| @@ -38,9 +37,9 @@ | |||
| i = 1 | |||
| while True: | |||
| y = np.sin(2 * np.pi * f * i / Fs) | |||
| sample = [y for __ in xrange(n_chs)] | |||
| sample = [y for __ in range(n_chs)] | |||
There was a problem hiding this comment.
In Python 3, there is no xrange.
| @@ -298,11 +297,11 @@ def make_epochs(self, marker_stream, data_duration=None, events=None, | |||
| raw = self.ica.apply(raw) | |||
| # Should this be changed? ICA.apply() works in-place on raw. | |||
| return Epochs(raw, events, event_id=event_id, tmin=tmin, tmax=tmax, | |||
| baseline=baseline, picks=picks, name=name, | |||
| baseline=baseline, picks=picks, | |||
There was a problem hiding this comment.
Those arguments aren't in the Epochs function of mne-python anymore.
stfnrpplngr
changed the title
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.
In stream.py calling the
Epochsfunction has been updated to the current version in mne-python.The making of events from
marker streamdata has been made more explicit.Minor changes have been made in the send_eeg_data.py demonstration file.