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

Backport PR #12633 on branch maint/1.7 ([BUG] Cross-spectral density missing frequencies) #12634

Merged
merged 1 commit into from
May 29, 2024
Merged

Backport PR #12633 on branch maint/1.7 ([BUG] Cross-spectral density missing frequencies) #12634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/changes/devel/12633.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bug where :func:`mne.time_frequency.csd_multitaper`, :func:`mne.time_frequency.csd_fourier`, :func:`mne.time_frequency.csd_array_multitaper`, and :func:`mne.time_frequency.csd_array_fourier` would return cross-spectral densities with the ``fmin`` and ``fmax`` frequencies missing, by `Thomas Binns`_
9 changes: 6 additions & 3 deletions mne/time_frequency/csd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,9 +810,10 @@ def csd_array_fourier(
n_fft = n_times if n_fft is None else n_fft

# Preparing frequencies of interest
# orig_frequencies = fftfreq(n_fft, 1. / sfreq)
orig_frequencies = rfftfreq(n_fft, 1.0 / sfreq)
freq_mask = (orig_frequencies > fmin) & (orig_frequencies < fmax)
freq_mask = (
(orig_frequencies > 0) & (orig_frequencies >= fmin) & (orig_frequencies <= fmax)
)
frequencies = orig_frequencies[freq_mask]

if len(frequencies) == 0:
Expand Down Expand Up @@ -1013,7 +1014,9 @@ def csd_array_multitaper(

# Preparing frequencies of interest
orig_frequencies = rfftfreq(n_fft, 1.0 / sfreq)
freq_mask = (orig_frequencies > fmin) & (orig_frequencies < fmax)
freq_mask = (
(orig_frequencies > 0) & (orig_frequencies >= fmin) & (orig_frequencies <= fmax)
)
frequencies = orig_frequencies[freq_mask]

if len(frequencies) == 0:
Expand Down
6 changes: 3 additions & 3 deletions mne/time_frequency/tests/test_csd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,15 @@ def _test_fourier_multitaper_parameters(epochs, csd_epochs, csd_array):
fmin=20,
fmax=10,
)
raises(ValueError, csd_epochs, epochs, fmin=20, fmax=20.1)
raises(ValueError, csd_epochs, epochs, fmin=20.11, fmax=20.19)
raises(
ValueError,
csd_array,
epochs._data,
epochs.info["sfreq"],
epochs.tmin,
fmin=20,
fmax=20.1,
fmin=20.11,
fmax=20.19,
)
raises(ValueError, csd_epochs, epochs, tmin=0.15, tmax=0.1)
raises(
Expand Down
Loading