-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
[ENH] Add option to store and return TFR taper weights #12910
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
Merged
Merged
Changes from 42 commits
Commits
Show all changes
46 commits
Select commit
Hold shift + click to select a range
9fe1fb6
Add option to store and return tfr taper weights
tsbinns 45c6a0b
Merge remote-tracking branch 'upstream/main' into add_tfr_weights
tsbinns 82fc2f7
Update docstrings
tsbinns 9f30a59
Merge branch 'main' into add_tfr_weights
tsbinns a49f934
Remove whitespace
tsbinns 48afced
Merge branch 'add_tfr_weights' of https://github.com/tsbinns/mne-pyth…
tsbinns 7c3dcfa
Add PR num
tsbinns 8c16716
Revert "Update docstrings"
tsbinns 51b8cd0
Remove outdated default setting
tsbinns 2f9a4b4
Reapply "Update docstrings"
tsbinns b4537b2
Update docstrings
tsbinns f155238
Merge branch 'main' into add_tfr_weights
tsbinns 2a03e9b
Merge branch 'main' into add_tfr_weights
tsbinns 045d9a2
Merge branch 'main' into add_tfr_weights
tsbinns 8d645bb
Enforce return_weights as named param
tsbinns 5ad9bd5
Merge branch 'main' into add_tfr_weights
tsbinns 1c02b40
Add missing test coverage
tsbinns 54f2a32
Add changelog entry
tsbinns 6a23556
Merge branch 'fix_tfr_tapers' into fix_tfr_multitapers
tsbinns a107991
Begin add support for tapers in array objs
tsbinns 01c486c
Begin add support for tapers in array objs
tsbinns ca27179
Fix docstring entries
tsbinns b14a100
Fix faulty state check
tsbinns 972aba2
Add weights to AverageTFR
tsbinns e11fa2b
Expand test coverage
tsbinns aaef4b7
Merge branch 'main' into add_tfr_weights
tsbinns 999d122
Disallow aggregating tapers in combine_tfr
tsbinns e12b09a
Updated docstrings
tsbinns dd61955
Merge branch 'main' into add_tfr_weights
tsbinns 728701e
Add placeholder versionadded tags
tsbinns 6af3310
Merge branch 'add_tfr_weights' of https://github.com/tsbinns/mne-pyth…
tsbinns e3a3c4b
Merge remote-tracking branch 'upstream/main' into add_tfr_weights
tsbinns de39d25
Begin fixing to_data_frame
tsbinns 80126a7
Fix to_data_frame bug with tapers
tsbinns 82dfab9
Fix plotting with tapers
tsbinns 5b150aa
Merge branch 'main' into add_tfr_weights
tsbinns 0d3d85d
Merge branch 'main' into add_tfr_weights
tsbinns 012bd94
Add version tag
tsbinns e5eedee
Merge branch 'main' into add_tfr_weights
tsbinns 514258d
Merge branch 'main' into add_tfr_weights
drammock caf651d
Update changelog entries
tsbinns 6bd41c0
Merge branch 'main' into add_tfr_weights
tsbinns 0b64b43
Remove unnecessary changelog entry
tsbinns d4b2c7b
Apply suggestions from code review
tsbinns ece99b7
Merge branch 'main' into add_tfr_weights
tsbinns a0ae737
Minor fix
tsbinns File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ``mne.combine_tfr`` now raises an error when passed data with a tapers dimension, by `Thomas Binns`_. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Added the option to return taper weights from :func:`mne.time_frequency.tfr_array_multitaper`, and taper weights are now stored in the :class:`mne.time_frequency.BaseTFR` objects, by `Thomas Binns`_. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.