-
Notifications
You must be signed in to change notification settings - Fork 145
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
fold_events keyword validation #837
Merged
matteobachetti
merged 16 commits into
StingraySoftware:main
from
spranav1205:Event_folding_#835
Sep 19, 2024
Merged
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
b5f9ca1
Event_folding key validation
spranav1205 d6ef817
Formatting
spranav1205 13646d8
Attempting to use dict.pop()
spranav1205 638afec
Formatting 2.0
spranav1205 d5806c4
Editted value error message
spranav1205 470ea84
opts.pop instead of dict.pop
spranav1205 5fa9667
Formating 3.0
spranav1205 327e9eb
Changelog updated
spranav1205 68a2931
Removing ax as a kwarg from test cases:
spranav1205 dff319a
Updating error message and adding test case
spranav1205 d6af584
fixing typo
spranav1205 d760376
Final Changes
spranav1205 035a77d
Formatting
spranav1205 a40ebfb
Resolving issue
spranav1205 efefb48
Formatting
spranav1205 e5f0653
Regex error fixed
spranav1205 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 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 |
---|---|---|
|
@@ -113,8 +113,8 @@ | |
|
||
""" | ||
|
||
ph0 = _default_value_if_no_key(opts, "ph0", 0) | ||
to_1 = _default_value_if_no_key(opts, "to_1", True) | ||
ph0 = dict.pop(opts, "ph0", 0) | ||
to_1 = dict.pop(opts, "to_1", True) | ||
ph = ph0 | ||
|
||
for i_f, f in enumerate(frequency_derivatives): | ||
|
@@ -263,18 +263,24 @@ | |
profile_err : array of floats | ||
The uncertainties on the pulse profile | ||
""" | ||
mode = _default_value_if_no_key(opts, "mode", "ef") | ||
nbin = _default_value_if_no_key(opts, "nbin", 16) | ||
weights = _default_value_if_no_key(opts, "weights", 1) | ||
|
||
mode = dict.pop(opts, "mode", "ef") | ||
nbin = dict.pop(opts, "nbin", 16) | ||
weights = dict.pop(opts, "weights", 1) | ||
# If no key is passed, *or gti is None*, defaults to the | ||
# initial and final event | ||
gti = _default_value_if_no_key(opts, "gti", None) | ||
gti = dict.pop(opts, "gti", None) | ||
if gti is None: | ||
gti = [[times[0], times[-1]]] | ||
# Be safe if gtis are a list | ||
gti = np.asanyarray(gti) | ||
ref_time = _default_value_if_no_key(opts, "ref_time", 0) | ||
expocorr = _default_value_if_no_key(opts, "expocorr", False) | ||
ref_time = dict.pop(opts, "ref_time", 0) | ||
expocorr = dict.pop(opts, "expocorr", False) | ||
|
||
if opts: | ||
raise ValueError( | ||
f"Unidentified keys: {opts.keys()} \n Please refer to the description of the function for optional parameters." | ||
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.
|
||
) | ||
|
||
if not isinstance(weights, Iterable): | ||
weights *= np.ones(len(times)) | ||
|
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.
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.
Actually, sorry, I think you can just use
opts.pop("gti", None)
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.
I've made the changes