Commit 08c86ad
authored
Merge pull request #145 from DiamondLightSource/diamond2-conversion
Diamond 2 conversion:
-Update all diamond 1 ringmodes using the version of load_mml.m from main. This is because there were some major changes to DIAD, VMX and SRI0913_MOGA ~3 years ago which hadnt been applied to our configs.
-Update load_mml.m and load_unitconv.m for the diamond 2 ring and ao.
-load_mml.m and load_unitconv.m should now work for both diamond 1 and diamond 2 ringmodes.
-Remove redundant "name" column from elements.csv file generation and from the pytac code which loads this csv.
-Added multipoles to rigidity_families dictionary
-Regenerated all ringmodes, including the addition of the D2 ringmode, 48, using the updaded matlab scripts.
-Minor refactor to load_mml to reduce the number of exceptions required by doing lookups using FamName instead of Class
-Update CSVs to use correct PV names for BBVMXL and BBVMXSFile tree
74 files changed
+51677
-75921
lines changed- src/pytac
- data
- 48
- DIADSP
- DIADTHz
- DIAD
- I04SP
- I04THz
- I04
- SRI0913_MOGA
- VMXSP
- VMXTHz
- VMX
- utils
- tests
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
74 files changed
+51677
-75921
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| 70 | + | |
| 71 | + | |
0 commit comments