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.

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

MRG: Allow removal of active projectors if channels they applied to have meanwhile been dropped #8003

Merged
merged 4 commits into from
Jul 13, 2020

Conversation

hoechenberger
Copy link
Member

@hoechenberger hoechenberger commented Jul 13, 2020

In cases where the channels that an applied projector applies to have been removed from the data (pick after apply_proj() call), it should be safe to allow users to remove the projector. Currently we disallow deletion of any "active" (applied) projectors, so this commit adds more flexibility there.

In cases where the channels that an applied projector
applies to have been removed from the data (pick
after apply_proj() call), it should besafe to allow
users to remove the projector. Currently we disallow
deletion of any "active" (applied) projectors, so this
commit adds more flexibility there.
mne/io/proj.py Show resolved Hide resolved
picks = list(set(raw.ch_names) -
set(raw.info['projs'][del_proj_idx]['data']['col_names']))
raw.pick(picks)
raw.del_proj(del_proj_idx)
Copy link
Member

Choose a reason for hiding this comment

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

can you test that del_proj_idx is actually no longer there?

Copy link
Member Author

Choose a reason for hiding this comment

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

Is 09c9a9b sufficient?

@hoechenberger hoechenberger changed the title Allow removal of active projectors if channels they applied to have meanwhile been dropped MRG: Allow removal of active projectors if channels they applied to have meanwhile been dropped Jul 13, 2020
@larsoner larsoner merged commit b1dfd53 into mne-tools:master Jul 13, 2020
@larsoner
Copy link
Member

Thanks @hoechenberger

@hoechenberger hoechenberger deleted the del-proj branch July 13, 2020 13:57
larsoner added a commit to larsoner/mne-python that referenced this pull request Jul 14, 2020
* upstream/master: (21 commits)
  MRG: Add SSP projectors to Report (mne-tools#7991)
  BUG: Fix warning (mne-tools#8006)
  WIP: TFR Doc/test changes (mne-tools#7998)
  MAINT: Remove numpydoc test on 3.6 (mne-tools#8005)
  MAINT: Better error message for mismatch (mne-tools#8007)
  MRG: Allow removal of active projectors if channels they applied to have meanwhile been dropped (mne-tools#8003)
  MRG Freesurfer coordinate frame tutorial (mne-tools#7578)
  FIX: Fix stockwell checks (mne-tools#7996)
  MRG, ENH: Add array-spacing plugin and reorganize deps (mne-tools#7997)
  MRG, ENH: Reduce memory usage of Welch PSD (mne-tools#7994)
  STY: One more [ci skip]
  STY: Docstyle [ci skip]
  Report parsing (mne-tools#7990)
  MRG, ENH: BrainVision impedance parsing (mne-tools#7974)
  BUG: Fix missing source space points (mne-tools#7988)
  [MRG] Strip base directory name from Report captions when using parse_folder (mne-tools#7986)
  DOC: Update estimates [skip travis] (mne-tools#7987)
  DOC: Try to improve find_bad_channels_maxwell doc (mne-tools#7982)
  VIZ, BUG: fix tickmarks in evoked topomap colorbar (mne-tools#7980)
  Add low-pass filter to find_bad_channels_maxwell() (mne-tools#7983)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants