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] Fix reject_tmin and reject_tmax for reject_by_annotation in mne.Epochs #7967

Merged
merged 4 commits into from
Jul 7, 2020
Merged

[MRG] Fix reject_tmin and reject_tmax for reject_by_annotation in mne.Epochs #7967

merged 4 commits into from
Jul 7, 2020

Conversation

sappelhoff
Copy link
Member

closes #7958

@sappelhoff sappelhoff changed the title Fix reject_tmin and reject_tmax for reject_by_annotations in mne.Epochs Fix reject_tmin and reject_tmax for reject_by_annotation in mne.Epochs Jul 6, 2020
@larsoner
Copy link
Member

larsoner commented Jul 6, 2020

Hooray TDD! :)

@sappelhoff sappelhoff marked this pull request as ready for review July 6, 2020 20:36
@sappelhoff
Copy link
Member Author

okay, I think I patched it :-) ready for review

@sappelhoff sappelhoff changed the title Fix reject_tmin and reject_tmax for reject_by_annotation in mne.Epochs [MRG] Fix reject_tmin and reject_tmax for reject_by_annotation in mne.Epochs Jul 7, 2020
larsoner
larsoner approved these changes Jul 7, 2020
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.

LGTM +1 for merge

@agramfort agramfort merged commit 85bc006 into mne-tools:master Jul 7, 2020
@agramfort
Copy link
Member

thx @sappelhoff

@sappelhoff sappelhoff deleted the rej branch July 7, 2020 13:16
larsoner added a commit to larsoner/mne-python that referenced this pull request Jul 8, 2020
@larsoner
Merge remote-tracking branch 'upstream/master' into refactor
b60f9b0 
* upstream/master: (30 commits)
  MRG: Add remove_labels to _Brain (mne-tools#7964)
  Add get_picked_points (mne-tools#7963)
  ENH: Add OpenGL info to mne sys_info (mne-tools#7976)
  [MRG] Fix reject_tmin and reject_tmax for reject_by_annotation in mne.Epochs (mne-tools#7967)
  mrg: Add scalar mult and div operators for AverageTFR (mne-tools#7957)
  MRG, MAINT: Cleaner workaround for Sphinx linking issue (mne-tools#7970)
  MRG, ENH: Speed up epochs.copy (mne-tools#7968)
  MRG, BUG: Allow ref mags to have a comp grade (mne-tools#7965)
  do not forget to pass adjacency (mne-tools#7961)
  [MRG] fix Issue with stc.project after restricting to a label (mne-tools#7950)
  Only process nirx event file if present (mne-tools#7951)
  MRG+1: BUG: info['bads'] order shouldn't matter in write_evokeds() (mne-tools#7954)
  Fix some small glitches introduced via mne-tools#7845 (mne-tools#7952)
  Add time player (mne-tools#7940)
  MAINT: Clean up VTK9 offset array [circle front] (mne-tools#7953)
  MAINT: Skip a few more on macOS (mne-tools#7948)
  fix links [skip travis] (mne-tools#7949)
  MRG, MAINT: Tweak CIs (mne-tools#7943)
  MRG, BUG: Fix vector scaling (mne-tools#7934)
  MRG, VIZ, BUG: handle CSD channel type when topo plotting (mne-tools#7935)
  ...
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

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

Successfully merging this pull request may close these issues.

"reject_tmin" and "reject_tmax" params in Epochs are not applied for "reject_by_annotation"
3 participants
@sappelhoff @larsoner @agramfort