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

Report parsing #7990

Merged
merged 8 commits into from
Jul 10, 2020
Merged

Report parsing #7990

merged 8 commits into from
Jul 10, 2020

Conversation

agramfort
Copy link
Member

improves parse of folder for report

@@ -1864,7 +1869,8 @@ def _render_evoked(self, evoked_fname, baseline, image_format):
has_types = []
if len(pick_types(ev.info, meg=False, eeg=True)) > 0:
has_types.append('eeg')
if len(pick_types(ev.info, meg='grad', eeg=False)) > 0:
if len(pick_types(ev.info, meg='grad', eeg=False,
ref_meg=False)) > 0:
Copy link
Member Author

Choose a reason for hiding this comment

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

this is a bug fix for CTF data.

@@ -181,38 +181,47 @@ def _get_fname(fname):
return fname


def _endswith(fname, exts):
Copy link
Member

Choose a reason for hiding this comment

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

Good solution! 👍

@hoechenberger
Copy link
Member

I have rebased onto master to resolve merge conflicts.

@hoechenberger
Copy link
Member

hoechenberger commented Jul 10, 2020

@agramfort Azure still says it thinks we're being abusive. It's clearly trying to gaslight us! 💩

@agramfort
Copy link
Member Author

good to go from my end.

@larsoner do you want to have a look?

@hoechenberger
Copy link
Member

So now… do we have to wait until Azure is working again, or can this be merged..?

@agramfort
Copy link
Member Author

agramfort commented Jul 10, 2020 via email

@hoechenberger hoechenberger merged commit 4903cf2 into mne-tools:master Jul 10, 2020
@hoechenberger
Copy link
Member

Thanks @agramfort!

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