From 03f1d007fcc970802c50a1388a3f4807e3a01483 Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Tue, 1 Oct 2024 03:06:35 +0000
Subject: [PATCH] Update elettra2_lattice.json
---
elettra2_lattice.json | 82 +++++++++++++++++++++----------------------
1 file changed, 41 insertions(+), 41 deletions(-)
diff --git a/elettra2_lattice.json b/elettra2_lattice.json
index 79113e1..38756d3 100644
--- a/elettra2_lattice.json
+++ b/elettra2_lattice.json
@@ -624,15 +624,15 @@
{"type": "flsc", "position": 2442.4, "name": "FLSC_BTS1.1"},
{"type": "blm", "position": 2392.4, "name": "BLM_FLSC_BTS1.1_R"},
{"type": "blm", "position": 2392.4, "name": "BLM_FLSC_BTS1.1_L"},
- {"type": "corrector", "position": 2712.4, "name": "CH_BTS1.1"},
- {"type": "corrector", "position": 2992.4, "name": "CV_BTS1.1"},
+ {"type": "correctorbooster", "position": 2712.4, "name": "CH_BTS1.1"},
+ {"type": "correctorbooster", "position": 2992.4, "name": "CV_BTS1.1"},
{"type": "quadrupolebooster", "position": 3244.9, "name": "Q_BTS1.1"},
{"type": "blm", "position": 3244.9, "name": "BLM_Q_BTS1.1"},
{"type": "quadrupolebooster", "position": 4044.9, "name": "Q_BTS1.2"},
{"type": "blm", "position": 4044.9, "name": "BLM_Q_BTS1.2"},
{"type": "bpm", "position": 4297.4, "name": "BPM_BTS1.1"},
- {"type": "corrector", "position": 4717.4, "name": "CH_BTS1.2"},
- {"type": "corrector", "position": 4997.4, "name": "CV_BTS1.2"},
+ {"type": "correctorbooster", "position": 4717.4, "name": "CH_BTS1.2"},
+ {"type": "correctorbooster", "position": 4997.4, "name": "CV_BTS1.2"},
{"type": "bst", "position": 5400, "name": "BST_BTS1.1"},
{"type": "bst", "position": 6200, "name": "BST_BTS1.2"},
{"type": "sip", "position": 7200, "name": "SIP55_BTS1.2", "offset2d": [0, -40]}
@@ -652,8 +652,8 @@
{"type": "sip", "position": 3150, "name": "SIP55_BTS1.3", "offset2d": [0, -40]},
{"type": "quadrupolebooster", "position": 3607, "name": "Q_BTS1.4"},
{"type": "blm", "position": 3607, "name": "BLM_Q_BTS1.4"},
- {"type": "corrector", "position": 4059.5, "name": "CH_BTS1.3"},
- {"type": "corrector", "position": 4339.5, "name": "CV_BTS1.3"},
+ {"type": "correctorbooster", "position": 4059.5, "name": "CH_BTS1.3"},
+ {"type": "correctorbooster", "position": 4339.5, "name": "CV_BTS1.3"},
{"type": "sip", "position": 7650, "name": "SIP55_BTS1.4", "offset2d": [0, -40]},
{"type": "bpm", "position": 7836, "name": "BPM_BTS1.3"},
{"type": "blm", "position": 7836, "name": "BLM_BPM_BTS1.3_R"},
@@ -662,8 +662,8 @@
{"type": "plc", "position": 9000, "name": "SPAC_BTS1", "offset3d": [0, 100, -700], "offset2d": [0, -300], "labelReverse": [270, -250, -180]},
{"type": "bpm", "position": 10570.35, "name": "BPM_BTS1.4"},
{"type": "flsc", "position": 10864.35, "name": "FLSC_BTS1.2"},
- {"type": "corrector", "position": 11264.35, "name": "CH_BTS1.4"},
- {"type": "corrector", "position": 11544.35, "name": "CV_BTS1.4"},
+ {"type": "correctorbooster", "position": 11264.35, "name": "CH_BTS1.4"},
+ {"type": "correctorbooster", "position": 11544.35, "name": "CV_BTS1.4"},
{"type": "quadrupolebooster", "position": 12296.85, "name": "Q_BTS1.5"},
{"type": "blm", "position": 12297, "name": "BLM_Q_BTS1.5"},
{"type": "sip", "position": 12700, "name": "SIP55_BTS1.5", "offset2d": [0, -40]},
@@ -693,8 +693,8 @@
{"type": "bpm", "position": 1000, "name": "BPM_BTS1.6"},
{"type": "bst", "position": 1300, "name": "BST_BTS1.3"},
{"type": "vlv", "position": 2950, "name": "VLV_BTS2.1"},
- {"type": "corrector", "position": 3516.42, "name": "CH_BTS2.1"},
- {"type": "corrector", "position": 3796.42, "name": "CV_BTS2.1"},
+ {"type": "correctorbooster", "position": 3516.42, "name": "CH_BTS2.1"},
+ {"type": "correctorbooster", "position": 3796.42, "name": "CV_BTS2.1"},
{"type": "quadrupolebooster", "position": 4149, "name": "Q_BTS2.1"},
{"type": "blm", "position": 4149, "name": "BLM_Q_BTS2.1_R"},
{"type": "blm", "position": 4149, "name": "BLM_Q_BTS2.1_L"},
@@ -717,8 +717,8 @@
{"type": "quadrupolebooster", "position": 2604.5, "name": "Q_BTS2.3"},
{"type": "blm", "position": 2605, "name": "BLM_Q_BTS2.3"},
{"type": "bpm", "position": 2857, "name": "BPM_BTS2.1"},
- {"type": "corrector", "position": 3182, "name": "CH_BTS2.2"},
- {"type": "corrector", "position": 3462, "name": "CV_BTS2.2"},
+ {"type": "correctorbooster", "position": 3182, "name": "CH_BTS2.2"},
+ {"type": "correctorbooster", "position": 3462, "name": "CV_BTS2.2"},
{"type": "sip", "position": 3700, "name": "SIP55_BTS2.2", "offset2d": [0, -40]},
{"type": "vgpi", "position": 3900, "name": "VGPI_BTS2.1"},
{"type": "quadrupolebooster", "position": 4144.5, "name": "Q_BTS2.4"},
@@ -747,8 +747,8 @@
{"type": "blm", "position": 1524, "name": "BLM_Q_BTS2.5", "labelReverse": true},
{"type": "quadrupolebooster", "position": 1808.5, "name": "Q_BTS2.6", "labelReverse": true},
{"type": "blm", "position": 1809, "name": "BLM_Q_BTS2.6", "labelReverse": true},
- {"type": "corrector", "position": 2032, "name": "CH_BTS2.3", "labelReverse": true},
- {"type": "corrector", "position": 2312, "name": "CV_BTS2.3", "labelReverse": true},
+ {"type": "correctorbooster", "position": 2032, "name": "CH_BTS2.3", "labelReverse": true},
+ {"type": "correctorbooster", "position": 2312, "name": "CV_BTS2.3", "labelReverse": true},
{"type": "bpm", "position": 2588.5, "name": "BPM_BTS2.2", "labelReverse": true},
{"type": "sip", "position": 2870, "name": "SIP55_BTS2.4", "offset2d": [0, -40], "labelReverse": true},
{"type": "flsc", "position": 3150, "name": "FLSC_BTS2.2", "labelReverse": [90, -500, 200]},
@@ -758,8 +758,8 @@
{"type": "bst", "position": 4000, "name": "BST_BTS2.1", "labelReverse": true},
{"type": "quadrupolebooster", "position": 4465.8, "name": "Q_BTS2.7", "labelReverse": true},
{"type": "blm", "position": 4466, "name": "BLM_Q_BTS2.7", "labelReverse": true},
- {"type": "corrector", "position": 4689.3, "name": "CH_BTS2.4", "labelReverse": true},
- {"type": "corrector", "position": 4969.3, "name": "CV_BTS2.4", "labelReverse": true},
+ {"type": "correctorbooster", "position": 4689.3, "name": "CH_BTS2.4", "labelReverse": true},
+ {"type": "correctorbooster", "position": 4969.3, "name": "CV_BTS2.4", "labelReverse": true},
{"type": "sip", "position": 5270, "name": "SIP55_BTS2.5", "offset2d": [0, -40], "labelReverse": true},
{"type": "vgpe", "position": 5370, "name": "VGPE_BTS2.2", "labelReverse": true},
{"type": "bpm", "position": 5309.7, "name": "BPM_BTS2.4", "labelReverse": [90, -300, 250]}
@@ -1145,7 +1145,7 @@
{"type": "quadrupole", "position": 730, "name": "QAB_S01.08"},
{"type": "bpm", "position": 860, "name": "BPM_S01.14"},
{"type": "sextupole_CHV", "position":1000, "name": "SF_S01.06", "embedded":["CEH_S01.22","CEV_S01.22"]},
- {"type": "undulator", "position": 1280, "name": "SHID_S02.01"},
+ {"type": "undulator", "position": 1280, "offset3d": [-170, 0, 400], "name": "SHID_S02.01"},
{"type": "sextupole_CHV", "position": 2430, "name": "SF_S02.01", "embedded":["CEH_S02.01","CEV_S02.01"]},
{"type": "bpm", "position": 2561, "name": "BPM_S02.01"},
{"type": "quadrupole", "position": 2700, "name": "QAB_S02.01"},
@@ -1384,7 +1384,7 @@
{"type": "quadrupole", "position": 1260, "name": "QAB_S04.03"},
{"type": "bpm", "position": 1400, "name": "BPM_S04.04"},
{"type": "sextupole_CHV", "position": 1550, "name": "SD_S04.03", "embedded":["CEH_S04.05","CEV_S04.05"]},
- {"type": "corrector", "position": 2080, "name": "CFHV_S04.02"}
+ {"type": "corrector", "position": 1800, "name": "CFHV_S04.02"}
]
},
{
@@ -1458,7 +1458,7 @@
{"type": "quadrupole", "position": 1250, "name": "QAB_S04.07"},
{"type": "bpm", "position": 1391, "name": "BPM_S04.13"},
{"type": "sextupole_CHV", "position": 1541, "name": "SD_S04.09", "embedded":["CEH_S04.20","CEV_S04.20"]},
- {"type": "corrector", "position": 2080, "name": "CFHV_S04.06"}
+ {"type": "corrector", "position": 1800, "name": "CFHV_S04.06"}
]
},
{
@@ -1470,7 +1470,7 @@
{"type": "quadrupole", "position": 730, "name": "QAB_S04.08"},
{"type": "bpm", "position": 860, "name": "BPM_S04.14"},
{"type": "sextupole_CHV", "position": 1000, "name": "SF_S04.06", "embedded":["CEH_S04.22","CEV_S04.22"]},
- {"type": "undulator", "position": 1280, "name": "SHID_S05.01"},
+ {"type": "undulator", "position": 1280, "offset3d": [-400, 0, -200], "name": "SHID_S05.01"},
{"type": "sextupole_CHV", "position": 2430, "name": "SF_S05.01", "embedded":["CEH_S05.01","CEV_S05.01"]},
{"type": "bpm", "position": 2561, "name": "BPM_S05.01"},
{"type": "quadrupole", "position": 2700, "name": "QAB_S05.01"},
@@ -1524,7 +1524,7 @@
{"type": "bpm", "position": 2245, "name": "BPM_S05.07"},
{"type": "lmbf", "position": 2530, "name": "MBFLK_S05.01"},
- {"type": "undulator", "position": 3079, "name": "ID_S05.01"},
+ {"type": "undulator", "position": 3079, "offset3d": [-300, 0, -200], "name": "ID_S05.01"},
{"type": "tmbf", "position": 4547, "name": "MBFHVK_S05.01"},
@@ -1582,7 +1582,7 @@
{"type": "bpm", "position": 865, "name": "BPM_S05.14"},
{"type": "sextupole_CHV", "position": 1020, "name": "SF_S05.06", "embedded":["CEH_S05.22","CEV_S05.22"]},
- {"type": "undulator", "position": 1290, "name": "SHID_S06.01"},
+ {"type": "undulator", "position": 1290, "offset3d": [-200, 0, -400], "name": "SHID_S06.01"},
{"type": "sextupole_CHV", "position": 2430, "name": "SF_S06.01", "embedded":["CEH_S06.01","CEV_S06.01"]},
{"type": "bpm", "position": 2565, "name": "BPM_S06.01"},
@@ -1691,7 +1691,7 @@
{"type": "bpm", "position": 865, "name": "BPM_S06.14"},
{"type": "sextupole_CHV", "position": 1020, "name": "SF_S06.06", "embedded":["CEH_S06.22","CEV_S06.22"]},
- {"type": "undulator", "position": 1290, "name": "SHID_S07.01"},
+ {"type": "undulator", "position": 1290, "offset3d": [-100, 0, -400], "name": "SHID_S07.01"},
{"type": "sextupole_CHV", "position": 2430, "name": "SF_S07.01", "embedded":["CEH_S07.01","CEV_S07.01"]},
{"type": "bpm", "position": 2565, "name": "BPM_S07.01"},
@@ -2039,7 +2039,7 @@
{"type": "quadrupole", "position": 1260, "name": "QAB_S10.03"},
{"type": "bpm", "position": 1400, "name": "BPM_S10.04"},
{"type": "sextupole_CHV", "position": 1550, "name": "SD_S10.03", "embedded":["CEH_S10.05","CEV_S10.05"]},
- {"type": "corrector", "position": 2080, "name": "CFH_S10.02"}
+ {"type": "corrector", "position": 1800, "name": "CFH_S10.02"}
]
},
{
@@ -2113,7 +2113,7 @@
{"type": "quadrupole", "position": 1250, "name": "QAB_S10.07"},
{"type": "bpm", "position": 1391, "name": "BPM_S10.13"},
{"type": "sextupole_CHV", "position": 1541, "name": "SD_S10.09", "embedded":["CEH_S10.20","CEV_S10.20"]},
- {"type": "corrector", "position": 2080, "name": "CFHV_S10.06"}
+ {"type": "corrector", "position": 1800, "name": "CFHV_S10.06"}
]
},
{
@@ -2125,7 +2125,7 @@
{"type": "quadrupole", "position": 730, "name": "QAB_S10.08"},
{"type": "bpm", "position": 860, "name": "BPM_S10.14"},
{"type": "sextupole_CHV", "position": 1000, "name": "SF_S10.06", "embedded":["CEH_S10.22","CEV_S10.22"]},
- {"type": "undulator", "position": 1280, "name": "SHID_S11.01"},
+ {"type": "undulator", "position": 1280, "offset3d": [350, 0, 250], "name": "SHID_S11.01"},
{"type": "sextupole_CHV", "position": 2430, "name": "SF_S11.01", "embedded":["CEH_S11.01","CEV_S11.01"]},
{"type": "bpm", "position": 2561, "name": "BPM_S11.01"},
{"type": "quadrupole", "position": 2700, "name": "QAB_S11.01"},
@@ -2178,8 +2178,8 @@
{"type": "corrector", "position": 2040, "name": "CV_S11.01"},
{"type": "bpm", "position": 2245, "name": "BPM_S11.07"},
- {"type": "cavity_3hc", "position": 2580, "name": "3HC_S11.01"},
- {"type": "scw", "position": 4080, "name": "SCW_S11.01"},
+ {"type": "cavity_3hc", "position": 2580, "offset3d": [200, 0, 200], "name": "3HC_S11.01"},
+ {"type": "scw", "position": 4080, "offset3d": [500, 0, 450], "name": "SCW_S11.01"},
{"type": "corrector", "position": 5949, "name": "CHV_S11.02"},
{"type": "quadrupole", "position": 6299, "name": "QD_S11.03"},
@@ -2282,17 +2282,17 @@
{"type": "corrector", "position": 2040, "name": "CV_S12.01"},
{"type": "bpm", "position": 2245, "name": "BPM_S12.07"},
- {"type": "kicker", "position": 2455, "name": "KICKER_S12.1"},
- {"type": "vlv", "position": 2865, "name": "VLVINJ_S12.1"},
- {"type": "kicker", "position": 3106, "name": "KICKER_S12.2"},
- {"type": "flsc", "position": 3646, "name": "FLSC_S12.1"},
- {"type": "spte", "position": 3720, "length": 1600, "offset3d": [0, 0, 150], "ps": ["SEPTUM_BTS2.1","SEPTUM_BTS2.2"],"name": "SISR_BTS2.1", "alias": ["SISR_BTS2.2", "SE_S12.1", "SE_S12.2"]},
- {"type": "flsc", "position": 4651, "name": "FLSC_S12.2"},
- {"type": "kicker", "position": 4886, "name": "KICKER_S12.3"},
- {"type": "vlv", "position": 5289, "name": "VLVINJ_S12.2"},
- {"type": "kicker", "position": 5527, "name": "KICKER_S12.4"},
+ {"type": "kicker", "position": 2455, "length": 150, "offset3d": [0, 0, 150], "name": "KICKER_S12.1"},
+ {"type": "vlv", "position": 2865, "offset3d": [0, 0, 80], "name": "VLVINJ_S12.1"},
+ {"type": "kicker", "position": 3106, "length": 150, "offset3d": [0, 0, 180], "name": "KICKER_S12.2"},
+ {"type": "flsc", "position": 3646, "offset3d": [0, 0, 70], "name": "FLSC_S12.1"},
+ {"type": "spte", "position": 3720, "length": 600, "offset3d": [150, 0, 400], "ps": ["SEPTUM_BTS2.1","SEPTUM_BTS2.2"],"name": "SISR_BTS2.1", "alias": ["SISR_BTS2.2", "SE_S12.1", "SE_S12.2"]},
+ {"type": "flsc", "position": 4651, "offset3d": [0, 0, -50], "name": "FLSC_S12.2"},
+ {"type": "kicker", "position": 4886, "length": 150, "offset3d": [0, 0, 120], "name": "KICKER_S12.3"},
+ {"type": "vlv", "position": 5289, "offset3d": [0, 0, 50], "name": "VLVINJ_S12.2"},
+ {"type": "kicker", "position": 5527, "offset3d": [0, 0, 150], "length": 150, "name": "KICKER_S12.4"},
- {"type": "bpm", "position": 5939, "name": "BPM_S12.08"},
+ {"type": "bpm", "position": 5939, "offset3d": [0, 0, 50], "name": "BPM_S12.08"},
{"type": "corrector", "position": 6099, "name": "CV_S12.02"},
{"type": "quadrupole", "position": 6329, "name": "QD_S12.03"},
{"type": "sextupole_QK", "position": 6629, "name": "SH_S12.03", "embedded":["QS_S12.03","CEV_S12.12"]},
@@ -2312,7 +2312,7 @@
{"type": "quadrupole", "position": 730, "name": "QF_S12.04"},
{"type": "octupole_CHV", "position": 900, "name": "OCT_S12.04", "embedded":["CEH_S12.15","CEV_S12.15"]},
{"type": "bpm", "position": 1050, "name": "BPM_S12.10"},
- {"type": "sextupole_CHV", "position": 1240, "name": "SF_S12.04", "embedded":["CEH_S12.16","CEV_S12.16"]},
+ {"type": "sextupole_CHV", "position": 1200, "name": "SF_S12.04", "embedded":["CEH_S12.16","CEV_S12.16"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S12.05"},
{"type": "sextupole_CHV", "position": 1640, "name": "SD_S12.07", "embedded":["CEH_S12.17","CEV_S12.17"]},
{"type": "bpm", "position": 1789, "name": "BPM_S12.11"},
@@ -2328,10 +2328,10 @@
{"type": "bpm", "position": 650, "name": "BPM_S12.12"},
{"type": "quadrupole", "position": 800, "name": "QAB_S12.06"},
{"type": "sextupole_CHV", "position": 1020, "name": "SF_S12.05", "embedded":["CEH_S12.19","CEV_S12.19"]},
- {"type": "quadrupole", "position": 1420, "name": "QAB_S12.07"},
+ {"type": "quadrupole", "position": 1250, "name": "QAB_S12.07"},
{"type": "bpm", "position": 1391, "name": "BPM_S12.13"},
{"type": "sextupole_CHV", "position": 1541, "name": "SD_S12.09", "embedded":["CEH_S12.20","CEV_S12.20"]},
- {"type": "corrector", "position": 2080, "name": "CFHV_S12.06"}
+ {"type": "corrector", "position": 1780, "name": "CFHV_S12.06"}
]
},
{
--
GitLab