Diamond2 conversion - #23
Merged
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #23 +/- ##
==========================================
- Coverage 26.39% 25.30% -1.09%
==========================================
Files 5 5
Lines 610 648 +38
==========================================
+ Hits 161 164 +3
- Misses 449 484 +35 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
ptsOSL
force-pushed
the
diamond2-conversion
branch
2 times, most recently
from
September 17, 2026 11:41
efdce13 to
a92b666
Compare
ptsOSL
force-pushed
the
diamond2-conversion
branch
from
September 21, 2026 14:04
a92b666 to
2ef4464
Compare
A1L, A2L, A1N and A2N may also want adding? They are quadrupoles but I dont know if they are needed for the feedbacks.
Some PVs end up being named multiple times in certain edge cases where multiple pyAT elements may be updated by a single PV.
The ReadWriteSimPV, which is the SETI PV written to by HLA apps, now directly updates the pytac lattice, this is more logical than previously where it was a proxy which made the ReadSimPV update the pytac lattice. When the ReadWriteSimPV updates, it calls its own set function which both updates the lattice and then copies the new value to its linked ReadSimPV. Ideally this would be read back from the simulation but this has a time cost and currently would just return the same value.
The tunefb pvs used depends on the loaded ringmode, if a diamond2 ringmode is selected, eg 48, then a different set of quad tune families are used
If it does not exist, then instead of crashing, we now just continue without supplying any limits data to the PVs that we create
This must have been re-added by mistake during a rebase, it wasnt having any effect and is now cleaned up
This code looks more like that in tfb now and also works for both D1 and D2 PV names
In this mode, we dont lookup limits data from the live machine. Instead we use dummy data which is totally inaccurate, but is required by Virtac. We may want to make it more realistic in the future
These are more sensible, although still approximate
I modified the code to make it generic and added back in bends which are many_to_one for D1, but not for D2 Add exception for RF cavities, slightly change bends We have multiple RF cavities which all get their value from the master oscillator PV, we just create a single PV which writes to all of the RF cavities and reads from the first one. Currently this PV also writes to the harmonic RF cavity. This should actually have 3xMOSC, but it isnt simulated in at anyway, so this can be fixed later Remove bend magnets exception This is not relevant for D2
When emittance simulation is disabled.
ptsOSL
force-pushed
the
diamond2-conversion
branch
from
September 22, 2026 11:08
2ef4464 to
74b19dc
Compare
MichaelStubbings
approved these changes
Sep 28, 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
2 participants
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.
Uh oh!
There was an error while loading. Please reload this page.