Skip to content

Conversation

@tsbinns
Copy link
Contributor

@tsbinns tsbinns commented Dec 18, 2023

Follow-up of #12305.

As discussed, I have just switched the epoch_data parameter for the tfr_array_morlet and tfr_array_multitaper functions to data, and have added a FutureWarning if epoch_data is not None.

The _compute_tfr function which is called internally has the epoch_data parameter, but I haven't touched that here.

def _compute_tfr(
epoch_data,
freqs,
sfreq=1.0,
method="morlet",
n_cycles=7.0,
zero_mean=None,
time_bandwidth=None,
use_fft=True,
decim=1,
output="complex",
n_jobs=None,
verbose=None,
):
"""Compute time-frequency transforms.

@hoechenberger
Copy link
Member

Hello @tsbinns, could you add a changelog entry, please? Thank you!

Copy link
Member

@larsoner larsoner left a comment

Choose a reason for hiding this comment

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

Looks pretty straightforward and pip-pre Windows is unrelated, thanks @tsbinns !

@larsoner larsoner merged commit 4742914 into mne-tools:main Dec 19, 2023
larsoner added a commit to larsoner/mne-python that referenced this pull request Dec 20, 2023
* upstream/main:
  BUG: handle temporal discontinuities in Neuralynx `.ncs` files (mne-tools#12279)
  MAINT: Work around bad SciPy nightly wheels (mne-tools#12317)
  fix 404 link on devel landing page (mne-tools#12316)
  Switch from `epoch_data` to `data` for TFR array functions (mne-tools#12308)
  [pre-commit.ci] pre-commit autoupdate (mne-tools#12307)
  fix icon link colors (mne-tools#12301)
  Bump actions/download-artifact from 3 to 4 (mne-tools#12304)
  Bump github/codeql-action from 2 to 3 (mne-tools#12303)
  Bump actions/upload-artifact from 3 to 4 (mne-tools#12302)
snwnde pushed a commit to snwnde/mne-python that referenced this pull request Mar 20, 2024
@tsbinns tsbinns deleted the tfr_data_change branch May 30, 2024 17:24
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.

3 participants