Skip to content

Commit 08c86ad

Browse files
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 BBVMXS
2 parents 0244759 + 97f9e6a commit 08c86ad

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

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,5 @@ venv*
6767
# further build artifacts
6868
lockfiles/
6969

70+
# matlab autosave
71+
*.asv

0 commit comments

Comments
 (0)