Harmonic oscillation reduction [JSB version] #313
Merged
Conversation
This file contains 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
profjsb
changed the title
stefanv
approved these changes
Mar 8, 2023
cesium/features/lomb_scargle.py
Outdated
| nharm=8, | ||
| nfreq=3, | ||
| tone_control=5.0, | ||
| opt_normalize=False, |
cesium/features/lomb_scargle.py
Outdated
| @@ -71,6 +95,7 @@ def lomb_scargle_model( | |||
| detrend_order=1, | |||
| ) | |||
| model_dict["trend"] = fit["trend_coef"][1] | |||
| # | |||
cesium/features/lomb_scargle.py
Outdated
| norm_residual = signal - fit["model"] | ||
| signal = norm_residual | ||
|
|
||
| # store current estim_freq results, [**RESCALED for first fund freq] |
There was a problem hiding this comment.
If these comments are useful, should they be clarified?
cesium/features/lomb_scargle.py
Outdated
| model_dict["freq_fits"].append(current_fit) | ||
| model_dict["freq_fits"][-1]["resid"] = norm_residual | ||
|
|
||
| if opt_normalize & (i == 0): |
There was a problem hiding this comment.
These two if clauses feel as if they should be combined higher up, but perhaps that's tricky.
cesium/features/lomb_scargle.py
Outdated
| rescaled_model = norm_model.copy() | ||
| # unchanged : 'psd', 'chi0', 'freq', 'chi2', 'trace', 'nu0', 'nu', 'npars', | ||
| # 'rel_phase', 'rel_phase_error', 'time0', 'signif' | ||
| rescaled_model["s0"] = rescaled_model["s0"] / mscale**2 |
There was a problem hiding this comment.
Maybe three for-loops here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a copy of the PR #285 by @sarajamal57, that has been rebased to the current main of cesium.
It is meant to solve the overflow problem in issue #284 by:
opt_normalize == TrueAdditional output:
The full power spectrum and associated frequencies are added in the output dictionary ("freqs_vector", "psd_vector")