From 0d1a8f5b8dc9a632b7ed83e8a69c7acde3492c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20St=C3=B8rmer?= Date: Mon, 20 Mar 2023 15:11:12 +0100 Subject: [PATCH 1/3] quiet epochs creation and made channel.pick_channels work --- mne/channels/channels.py | 1 + mne/epochs.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/mne/channels/channels.py b/mne/channels/channels.py index 12e797a5c10..fced16e63f9 100644 --- a/mne/channels/channels.py +++ b/mne/channels/channels.py @@ -678,6 +678,7 @@ def pick_channels(self, ch_names, ordered=False, *, verbose=None): .. versionadded:: 0.9.0 """ + ch_names = list(set(ch_names) & set(self.info['ch_names'])) picks = pick_channels(self.info['ch_names'], ch_names, ordered=ordered) return self._pick_drop_channels(picks) diff --git a/mne/epochs.py b/mne/epochs.py index b2448bd95ba..5b48baab791 100644 --- a/mne/epochs.py +++ b/mne/epochs.py @@ -1382,14 +1382,14 @@ def _get_data(self, out=True, picks=None, item=None, *, units=None, else: # we start out with an empty array, allocate only if necessary data = np.empty((0, len(self.info['ch_names']), len(self.times))) - msg = (f'for {n_events} events and {len(self._raw_times)} ' - 'original time points') - if self._decim > 1: - msg += ' (prior to decimation)' - if getattr(self._raw, "preload", False): - logger.info(f'Using data from preloaded Raw {msg} ...') - else: - logger.info(f'Loading data {msg} ...') + # msg = (f'for {n_events} events and {len(self._raw_times)} ' + # 'original time points') + # if self._decim > 1: + # msg += ' (prior to decimation)' + # if getattr(self._raw, "preload", False): + # logger.info(f'Using data from preloaded Raw {msg} ...') + # else: + # logger.info(f'Loading data {msg} ...') orig_picks = picks if orig_picks is None: @@ -1475,7 +1475,7 @@ def _get_data(self, out=True, picks=None, item=None, *, units=None, del drop_log self._bad_dropped = True - logger.info("%d bad epochs dropped" % (n_events - len(good_idx))) + # logger.info("%d bad epochs dropped" % (n_events - len(good_idx))) # adjust the data size if there is a reason to (output or update) if out or self.preload: From 62ed7bc7b0c6604ee16d77f4ae3f27e6bb83dc00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20St=C3=B8rmer?= Date: Thu, 20 Apr 2023 13:32:43 +0200 Subject: [PATCH 2/3] Stopped print of dropped bad epochs --- mne/epochs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mne/epochs.py b/mne/epochs.py index 5b48baab791..0f59d0e2eba 100644 --- a/mne/epochs.py +++ b/mne/epochs.py @@ -3021,8 +3021,8 @@ def _is_good(e, ch_names, channel_type_idx, reject, flat, full_report=False, if len(idx_deltas) > 0: bad_names = [ch_names[idx[i]] for i in idx_deltas] if (not has_printed): - logger.info(' Rejecting %s epoch based on %s : ' - '%s' % (t, name, bad_names)) + # logger.info(' Rejecting %s epoch based on %s : ' + # '%s' % (t, name, bad_names)) has_printed = True if not full_report: return False From 77fe52a257b5cfb301afd6e2fd40f683baae5bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20St=C3=B8rmer?= Date: Wed, 10 May 2023 12:46:43 +0200 Subject: [PATCH 3/3] preserve order in pick_channels --- mne/channels/channels.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mne/channels/channels.py b/mne/channels/channels.py index fced16e63f9..9a87fd0e95a 100644 --- a/mne/channels/channels.py +++ b/mne/channels/channels.py @@ -678,7 +678,7 @@ def pick_channels(self, ch_names, ordered=False, *, verbose=None): .. versionadded:: 0.9.0 """ - ch_names = list(set(ch_names) & set(self.info['ch_names'])) + ch_names = [ch for ch in ch_names if ch in self.info['ch_names']] picks = pick_channels(self.info['ch_names'], ch_names, ordered=ordered) return self._pick_drop_channels(picks)