-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Added a test to default the value of Fs to 2 for Axes.specgram and ml… #12813
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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 |
---|---|---|
|
@@ -1113,6 +1113,8 @@ def specgram(x, NFFT=None, Fs=None, detrend=None, window=None, | |
noverlap = 128 # default in _spectral_helper() is noverlap = 0 | ||
if NFFT is None: | ||
NFFT = 256 # same default as in _spectral_helper() | ||
if Fs is None: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
Fs = 2 # same default as in _spectral_helper() | ||
if len(x) <= NFFT: | ||
cbook._warn_external("Only one segment is calculated since parameter " | ||
"NFFT (=%d) >= signal length (=%d)." % | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed in #9221 (comment), I think that
Fs
should remain None, and the underlying function made to do the right thing withNone
. This function should not be calculating frequencies, but should just take them from the frequency output of the spectral helper.Sorry to be a pain, but I'm going to block on this. If you need more details to modify the PR, I will try and take a look later today.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then I'll try to change the PR so as to modify the docstring so that it matches the fact that the default value is None. I will try to do this asap.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, I think there is a problem with the code as well, but I don't think setting
Fs=2
is the solution. We should be making toFs
from thefreqs
array where it is needed in the code (Fs=freqs[-1] * 2
)