Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MRG] Add units parameter to get_data for Epochs #9553

Merged
merged 15 commits into from Jul 15, 2021
Merged

[MRG] Add units parameter to get_data for Epochs #9553

merged 15 commits into from Jul 15, 2021

Conversation

sappelhoff
Copy link
Member

@sappelhoff sappelhoff commented Jul 12, 2021 •
edited

closes #8473

Follow up to #9136

Adds the units parameter to the get_data method of Epochs.

Work in Progress

To do

  • refactor units in Raw
  • add units to Epochs
  • add tests for Epochs
  • pull units docs into docdict
  • document all params
  • add whatsnew entry

@sappelhoff sappelhoff added the ENH label Jul 12, 2021
@sappelhoff sappelhoff changed the title [WIP] Add units parameter to get_data for Epochs [MRG] Add units parameter to get_data for Epochs Jul 12, 2021
@sappelhoff sappelhoff mentioned this pull request Jul 12, 2021
Merged
2 tasks
@sappelhoff sappelhoff mentioned this pull request Jul 13, 2021
Merged
11 tasks
@sappelhoff
Copy link
Member Author

@HanBnrd perhaps you want to review this PR, as it builds on the stuff you coded during the last sprint :-)

larsoner
larsoner reviewed Jul 13, 2021
View reviewed changes
mne/epochs.py Outdated Show resolved Hide resolved
mne/epochs.py Outdated Show resolved Hide resolved
mne/epochs.py Outdated Show resolved Hide resolved
mne/epochs.py Show resolved Hide resolved
@HanBnrd
Copy link
Contributor

HanBnrd commented Jul 13, 2021

@HanBnrd perhaps you want to review this PR, as it builds on the stuff you coded during the last sprint :-)

Thanks for implementing this @sappelhoff! Just went through the code, looks good to me 🙂

sappelhoff
sappelhoff commented Jul 15, 2021
View reviewed changes
mne/epochs.py Outdated Show resolved Hide resolved
mne/epochs.py Outdated Show resolved Hide resolved
mne/epochs.py Show resolved Hide resolved
sappelhoff and others added 5 commits July 15, 2021 15:53
@sappelhoff @larsoner
Apply suggestions from code review
95b6c66 
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
@sappelhoff @HanBnrd
Merge branch 'enh/get_data/units_epochs' of github.com:sappelhoff/mne…
46099bb 
…-python into enh/get_data/units_epochs

Co-authored-by: Johann Benerradi <johann.benerradi@gmail.com>
@sappelhoff
base.py: only scale if units not None
db68722
@sappelhoff
misc fixes and tests
290e474
@sappelhoff
add whatsnew
5addbcb
sappelhoff
sappelhoff commented Jul 15, 2021
View reviewed changes
Copy link
Member Author

@sappelhoff sappelhoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review @larsoner @HanBnrd I addressed your points and the PR is ready for more feedback or for merging.

larsoner
larsoner reviewed Jul 15, 2021
View reviewed changes
Copy link
Member

@larsoner larsoner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than a couple of minor simplification ideas, LGTM!

doc/changes/latest.inc Outdated Show resolved Hide resolved
mne/epochs.py Outdated Show resolved Hide resolved
mne/epochs.py Outdated Show resolved Hide resolved
sappelhoff and others added 2 commits July 15, 2021 17:01
@sappelhoff @larsoner
Update doc/changes/latest.inc
6ffefc6 
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
@sappelhoff
simplify conditional clauses
ce93758
HanBnrd
HanBnrd approved these changes Jul 15, 2021
View reviewed changes
Copy link
Contributor

@HanBnrd HanBnrd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 👍

@larsoner larsoner merged commit 19bdd79 into mne-tools:main Jul 15, 2021
@larsoner
Copy link
Member

Thanks @sappelhoff !

@sappelhoff sappelhoff deleted the enh/get_data/units_epochs branch July 15, 2021 18:07
@sappelhoff sappelhoff mentioned this pull request Jul 16, 2021
Merged
@HanBnrd HanBnrd mentioned this pull request Sep 29, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@larsoner larsoner larsoner approved these changes

@HanBnrd HanBnrd HanBnrd approved these changes

@agramfort agramfort Awaiting requested review from agramfort agramfort is a code owner

Assignees
No one assigned
Labels
ENH
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

FR: Add "unit" parameter to get_data method for Epochs
3 participants
@sappelhoff @HanBnrd @larsoner