Merged
Conversation
larsoner
reviewed
Oct 5, 2022
Member
Author
I was wrong about this. They're only combined as (so the |
Member
|
maybe just wrap with |
Member
|
Thanks in advance @drammock , marking for auto merge |
larsoner
added a commit
to larsoner/mne-python
that referenced
this pull request
Oct 11, 2022
* upstream/main: (64 commits) MAINT: Better check (mne-tools#11229) MAINT: Fix link and update instantiation note (mne-tools#11228) BUG: Add estimated fiducials when missing / assumed head coords (mne-tools#11212) Fix tfr db (mne-tools#11223) MAINT: Update link (mne-tools#11222) add CPGRL doc section (mne-tools#11216) Don't insert superfluous newlines in subprocess log messages (mne-tools#11219) purge _get_args helper func (mne-tools#11215) Standardize topomap args (mne-tools#11123) MAINT: Ensure no datasets are downloaded in tests (mne-tools#11213) MAINT: Fix Cirrus caching (mne-tools#11211) Fix mesh display in tutorial (mne-tools#11200) MAINT: Add arm64 CI using CirrusCI (mne-tools#11209) Fix spatial colors (mne-tools#11201) MAINT: Fix CircleCI error (mne-tools#11205) [circle deploy] Add regression-based approach to removing EOG artifacts (mne-tools#11046) [DOC, MRG] Minor documentation improvements and remove glossary entry for array-like (mne-tools#11207) Fix `include_tmax` not considered in `mne.io.Raw.crop` to check `tmax` in bounds (mne-tools#11204) MAINT: Fix notebook backend (mne-tools#11206) MRG: Fix displayed Raw duration in Jupyter notebook (mne-tools#11203) ...
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
closes #11091
after reading through the TFR code, to me it seems that #10978 introduced a mistake. Specifically, the changed coef here:
mne-python/mne/time_frequency/tfr.py
Lines 2439 to 2440 in 7127158
is only appropriate for complex data (which have been converted to real-valued amplitude a few lines above). Data that is already real-valued will be power, not amplitude, and so should have coef
10not20in the dB conversion.My only hesitation is the case of
avg_power_itcwhere the data will be complex, but the complex part is ITC, so it seems like the test ofif np.iscomplexobjis too coarse here:mne-python/mne/time_frequency/tfr.py
Lines 2413 to 2414 in 7127158
...and data in the form
avg_power_itcneeds to be special-cased to simply discard the imaginary part and get treated like the (non-complex) power cases. @alexrockhill @agramfort @larsoner since you three authored/reviewed #10978 can you confirm that I'm interpreting the code correctly here and that what I've said makes sense?