Facet dev#33
Open
roussel-ryan wants to merge 18 commits into
Open
Conversation
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.
This pull request introduces several improvements and new features related to the FACET-II lattice and surrogate model integration, as well as updates to the test workflows to support these changes. The most important updates are the addition of a staged model for FACET-II, enhancements to the injector surrogate for better compatibility, and workflow changes to ensure the new lattice is available in CI.
FACET-II Model and Surrogate Integration:
get_facet_staged_modeltovirtual_accelerator/models/facet2.py, allowing construction of aStagedModelthat combines the FACET-II lattice with an injector surrogate model. This enables more flexible and modular simulation setups.BeamOutputModelinvirtual_accelerator/surrogates/injector_surrogate.py:FinalParticlesMixInfor compatibility with staged models. [1] [2]t0andz0parameters to control reference time and position, and updated internal logic to use these values in the generated beam data. [1] [2] [3]final_particlesproperty to expose the final particle distribution for downstream models.Continuous Integration and Testing:
tests.yml,test-bmad.yml,test-cheetah.yml) to check out the newfacet2-latticerepository and set theFACET2_LATTICEenvironment variable, ensuring that tests requiring the FACET-II lattice have access to it. [1] [2] [3] [4] [5] [6]Testing Enhancements:
test_short_trackingtest tovirtual_accelerator/tests/test_facet.pyfor the FACET-II BMAD model, verifying initialization and short tracking with a custom beam. [1] [2]