Skip to content

Commit 34e8bf0

Browse files
committed
Merge upstream/main into fix/welch-short-span-overlap
Picks up the CI overhaul that removed tools/check_qt_import.sh, which the stale branch config still invoked and which was failing build_docs. Also drop the :newcontrib: marker here, since gh-14002 already landed with it.
1 parent 45ec6b6 commit 34e8bf0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

doc/changes/dev/14003.bugfix.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Fix :func:`mne.time_frequency.psd_array_welch` (and Welch-method ``compute_psd``) so that good data spans shorter than ``n_per_seg`` no longer raise ``noverlap must be less than nperseg``; such spans are now analyzed with a window shrunk to the span length (with a warning that their spectral resolution is reduced) instead of being lost, by :newcontrib:`Cedric Conday`.
1+
Fix :func:`mne.time_frequency.psd_array_welch` (and Welch-method ``compute_psd``) so that good data spans shorter than ``n_per_seg`` no longer raise ``noverlap must be less than nperseg``; such spans are now analyzed with a window shrunk to the span length (with a warning that their spectral resolution is reduced) instead of being lost, by `Cedric Conday`_.

0 commit comments

Comments
 (0)