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

implement channel specific epoch rejection #12219

Draft
wants to merge 48 commits into
base: main
Choose a base branch
from
Draft

implement channel specific epoch rejection #12219

wants to merge 48 commits into from
+51 −3

Commits on Nov 16, 2023

  1. function to reject epochs per channel

    @CarinaFo
    CarinaFo committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    d7ccfd4 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    f94c7e4 View commit details
    Browse the repository at this point in the history

  3. added masked data to channel specific rejection

    @CarinaFo
    CarinaFo committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    32a87f8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'channel_specific_epoch_rejection' of github.com:CarinaF… 

    …o/mne-python into channel_specific_epoch_rejection
    @CarinaFo
    CarinaFo committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    8fccf71 View commit details
    Browse the repository at this point in the history

  5. added masked data to function and to return

    @CarinaFo
    CarinaFo committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    6e6c4a4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    7da2ab5 View commit details
    Browse the repository at this point in the history

  7. updated epochs.average with np.nanmean

    @CarinaFo
    CarinaFo committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    300ce43 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'channel_specific_epoch_rejection' of github.com:CarinaF… 

    …o/mne-python into channel_specific_epoch_rejection
    @CarinaFo
    CarinaFo committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    afd2c8e View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Merge branch 'main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    f5804ab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    880d157 View commit details
    Browse the repository at this point in the history

  3. Update mne/epochs.py 

    Co-authored-by: Dominik Welke <dominik.welke@web.de>
    @CarinaFo @dominikwelke
    CarinaFo and dominikwelke committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    afed69d View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. Merge branch 'main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    194c83a View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Merge branch 'main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    e054119 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge branch 'main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    f742c1e View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. updated changelog for PR11776

    @CarinaFo
    CarinaFo committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    b74d4de View commit details
    Browse the repository at this point in the history

  2. updated github account name

    @CarinaFo
    CarinaFo committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    cbd7083 View commit details
    Browse the repository at this point in the history

  3. resolve merge conflict - forgot to pull before adding to changelog

    @CarinaFo
    CarinaFo committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    8a3eea5 View commit details
    Browse the repository at this point in the history

  4. added contribution to changelog

    @CarinaFo
    CarinaFo committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    eb6ac3d View commit details
    Browse the repository at this point in the history

  5. added second PR number to close both

    @CarinaFo
    CarinaFo committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    7d17f89 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Merge branch 'channel_specific_epoch_rejection' of github.com:CarinaF… 

    …o/mne-python into channel_specific_epoch_rejection
    @CarinaFo
    CarinaFo committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    c84bebb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'mne-tools:main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    9e00065 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Merge branch 'mne-tools:main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    0c20484 View commit details
    Browse the repository at this point in the history

  2. deleted bad epochs function

    @CarinaFo
    CarinaFo committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    0d03885 View commit details
    Browse the repository at this point in the history

  3. added interpolate bad epochs method

    @CarinaFo
    CarinaFo committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    e16cf74 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'channel_specific_epoch_rejection' of github.com:CarinaF… 

    …o/mne-python into channel_specific_epoch_rejection
    @CarinaFo
    CarinaFo committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    b00f2b0 View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    0cb0ed5 View commit details
    Browse the repository at this point in the history

  6. fixed bug in interpolate epochs method

    @CarinaFo
    CarinaFo committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    8a2f95b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'channel_specific_epoch_rejection' of github.com:CarinaF… 

    …o/mne-python into channel_specific_epoch_rejection
    @CarinaFo
    CarinaFo committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    3e9435b View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Merge branch 'main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    341fd25 View commit details
    Browse the repository at this point in the history

  2. added interpolate bad epochs nan to interpolate_bads function

    @CarinaFo
    CarinaFo committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    1e2252e View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    dfbba00 View commit details
    Browse the repository at this point in the history

  4. removed interpolate bad epochs from interpolate_bads due to MixinClass

    @CarinaFo
    CarinaFo committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    cc58b73 View commit details
    Browse the repository at this point in the history

  5. removed interpolate bad epochs

    @CarinaFo
    CarinaFo committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    167f38c View commit details
    Browse the repository at this point in the history

  6. added set bad epochs to NaN method for epochs class

    @CarinaFo
    CarinaFo committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    4e675cc View commit details
    Browse the repository at this point in the history

  7. Merge branch 'channel_specific_epoch_rejection' of github.com:CarinaF… 

    …o/mne-python into channel_specific_epoch_rejection
    @CarinaFo
    CarinaFo committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    3b5d67b View commit details
    Browse the repository at this point in the history

  8. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    2868197 View commit details
    Browse the repository at this point in the history

  9. removed return statement (operates in-place)

    @CarinaFo
    CarinaFo committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    7fc2be1 View commit details
    Browse the repository at this point in the history

  10. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    91302bb View commit details
    Browse the repository at this point in the history

  11. deleted epoch based rejection from doc string

    @CarinaFo
    CarinaFo committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    b22cf11 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    b011e6a View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. DW initial revisions

    @dominikwelke
    dominikwelke committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    c794710 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    a27b135 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Merge branch 'mne-tools:main' into channel_specific_epoch_rejection

    @CarinaFo
    CarinaFo committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    f2ea3c4 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Merge branch 'channel_specific_epoch_rejection' of github.com:CarinaF… 

    …o/mne-python into channel_specific_epoch_rejection
    @CarinaFo
    CarinaFo committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    7feea14 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'channel_specific_epoch_rejection' of github.com:CarinaF… 

    …o/mne-python into channel_specific_epoch_rejection
    @CarinaFo
    CarinaFo committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    1856286 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3 from dominikwelke/carinafo/channel_specific_epo… 

    …ch_rejection

DW initial revisions
    @CarinaFo
    CarinaFo committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    caac9f4 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. fixed docstring

    @CarinaFo
    CarinaFo committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    fa9567a View commit details
    Browse the repository at this point in the history

  2. fixed dostring set_bad_epochs_to_NaN

    @CarinaFo
    CarinaFo committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    4abf7fd View commit details
    Browse the repository at this point in the history