Skip to content

Diamond 2 conversion #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.

Sign up for GitHub

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

Merged
merged 28 commits into from
Oct 6, 2025
Merged

Diamond 2 conversion #145

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c0452b4
Temporarily remove check for ringtype
ptsOSL Jul 31, 2025
de338e1
Remove empty name column from elements.csv
ptsOSL Jul 31, 2025
c330f17
Beam energy is now read from THERING
ptsOSL Jul 31, 2025
895b4a8
Update TYPEMAP with new FamNames from ao
ptsOSL Jul 31, 2025
3856f64
Handle multiple elements of family RF
ptsOSL Sep 11, 2025
81ebeb2
Get energy from THERING instead of hardcoding it
ptsOSL Sep 11, 2025
58fd70e
Get master oscillator PV properly
ptsOSL Sep 15, 2025
ecad9f0
Handle intricacies of getting element FamName vs Class
ptsOSL Sep 15, 2025
b6c92ea
Regenerate all D1 ringmodes
ptsOSL Sep 15, 2025
80a89f3
Re-enable checking for correct ringmode
ptsOSL Sep 15, 2025
f649362
Support multipoles
ptsOSL Sep 15, 2025
561dbf2
Support octupoles in unit conversions
ptsOSL Sep 15, 2025
2e16c58
Generate ringmode 48 and regenerate old modes
ptsOSL Sep 15, 2025
d517e76
Remove getting 'name' from the elements.csv file
ptsOSL Sep 15, 2025
17ad36f
Support getting the rigidity from multipoles
ptsOSL Sep 15, 2025
a360d76
Fix wrong PV names configured for quadrupole elements
ptsOSL Sep 16, 2025
16fb10e
Regenerate csv with correct OX0 PV names
ptsOSL Sep 17, 2025
8660404
Fix tests for ringmode 48 and updated DIAD
ptsOSL Sep 22, 2025
e7df633
Update ringmode 48 csv data
ptsOSL Sep 24, 2025
61203cc
Write unit conversions data for both Oct families
ptsOSL Sep 24, 2025
66ad951
Update load_mml script to make data lookups tidier
ptsOSL Sep 24, 2025
0cdcae0
Remove unnecessary if statement for RF data
ptsOSL Sep 26, 2025
d2d41fe
Add back in support for name col in csv file
ptsOSL Sep 26, 2025
ff1750e
Deprecate old ringmodes
ptsOSL Sep 26, 2025
7f891c1
Fix bug when getting name from csv files
ptsOSL Oct 1, 2025
276a0ba
Switch tests from VMX to I04
ptsOSL Oct 1, 2025
7caa82e
Run Ruff format to fix ci failures
ptsOSL Oct 1, 2025
97f9e6a
Make getting name from csv file cleaner
ptsOSL Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ venv*
# further build artifacts
lockfiles/

# matlab autosave
*.asv
Loading