Skip to content

MRG: Backport #10619 and #10620#10621

Merged
larsoner merged 7 commits intomne-tools:maint/1.0from
hoechenberger:backport/10619
May 11, 2022
Merged

MRG: Backport #10619 and #10620#10621
larsoner merged 7 commits intomne-tools:maint/1.0from
hoechenberger:backport/10619

Conversation

@hoechenberger
Copy link
Copy Markdown
Member

@hoechenberger hoechenberger commented May 11, 2022 •
edited by larsoner
Loading

Closes #10623

hoechenberger and others added 2 commits May 11, 2022 10:39
@hoechenberger @alexrockhill
Drop EEG rejection thresholds when replacing EEG with CSD channels (m…
a4c6eee 
…ne-tools#10619)

* Drop EEG rejection thresholds when replacing EEG with CSD channels

This is an attempt to fix the issue reported at
https://mne.discourse.group/t/saving-epoch-error-no-eeg-channel-found

* fix, working version

* Update doc/changes/latest.inc

Co-authored-by: Richard Höchenberger <richard.hoechenberger@gmail.com>

Co-authored-by: Alex <aprockhill@mailbox.org>
@hoechenberger
Simplify mne-tools#10619 (mne-tools#10620)
94fb49a
@hoechenberger hoechenberger marked this pull request as ready for review May 11, 2022 08:58
@hoechenberger hoechenberger changed the title Backport #10619 and #10620 MRG: Backport #10619 and #10620 May 11, 2022
@hoechenberger
Copy link
Copy Markdown
Member Author

hoechenberger commented May 11, 2022

Test failures appear unrelated to me, but I'm not 100% certain for Ultraslow_PG

@larsoner Could you please take a look once you have a minute to spare, and merge if all is good? Thank you

@hoechenberger
Copy link
Copy Markdown
Member Author

hoechenberger commented May 11, 2022 •
edited
Loading

@hoechenberger hoechenberger requested a review from @britta-wstnr as a code owner 4 minutes ago

Britta I swear, I didn't do anything lol … no idea how that happened?

@hoechenberger
Copy link
Copy Markdown
Member Author

hoechenberger commented May 11, 2022 •
edited
Loading

Britta I swear, I didn't do anything lol … no idea how that happened?

Ah, I suppose it's @larsoner's fault by touching beamformer tests 👍
I'm innocent! 😇

@larsoner
Copy link
Copy Markdown
Member

larsoner commented May 11, 2022

It happened automatically because I pushed a commit that touched beamformer code and @britta-wstnr is a code owner. This is just a backport of the tol adjustment in main, though, so @britta-wstnr you can ignore :)

@hoechenberger I pushed a commit to fix #10623 as well, I'll test locally. It fixes some of the colors but not all, which I think is okay.

@hoechenberger
Copy link
Copy Markdown
Member Author

hoechenberger commented May 11, 2022

Thanks @larsoner!!

@hoechenberger hoechenberger removed the request for review from britta-wstnr May 11, 2022 16:28
@larsoner
Copy link
Copy Markdown
Member

larsoner commented May 11, 2022

Locally I can reproduce #10623 on maint/1.0 and it's fixed on this PR:
Screen Shot 2022-05-11 at 12 32 51 PM

@larsoner larsoner merged commit e711615 into mne-tools:maint/1.0 May 11, 2022
@hoechenberger hoechenberger deleted the backport/10619 branch May 11, 2022 20:58
@hoechenberger
Copy link
Copy Markdown
Member Author

hoechenberger commented May 11, 2022

Thanks @larsoner

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@agramfort agramfort agramfort 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.

3 participants

@hoechenberger @larsoner @agramfort