Rework of JUMP flags in config files and TimingConfiguration#157
Merged
rossjjennings merged 3 commits intomainfrom Mar 11, 2026
Merged
Rework of JUMP flags in config files and TimingConfiguration#157rossjjennings merged 3 commits intomainfrom
rossjjennings merged 3 commits intomainfrom
Conversation
Member
Author
|
After discussion, is fitter is None and convert_to_indices is True, should raise an error. |
rossjjennings
approved these changes
Mar 11, 2026
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
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.
As discussed on calls and in preparation for the
JumpChecker(part of #147), JUMPs can now be listed separately in the config files with afree-jumps:key and a list, for example in the notation we've proposed:TimingConfigurationnow has aget_free_jumps()function which will return the list of free jumps either as["JUMP -fe Rcvr_800"]orJUMP1depending on ifconvert_to_indicesis set toTrue(for the latter) and a fitter object is provided. If the fitter object is not provided, thenconvert_to_indicesoverrides toFalsebut we should discuss this choice. Theget_free_params()function now usesget_free_jumps()under the hood. The way this operates now, the old method of listingJUMP1,JUMP2, etc, infree-paramsis still respected. However, if one chooses to use both methods, they would have to worry about collisions and this is not checked.This PR also fixes some minor issues in
free-params. If the function was called multiple times, then the list would be modified in place repeatedly, leading to duplicate parameters being returned; I am not sure how this interacts with PINT so maybe it would be okay but it is still odd to have multiple copies of the parameters returned. It also makes sure thatfree-dmxis in the config file and does not assume it is there just in case.A corresponding unit test that coverts both
get_free_param()andget_free_jumps()has been implemented, and the test config file has been modified with the new JUMP syntax.