From e8823e96382be37da0f6ff6423251f7ef8e66643 Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Tue, 3 Dec 2024 01:45:54 +0000
Subject: [PATCH] Update fermi_lattice.json

---
 fermi_lattice.json | 177 +++++++++++++++++++++++----------------------
 1 file changed, 91 insertions(+), 86 deletions(-)

diff --git a/fermi_lattice.json b/fermi_lattice.json
index d47ffea..615a5e6 100644
--- a/fermi_lattice.json
+++ b/fermi_lattice.json
@@ -47,7 +47,7 @@
 					{"type": "correctorfermi", "position": 2051, "ps": ["PSCH_INJ.02","PSCV_INJ.02"], "name": "CHV_INJ.02"},
 					{"type": "vlv", "position": 2390, "name": "VLV_L00.01", "labelReverse": [90, 910, 130]},
 					{"type": "sip", "position": 2550, "name": "SIP75_L00.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L00.02", "SIP20_L00.01"]},
-					{"type": "cavitylinac", "position": 2702, "length": 1700, "name": "K2 - ACCT_L00.01"},
+					{"type": "cavitylinac", "position": 2702, "length": 1700, "name": "ACCT_L00.01 (K2)"},
 					{"type": "ACCT", "position": 4221, "name": "ACCT_L00.01"},
 					{"type": "blm", "position": 4221, "name": "BLM_ACCT_L00.01"},
 					{"type": "ACCT", "position": 4887, "name": "ACCT0_L00.01"},
@@ -61,7 +61,7 @@
 					{"type": "SOL", "position": 6100, "name": "SOL_L00.02"},
 					{"type": "sip", "position": 6200, "name": "SIP75_L00.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L00.02", "SIP20_L00.03", "SIP20_L00.04"]},
 					{"type": "ACCT0", "position": 5598, "name": "ACCT0_L00.02"},
-					{"type": "cavitylinac", "position": 6402, "length": 1700, "name": "K2 - ACCT_L00.02"},
+					{"type": "cavitylinac", "position": 6402, "length": 1700, "name": "ACCT_L00.02 (K2)"},
 					{"type": "ACCT", "position": 7491, "name": "ACCT_L00.02"},
 					{"type": "blm", "position": 8100, "name": "BLM_ACCT_L00.02"},
 					{"type": "ACCT0", "position": 9207, "name": "ACCT0_L00.02"},
@@ -202,7 +202,7 @@
 					{"type": "sip", "position": 2300, "name": "SIP300_L01.01", "offset2d": [30, -40], "labelReverse": [90, -350, 150], "embedded": ["SIP75_L01.01", "SIP75_L01.02", "SIP300_L01.02", "SIP300_L01.03"]},
 					{"type": "LH", "position": 2011, "name": "LH_02"},
 					{"type": "L01", "position": 2011, "name": "L01"},
-					{"type": "cavitylinac", "position": 2611, "length": 3400, "name": "K3 - ACCT_L01.01"},
+					{"type": "cavitylinac", "position": 2611, "length": 3400, "name": "ACCT_L01.01 (K3)"},
 					{"type": "blm", "position": 2711, "name": "BLM_ACCT_L01.01"},
 					{"type": "ACCT", "position": 4419, "name": "ACCT_L01.01"},
 					{"type": "ACCT", "position": 6807, "name": "ACCT_L01.01"},
@@ -212,7 +212,7 @@
 					{"type": "blm", "position": 7023, "name": "BLM_Q_L01.01"},
 					{"type": "correctorfermi", "position": 7414, "ps": ["PSCH_L01.01","PSCV_L01.01"], "name": "CHV_L01.01"},
 					{"type": "sip", "position": 7755, "name": "SIP300_L01.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "cavitylinac", "position": 7905, "length": 3400, "name": "K3 - ACCT_L01.02"},
+					{"type": "cavitylinac", "position": 7905, "length": 3400, "name": "ACCT_L01.02 (K3)"},
 					{"type": "blm", "position": 8005, "name": "BLM_ACCT_L01.02"},
 					{"type": "ACCT", "position": 10015, "name": "ACCT_L01.02"},
 					{"type": "ACCT", "position": 12803, "name": "ACCT_L01.02"},
@@ -225,7 +225,7 @@
 					{"type": "bpm", "position": 13737, "name": "BPM_L01.03", "labelReverse": [90, 1070, 130]},
 					{"type": "vlv", "position": 13930, "name": "VLV_L01.02", "labelReverse": [90, 920, 130]},
 					{"type": "sip", "position": 14060, "name": "SIP300_L01.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L01.05", "SIP75_L01.06", "SIP300_L01.06"]},
-					{"type": "cavitylinac", "position": 14225, "length": 3400,"name": "K5 - ACCT_L01.03"},
+					{"type": "cavitylinac", "position": 14225, "length": 3400,"name": "ACCT_L01.03 (K5)"},
 					{"type": "blm", "position": 14225, "name": "BLM_ACCT_L01.03"},
 					{"type": "ACCT", "position": 16511, "name": "ACCT_L01.04"},
 					{"type": "blm", "position": 16511, "name": "BLM_ACCT_L01.04"},
@@ -238,7 +238,7 @@
 					{"type": "plc", "position": 19036, "name": "SPMO_INL03.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
 					{"type": "correctorfermi", "position": 19676, "ps": ["PSCH_L01.03","PSCV_L01.03"], "name": "CHV_L01.03"},
 					{"type": "sip", "position": 19996, "name": "SIP300_L01.07", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "cavitylinac", "position": 20196, "length": 3400, "name": "K5 - ACCT_L01.04"},
+					{"type": "cavitylinac", "position": 20196, "length": 3400, "name": "ACCT_L01.04 (K5)"},
 					{"type": "ACCT", "position": 22106, "name": "ACCT_L01.04"},
 					{"type": "ACCT", "position": 24494, "name": "ACCT_L01.04"},
 					{"type": "sip", "position": 24100, "name": "SIP300_L01.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
@@ -387,7 +387,7 @@
 					{"type": "sip", "position": 3910, "name": "SIP300_L02.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.01", "SIP75_L02.03", "SIP300_L02.02"]},
 					{"type": "BC01", "position": 3910, "name": "BC01_02"},
 					{"type": "L02", "position": 3910, "name": "L02"},
-					{"type": "cavitylinac", "position": 4110, "length": 3400, "name": "K6 - ACCT_L02.01"},
+					{"type": "cavitylinac", "position": 4110, "length": 3400, "name": "ACCT_L02.01 (K6)"},
 					{"type": "blm", "position": 4110, "name": "BLM_ACCT_L02.01"},
 					{"type": "ACCT", "position": 6320, "name": "ACCT_L02.01"},
 					{"type": "ACCT", "position": 8708, "name": "ACCT_L02.01"},
@@ -397,7 +397,7 @@
 					{"type": "blm", "position": 8953, "name": "BLM_Q_L02.01"},
 					{"type": "correctorfermi", "position": 8993, "ps": ["PSCH_L02.01","PSCV_L02.01"], "name": "CHV_L02.01"},
 					{"type": "sip", "position": 9393, "name": "SIP300_L02.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.03", "SIP75_L02.04"]},
-					{"type": "cavitylinac", "position": 9606, "length": 3400, "name": "K6 - ACCT_L02.02"},
+					{"type": "cavitylinac", "position": 9606, "length": 3400, "name": "ACCT_L02.02 (K6)"},
 					{"type": "blm", "position": 9606, "name": "BLM_ACCT_L02.02"},
 					{"type": "ACCT", "position": 11916, "name": "ACCT_L02.02"},
 					{"type": "ACCT", "position": 14304, "name": "ACCT_L02.02"},
@@ -409,7 +409,7 @@
 					{"type": "correctorfermi", "position": 14429, "ps": ["PSCH_L02.02","PSCV_L02.02"], "name": "CHV_L02.02"},
 					{"type": "vlv", "position": 14800, "name": "VLV_L02.02", "labelReverse": [90, 940, 150]},
 					{"type": "sip", "position": 15050, "name": "SIP300_L02.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.05", "SIP75_L02.06", "SIP300_L02.06"]},
-					{"type": "cavitylinac", "position": 15302, "length": 3400, "name": "K7 - ACCT_L02.03"},
+					{"type": "cavitylinac", "position": 15302, "length": 3400, "name": "ACCT_L02.03 (K7)"},
 					{"type": "blm", "position": 15102, "name": "BLM_ACCT_L02.03", "labelReverse": [90, 1080, 130]},
 					{"type": "ACCT", "position": 17512, "name": "ACCT_L02.03"},
 					{"type": "ACCT", "position": 19900, "name": "ACCT_L02.03"},
@@ -419,7 +419,7 @@
 					{"type": "blm", "position": 20000, "name": "BLM_Q_L02.03"},
 					{"type": "correctorfermi", "position": 20326, "ps": ["PSCH_L02.03","PSCV_L02.03"], "name": "CHV_L02.03"},
 					{"type": "sip", "position": 20626, "name": "SIP300_L02.07","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "cavitylinac", "position": 20826, "name": "K7 - ACCT_L02.04"},
+					{"type": "cavitylinac", "position": 20826, "name": "ACCT_L02.04 (K7)"},
 					{"type": "ACCT", "position": 23300, "name": "ACCT_L02.04"},
 					{"type": "blm", "position": 23300, "name": "BLM_ACCT_L02.04"},
 					{"type": "sip", "position": 24540, "name": "SIP300_L02.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L03.03"]},
@@ -431,7 +431,7 @@
 					{"type": "sip", "position": 26100, "name": "SIP300_L03.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
 					{"type": "L02", "position": 25700, "name": "L02"},
 					{"type": "L03", "position": 25700, "name": "L03"},
-					{"type": "cavitylinac", "position": 26300, "length": 3400, "name": "K8 - ACCBT_L03.01"},
+					{"type": "cavitylinac", "position": 26300, "length": 3400, "name": "ACCBT_L03.01 (K8)"},
 					{"type": "ACCBT", "position": 27931, "name": "ACCBT_L03.01"},
 					{"type": "ACCBT", "position": 31133, "name": "ACCBT_L03.01"},
 					{"type": "sip", "position": 30300, "name": "SIP300_L03.02","offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L03.02", "SIP75_L03.3", "SIP75_L03.4"]},
@@ -440,7 +440,7 @@
 					{"type": "blm", "position": 31071, "name": "BLM_Q_L03.01"},
 					{"type": "correctorfermi", "position": 31595, "ps": ["PSCH_L03.01","PSCV_L03.01"], "name": "CHV_L03.01"},
 					{"type": "sip", "position": 31895, "name": "SIP300_L03.03","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "cavitylinac", "position": 32159, "length": 3400, "name": "K9 - ACCBT_L03.02"},
+					{"type": "cavitylinac", "position": 32159, "length": 3400, "name": "ACCBT_L03.02 (K9)"},
 					{"type": "blm", "position": 31933, "name": "BLM_ACCBT_L03.02"},
 					{"type": "ACCBT", "position": 35164, "name": "ACCBT_L03.02"},
 					{"type": "ACCBT", "position": 38365, "name": "ACCBT_L03.02"},
@@ -512,7 +512,7 @@
 					{"type": "sip", "position": 1847, "name": "SIP300_L04.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.02"]},
 					{"type": "BC02", "position": 1817, "name": "BC02"},
 					{"type": "L04", "position": 1817, "name": "L04"},
-					{"type": "cavitylinac", "position": 1997, "length": 3400, "name": "K10 - ACCBT_L04.01"},
+					{"type": "cavitylinac", "position": 1997, "length": 3400, "name": "ACCBT_L04.01 (K10)"},
 					{"type": "ACCBT", "position": 5048, "name": "ACCBT_L04.01"},
 					{"type": "ACCBT", "position": 8250, "name": "ACCBT_L04.01"},
 					{"type": "sip", "position": 5900, "name": "SIP300_L04.02", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.01", "SIP75_L04.02", "SIP75_L04.03", "SIP75_L04.04"]},
@@ -522,7 +522,7 @@
 					{"type": "flsc", "position": 8112, "name": "MSCR_L04.01"},
 					{"type": "correctorfermi", "position": 8612, "ps": ["PSCH_L04.01","PSCV_L04.01"], "name": "CHV_L04.01"},
 					{"type": "sip", "position": 9100, "name": "SIP300_L04.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.04"]},
-					{"type": "cavitylinac", "position": 9250, "length": 3400, "name": "K11 - ACCBT_L04.02"},
+					{"type": "cavitylinac", "position": 9250, "length": 3400, "name": "ACCBT_L04.02 (K11)"},
 					{"type": "ACCBT", "position": 12281, "name": "ACCBT_L04.02"},
 					{"type": "ACCBT", "position": 15482, "name": "ACCBT_L04.02"},
 					{"type": "sip", "position": 13062, "name": "SIP300_L04.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.05", "SIP75_L04.06", "SIP75_L04.07", "SIP75_L04.08"]},
@@ -532,7 +532,7 @@
 					{"type": "correctorfermi", "position": 15507, "ps": ["PSCH_L04.02","PSCV_L04.02"], "name": "CHV_L04.02"},
 					{"type": "vlv", "position": 16000, "name": "VLV_L04.02"},
 					{"type": "sip", "position": 16350, "name": "SIP300_L04.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.06"]},
-					{"type": "cavitylinac", "position": 16582, "length": 3400, "name": "K12 - ACCBT_L04.03"},
+					{"type": "cavitylinac", "position": 16582, "length": 3400, "name": "ACCBT_L04.03 (K12) "},
 					{"type": "ACCBT", "position": 19513, "name": "ACCBT_L04.03"},
 					{"type": "ACCBT", "position": 22715, "name": "ACCBT_L04.03"},
 					{"type": "sip", "position": 20400, "name": "SIP300_L04.06", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.09", "SIP75_L04.10", "SIP75_L04.11", "SIP75_L04.12"]},
@@ -541,7 +541,7 @@
 					{"type": "blm", "position": 21945, "name": "BLM_Q_L04.03"},
 					{"type": "correctorfermi", "position": 22740, "ps": ["PSCH_L04.03","PSCV_L04.03"], "name": "CHV_L04.03"},
 					{"type": "sip", "position": 23440, "name": "SIP300_L04.07", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.08"]},
-					{"type": "cavitylinac", "position": 23615, "length": 3400, "name": "K13 - ACCBT_L04.04"},
+					{"type": "cavitylinac", "position": 23615, "length": 3400, "name": "ACCBT_L04.04 (K13)"},
 					{"type": "ACCBT", "position": 26746, "name": "ACCBT_L04.04"},
 					{"type": "ACCBT", "position": 29947, "name": "ACCBT_L04.04"},
 					{"type": "sip", "position": 27600, "name": "SIP300_L04.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.13", "SIP75_L04.14", "SIP75_L04.15", "SIP75_L04.16"]},
@@ -552,7 +552,7 @@
 					{"type": "correctorfermi", "position": 29812, "ps": ["PSCH_L04.04","PSCV_L04.04"], "name": "CHV_L04.04"},
 					{"type": "vlv", "position": 30400, "name": "VLV_L04.03"},
 					{"type": "sip", "position": 30800, "name": "SIP300_L04.09","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "cavitylinac", "position": 30947, "length": 3400, "name": "K14 - ACCBT_L04.05"},
+					{"type": "cavitylinac", "position": 30947, "length": 3400, "name": "ACCBT_L04.05 (K14)"},
 					{"type": "ACCBT", "position": 33978, "name": "ACCBT_L04.05"},
 					{"type": "ACCBT", "position": 37180, "name": "ACCBT_L04.05"},
 					{"type": "sip", "position": 34800, "name": "SIP75_L04.17", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.18", "SIP75_L04.19", "SIP75_L04.20"]},
@@ -562,7 +562,7 @@
 					{"type": "correctorfermi", "position": 37305, "ps": ["PSCH_L04.05","PSCV_L04.05"], "name": "CHV_L04.05"},
 					{"type": "blm", "position": 37305, "name": "BLM_CHV_L04.05"},
 					{"type": "sip", "position": 38100, "name": "SIP75_L04.25", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.22", "SIP75_L04.23", "SIP75_L04.24", "SIP75_L04.25", "SIP55_L04.01", "SIP55_L04.02", "SIP75_L04.26", "SIP55_L04.03", "SIP55_L04.04"]},
-					{"type": "cavitylinac", "position": 39090, "length": 1700, "name": "K15 - ACCBT_L04.06"},
+					{"type": "cavitylinac", "position": 39090, "length": 1700, "name": "ACCBT_L04.06 (K15)"},
 					{"type": "ACCT", "position": 39660, "name": "ACCT_L04.06"},
 					
 					{"type": "bpm", "position": 41760, "name": "BPM_L04.06", "labelReverse": [90, 1100, 130]},
@@ -570,7 +570,7 @@
 					{"type": "blm", "position": 42217, "name": "BLM_CHV_L04.06"},
 					{"type": "blm", "position": 42400, "name": "BLM_Q_L04.06"},
 					{"type": "quadrupolefermi", "position": 42800, "name": "Q_L04.06"},					
-					{"type": "cavitylinac", "position": 43500, "length": 1700, "name": "K15 - ACCBT_L04.07"},
+					{"type": "cavitylinac", "position": 43500, "length": 1700, "name": "ACCBT_L04.07 (K15)"},
 					{"type": "ACCT", "position": 43597, "name": "ACCT_L04.07"},
 
 					{"type": "sip", "position": 45550, "name": "SIP75_L04.26", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.28", "SIP75_L04.29", "SIP75_L04.30"]},
@@ -580,7 +580,7 @@
 					{"type": "correctorfermi", "position": 46828, "ps": ["PSCH_L04.07","PSCV_L04.07"], "name": "CHV_L04.07"},
 					{"type": "blm", "position": 46928, "name": "BLM_CHV_L04.07"},
 					{"type": "sip", "position": 47328, "name": "SIP75_L04.27","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
-					{"type": "cavitylinac", "position": 47628, "length": 1700, "name": "HERFDY"},
+					{"type": "cavitylinac", "position": 47628, "length": 1700, "name": "HERFDY (K16)"},
 					{"type": "blm", "position": 48230, "name": "BLM_DCAV_L04.01"},
 					{"type": "L04", "position": 49980, "name": "L04"},
 
@@ -710,9 +710,9 @@
 					{"type": "sip", "position": 1199, "name": "SIP55_SCL.01","offset2d": [30, -40], "labelReverse": [90, 1030, 130]},
 					{"type": "quadrupolefermi", "position": 1449, "name": "Q_SCL.03", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 1449, "name": "BLM_Q_SCL.03"},
-					{"type": "GCOL", "position": 1849, "name": "ECOL_SCL.01", "labelReverse": [90, 1120, 200]},
-					{"type": "sip", "position": 1849, "name": "SIP300_SCL.01","offset2d": [30, -40], "offset3d": [0, -300, 0], "labelReverse": [90, -450, 150]},
-					{"type": "bpm", "position": 2400, "name": "BPM_SCL.01", "labelReverse": [90, 1200, 150]},
+					{"type": "bpm", "position": 1849, "name": "BPM_SCL.01", "labelReverse": [90, 1200, 150]},
+					{"type": "GCOL", "position": 2200, "name": "ECOL_SCL.01", "labelReverse": [90, 1120, 200]},
+					{"type": "sip", "position": 2200, "name": "SIP300_SCL.01","offset2d": [30, -40], "offset3d": [0, -300, 0], "labelReverse": [90, -450, 150]},
 					{"type": "blm", "position": 2644, "name": "BLM_ECOL_SCL.01"},
 					{"type": "quadrupolefermi", "position": 2799, "name": "Q_SCL.04", "labelReverse": [90, 920, 200]},
 					{"type": "blm", "position": 2899, "name": "BLM_Q_SCL.04"},
@@ -777,9 +777,9 @@
 					{"type": "correctorfermi", "position": 1237, "ps": ["PSCH_SFEL01.03","PSCV_SFEL01.03"], "name": "CHV_SFEL01.03", "labelReverse": [90, 1130, 200]},
 					{"type": "quadrupolefermi", "position": 1787, "name": "Q_SFEL01.05", "labelReverse": [90, 1000, 200]},
 					{"type": "blm", "position": 1787, "name": "BLM_Q_SFEL01.05"},
-					{"type": "GCOL", "position": 2287, "name": "ECOL_SFEL01.01", "labelReverse": [90, 1210, 400]},
-					{"type": "sip", "position": 2287, "name": "SIP300_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1220, 150]},
-					{"type": "bpm", "position": 2756, "name": "BPM_SFEL01.03", "labelReverse": [90, 1290, 150]},
+					{"type": "bpm", "position": 2200, "name": "BPM_SFEL01.03", "labelReverse": [90, 1290, 150]},
+					{"type": "GCOL", "position": 2500, "name": "ECOL_SFEL01.01", "labelReverse": [90, 1210, 400]},
+					{"type": "sip", "position": 2500, "name": "SIP300_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1220, 150]},
 					{"type": "sip", "position": 3050, "name": "SIP55_SFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1200, 150]},
 					{"type": "quadrupolefermi", "position": 3337, "name": "Q_SFEL01.06", "labelReverse": [90, 1050, 200]},
 					{"type": "flsc", "position": 3657, "name": "MSCR_SFEL01.01", "labelReverse": [90, 1250, 200]},
@@ -806,13 +806,13 @@
 					{"type": "correctorfermi", "position": 3727, "ps": ["PSCH_SFEL01.06","PSCV_SFEL01.06"], "name": "CHV_SFEL01.06", "labelReverse": [90, 1200, 200]},
 					{"type": "quadrupolefermi", "position": 4050, "name": "Q_SFEL01.11", "labelReverse": [90, 1070, 200]},
 					{"type": "blm", "position": 4050, "name": "BLM_Q_SFEL01.11"},
-					{"type": "cm", "position": 4405, "name": "CM_SFEL01.01", "labelReverse": [90, 1150, 170]},
-					{"type": "cbpm", "position": 4750, "name": "CBPM_SFEL01.01", "labelReverse": [90, 1300, 130]},
+					{"type": "cbpm", "position": 4400, "name": "CBPM_SFEL01.01", "labelReverse": [90, 1300, 130]},
+					{"type": "cm", "position": 4750, "name": "CM_SFEL01.01", "labelReverse": [90, 1150, 170]},
 					{"type": "sip", "position": 5070, "name": "SIP150_SFEL01.01", "offset2d": [30, -40], "labelReverse": [90, 1280, 150], "embedded": ["SIP55_SFEL01.06"]},
 					{"type": "flsc", "position": 5300, "name": "MSCR_SFEL01.02", "labelReverse": [90, 1300, 250]},
 					{"type": "sip", "position": 5650, "name": "SIP55_SFEL01.06","offset2d": [30, -40], "labelReverse": [90, 1250, 150]},
-					{"type": "BAM", "position": 5006, "name": "BAM_SFEL01.01"},
-					{"type": "cbpm", "position": 6050, "name": "CBPM_SFEL01.02", "labelReverse": [90, 1300, 130]},
+					{"type": "SOL", "position": 6000, "name": "BAM_SFEL01.01", "labelReverse": [90, 1250, 150]},
+					{"type": "cbpm", "position": 6350, "name": "CBPM_SFEL01.02", "labelReverse": [90, 1300, 130]},
 					{"type": "EOS", "position": 6935, "name": "EOS_SFEL01.01"},
 					{"type": "sip", "position": 7804, "name": "SIP150_SFEL01.02", "offset2d": [30, -40], "labelReverse": [90, 1280, 150], "embedded": ["SIP55_SFEL01.06"]},
 					{"type": "vlv", "position": 8230, "name": "VLV_SFEL01.02", "labelReverse": [90, 1200, 150]},
@@ -856,27 +856,26 @@
 				"components": [
 					{"type": "cbpm", "position": 424, "name": "CBPM_FEL01.02", "labelReverse": [90, 1300, 130]},
 					{"type": "quadrupolefermi", "position": 685, "name": "Q_FEL01.02", "labelReverse": [90, 1070, 200]},
-					{"type": "correctorfermi", "position": 1000, "ps": ["PSCH_FEL01.02","PSCV_FEL01.02"], "name": "CHV_IUFEL01.02", "labelReverse": [90, 1300, 200]},
+					{"type": "correctorfermi", "position": 1000, "ps": ["PSCH_FEL01.02","PSCV_FEL01.02"], "name": "CHV_FEL01.02", "labelReverse": [90, 1300, 200]},
 					{"type": "sip", "position": 1250, "name": "SIP55_IUFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
 					{"type": "flsc", "position": 1437, "name": "MSCR_FEL01.02", "labelReverse": [90, 1300, 250]},
 					{"type": "blm", "position": 1437, "name": "BLM_MSCR_FEL01.02"},
 					{"type": "BAM", "position": 1283, "name": "BAM_FEL01.01"},
-					{"type": "undulator", "position": 2142, "name": "ID_FEL01.03  (MOD01.02)", "labelReverse": [90, 1990, 450]},
+					{"type": "undulator", "position": 2142, "name": "ID_IUFEL01.03  (MOD01.02)", "labelReverse": [90, 1990, 450]},
 					{"type": "W", "position": 3305, "name": "W_FEL01.01", "labelReverse": [90, 1000, 220]},
-					{"type": "bpm", "position": 3800, "name": "BPM_IUFEL01.01", "labelReverse": [90, 1300, 130]},
 					{"type": "cbpm", "position": 3821, "name": "CBPM_IUFEL01.02", "labelReverse": [90, 1300, 130]},
 					{"type": "quadrupolefermi", "position": 4231, "name": "Q_IUFEL01.02", "labelReverse": [90, 1070, 200]},
 					{"type": "correctorfermi", "position": 4631, "ps": ["PSCH_IUFEL01.02","PSCV_IUFEL01.02"], "name": "CHV_IUFEL01.02", "labelReverse": [90, 1200, 200]},
 					{"type": "sip", "position": 5050, "name": "SIP55_IUFEL01.02","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
 					{"type": "flsc", "position": 5523, "name": "MSCR_IUFEL01.02", "labelReverse": [90, 1300, 250]},
-					{"type": "undulator", "position": 6340, "name": "ID_FEL01.04  (RAD01.03)", "labelReverse": [90, 1990, 450]},
+					{"type": "undulator", "position": 6340, "name": "ID_IUFEL01.04  (RAD01.03)", "labelReverse": [90, 1990, 450]},
 					{"type": "PHSH", "position": 7488, "name": "PHSH_IUFEL01.03", "labelReverse": [90, 1300, 100]},
 					{"type": "cbpm", "position": 7936, "name": "CBPM_IUFEL01.03", "labelReverse": [90, 1300, 130]},
 					{"type": "quadrupolefermi", "position": 8246, "name": "Q_IUFEL01.03", "labelReverse": [90, 1070, 200]},
 					{"type": "correctorfermi", "position": 8706, "ps": ["PSCH_IUFEL01.03","PSCV_IUFEL01.03"], "name": "CHV_IUFEL01.03", "labelReverse": [90, 1200, 200]},
 					{"type": "sip", "position": 9050, "name": "SIP55_IUFEL01.03", "offset2d": [30, -40], "labelReverse": [90, 1210, 150], "embedded": ["SIP55_IUFEL01.04"]},
 					{"type": "flsc", "position": 9338, "name": "MSCR_IUFEL01.03", "labelReverse": [90, 1300, 250]},
-					{"type": "undulator", "position": 10055, "name": "ID_FEL01.05  (RAD01.04)", "labelReverse": [90, 1990, 450]},
+					{"type": "undulator", "position": 10055, "name": "ID_IUFEL01.05  (RAD01.04)", "labelReverse": [90, 1990, 450]},
 					{"type": "blm", "position": 10055, "name": "BLM_ID_FEL01.05"},
 					{"type": "PHSH", "position": 11203, "name": "PHSH_IUFEL01.04", "labelReverse": [90, 1300, 100]},
 					{"type": "cbpm", "position": 11651, "name": "CBPM_IUFEL01.04", "labelReverse": [90, 1300, 130]},
@@ -884,26 +883,28 @@
 					{"type": "correctorfermi", "position": 12331, "ps": ["PSCH_IUFEL01.04","PSCV_IUFEL01.04"], "name": "CHV_IUFEL01.04", "labelReverse": [90, 1200, 200]},
 					{"type": "sip", "position": 12671, "name": "SIP55_IUFEL01.04","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
 					{"type": "flsc", "position": 12903, "name": "MSCR_IUFEL01.04", "labelReverse": [90, 1300, 250]},
-					{"type": "undulator", "position": 13770, "name": "ID_FEL01.06  (RAD01.05)", "labelReverse": [90, 1990, 450]},
+					{"type": "undulator", "position": 13770, "name": "ID_IUFEL01.06  (RAD01.05)", "labelReverse": [90, 1990, 450]},
 					{"type": "PHSH", "position": 14900, "name": "PHSH_IUFEL01.05", "labelReverse": [90, 1300, 100]},
 					{"type": "cbpm", "position": 15365, "name": "CBPM_IUFEL01.05", "labelReverse": [90, 1300, 130]},
 					{"type": "quadrupolefermi", "position": 15751, "name": "Q_IUFEL01.05", "labelReverse": [90, 1070, 200]},
 					{"type": "correctorfermi", "position": 16105, "ps": ["PSCH_IUFEL01.05","PSCV_IUFEL01.05"], "name": "CHV_IUFEL01.05", "labelReverse": [90, 1200, 200]},
 					{"type": "sip", "position": 16455, "name": "SIP55_IUFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
-					{"type": "undulator", "position": 17484, "name": "ID_FEL01.07  (RAD01.06)", "labelReverse": [90, 1990, 450]},
+					{"type": "flsc", "position": 16755, "name": "MSCR_IUFEL01.05", "labelReverse": [90, 1300, 250]},
+					{"type": "undulator", "position": 17484, "name": "ID_IUFEL01.07  (RAD01.06)", "labelReverse": [90, 1990, 450]},
 					{"type": "PHSH", "position": 18632, "name": "PHSH_IUFEL01.06", "labelReverse": [90, 1300, 100]},
 					{"type": "cbpm", "position": 19080, "name": "CBPM_IUFEL01.06", "labelReverse": [90, 1300, 130]},
 					{"type": "quadrupolefermi", "position": 19391, "name": "Q_IUFEL01.06", "labelReverse": [90, 1070, 200]},
 					{"type": "correctorfermi", "position": 19751, "ps": ["PSCH_IUFEL01.06","PSCV_IUFEL01.06"], "name": "CHV_IUFEL01.06", "labelReverse": [90, 1200, 200]},
 					{"type": "sip", "position": 20100, "name": "SIP55_IUFEL01.06","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
 					{"type": "flsc", "position": 20383, "name": "MSCR_IUFEL01.06", "labelReverse": [90, 1300, 250]},
-					{"type": "undulator", "position": 21189, "name": "ID_FEL01.08  (RAD01.07)", "labelReverse": [90, 1990, 450]},
+					{"type": "undulator", "position": 21189, "name": "ID_IUFEL01.08  (RAD01.07)", "labelReverse": [90, 1990, 450]},
 					{"type": "PHSH", "position": 22347, "name": "PHSH_IUFEL01.07", "labelReverse": [90, 1300, 100]},
 					{"type": "cbpm", "position": 22795, "name": "CBPM_IUFEL01.07", "labelReverse": [90, 1300, 130]},
 					{"type": "quadrupolefermi", "position": 23106, "name": "Q_IUFEL01.07", "labelReverse": [90, 1070, 200]},
 					{"type": "correctorfermi", "position": 23506, "ps": ["PSCH_IUFEL01.07","PSCV_IUFEL01.07"], "name": "CHV_IUFEL01.07", "labelReverse": [90, 1200, 200]},
 					{"type": "sip", "position": 23906, "name": "SIP55_IUFEL01.07","offset2d": [30, -40], "labelReverse": [90, 1210, 150]},
-					{"type": "undulator", "position": 24904, "name": "ID_FEL01.09  (RAD01.08)", "labelReverse": [90, 1990, 450]},
+					{"type": "flsc", "position": 24206, "name": "MSCR_IUFEL01.07", "labelReverse": [90, 1300, 250]},
+					{"type": "undulator", "position": 24904, "name": "ID_IUFEL01.09  (RAD01.08)", "labelReverse": [90, 1990, 450]},
 					{"type": "blm", "position": 24904, "name": "BLM_ID_FEL01.09"},
 					{"type": "cbpm", "position": 26532, "name": "CBPM_IUFEL01.08", "labelReverse": [90, 1300, 130]},
 					{"type": "quadrupolefermi", "position": 27021, "name": "Q_IUFEL01.08", "labelReverse": [90, 1070, 200]},
@@ -947,13 +948,13 @@
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD_FEL01.01_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD_FEL01.01_R"},
-					{"type": "quadrupolefermi", "position": 1050, "name": "Q_MBD_FEL01.05"},
-					{"type": "bpm", "position": 1378, "name": "BPM_MBD_FEL01.03"},
-					{"type": "quadrupolefermi", "position": 1700, "name": "Q_MBD_FEL01.06"},
+					{"type": "bpm", "position": 1078, "name": "BPM_MBD_FEL01.03"},
+					{"type": "quadrupolefermi", "position": 1350, "name": "Q_MBD_FEL01.05"},
+					{"type": "correctorfermi", "position": 1700, "ps": ["PSCH_MBD_FEL01.04","PSCV_MBD_FEL01.04"], "name": "CHV_MBD_FEL01.04"},
 					{"type": "blm", "position": 1700, "name": "BLM_Q_MBD_FEL01.06_L"},
 					{"type": "blm", "position": 1700, "name": "BLM_Q_MBD_FEL01.06_R"},					
 					{"type": "vlv", "position": 2200, "name": "VLV_MBD_FEL01.02"},
-					{"type": "correctorfermi", "position": 2500, "ps": ["PSCH_MBD_FEL01.04","PSCV_MBD_FEL01.04"], "name": "CHV_MBD_FEL01.04"},
+					{"type": "quadrupolefermi", "position": 2500, "name": "Q_MBD_FEL01.06"},
 					{"type": "bpm", "position": 4662, "name": "BPM_MBD.01"},
 					{"type": "blm", "position": 4662, "name": "BLM_BPM_MBD.01_DN"},
 					{"type": "blm", "position": 4662, "name": "BLM_BPM_MBD.01_UP"},
@@ -1072,8 +1073,8 @@
 					{"type": "cbpm", "position": 4909, "name": "CBPM_SFEL02.01", "labelReverse": [90, -350, 150]},
 					{"type": "cm", "position": 5135, "name": "CM_SFEL02.01", "labelReverse": [90, -350, 200]},
 					{"type": "sip", "position": 5350, "name": "SIP55_SFEL02.03","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
-					{"type": "BAM", "position": 5400, "name": "BAM_SFEL02.01", "labelReverse": [90, -350, 200]},
-					{"type": "cbpm", "position": 5700, "name": "CBPM_SFEL02.02", "labelReverse": [90, -350, 150]},
+					{"type": "SOL", "position": 5550, "name": "BAM_SFEL02.01", "labelReverse": [90, -390, 150]},
+					{"type": "cbpm", "position": 5750, "name": "CBPM_SFEL02.02", "labelReverse": [90, -350, 150]},
 					{"type": "flsc", "position": 5921, "name": "MSCR_SFEL02.02", "labelReverse": [90, -350, 250]},
 					{"type": "blm", "position": 5921, "name": "BLM_MSCR_SFEL02.02", "labelReverse": [90, -250, 250]},
 					{"type": "EOS", "position": 6935, "name": "EOS_SFEL02.01", "labelReverse": [90, -250, 250]},
@@ -1088,12 +1089,14 @@
 					{"type": "quadrupolefermi", "position": 12379, "name": "Q_FEL02.01", "labelReverse": [90, -350, 200]},
 					{"type": "correctorfermi", "position": 12879, "ps": ["PSCH_FEL02.01","PSCV_FEL02.01"], "name": "CHV_FEL02.01", "labelReverse": [90, -350, 200]},
 					{"type": "sip", "position": 13350, "name": "SIP55_FEL02.02","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "flsc", "position": 13750, "name": "MSCR_FEL02.01", "labelReverse": [90, -350, 250]},
 					{"type": "undulator", "position": 15103, "name": "ID_FEL02.02  (RAD02.01)", "labelReverse": [90, -650, 450]},
 					{"type": "PHSH", "position": 16254, "name": "PHSH_IUFEL02.01", "offset3d": [-800, 0, 0], "labelReverse": [90, -350, 120]},
 					{"type": "cbpm", "position": 16608, "name": "CBPM_IUFEL02.01", "labelReverse": [90, -350, 150]},
 					{"type": "quadrupolefermi", "position": 17019, "name": "Q_IUFEL02.01", "labelReverse": [90, -350, 200]},
 					{"type": "correctorfermi", "position": 17459, "ps": ["PSCH_IUFEL02.01","PSCV_IUFEL02.01"], "name": "CHV_IUFEL02.01", "labelReverse": [90, -350, 200]},
 					{"type": "sip", "position": 17780, "name": "SIP55_IUFEL02.01","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "flsc", "position": 18110, "name": "MSCR_IUFEL02.01", "labelReverse": [90, -350, 250]},
 					{"type": "undulator", "position": 18818, "name": "ID_FEL02.03  (RAD02.02)", "labelReverse": [90, -650, 450]},
 					{"type": "PHSH", "position": 19969, "name": "PHSH_IUFEL02.02", "offset3d": [-800, 0, 0], "labelReverse": [90, -350, 120]},
 					{"type": "cbpm", "position": 20423, "name": "BPM_IUFEL02.02", "labelReverse": [90, -350, 150]},
@@ -1190,10 +1193,12 @@
 					{"type": "correctorfermi", "position": 27778, "ps": ["PSCH_IUFEL02.08","PSCV_IUFEL02.08"], "name": "CHV_IUFEL02.08", "labelReverse": [90, -350, 200]},
 					{"type": "sip", "position": 28150, "name": "SIP55_IUFEL02.08","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
 					{"type": "flsc", "position": 28356, "name": "MSCR_IUFEL02.08", "labelReverse": [90, -350, 250]},
-					{"type": "bpm", "position": 30681, "name": "BPM_IUFEL02.02", "labelReverse": [90, -350, 150]},
+					{"type": "bpm", "position": 30381, "name": "BPM_IUFEL02.01", "labelReverse": [90, -350, 150]},
+					{"type": "bpm", "position": 30681, "name": "CBPM_IUFEL02.10", "labelReverse": [90, -350, 150]},
 					{"type": "quadrupolefermi", "position": 31093, "name": "Q_IUFEL02.09", "labelReverse": [90, -350, 200]},
 					{"type": "correctorfermi", "position": 31493, "ps": ["PSCH_IUFEL02.09","PSCV_IUFEL02.09"], "name": "CHV_IUFEL02.09", "labelReverse": [90, -350, 200]},
 					{"type": "sip", "position": 31903, "name": "SIP55_IUFEL02.09","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "flsc", "position": 32203, "name": "MSCR_IUFEL02.09", "labelReverse": [90, -350, 250]},
 					{"type": "quadrupolefermi", "position": 34908, "name": "Q_IUFEL02.10", "labelReverse": [90, -350, 200]},
 					{"type": "correctorfermi", "position": 35300, "ps": ["PSCH_IUFEL02.10","PSCV_IUFEL02.10"], "name": "CHV_IUFEL02.10", "labelReverse": [90, -350, 200]},
 					{"type": "blm", "position": 35400, "name": "BLM_CHV_IUFEL02.10", "labelReverse": true},
@@ -1941,56 +1946,56 @@
 				]
 			},
 			{
-				"start": {"x": -122000, "y": 5000, "z": -10000}
+				"start": {"x": -122000, "y": 7500, "z": -10000}
 			},
 			{
-				"start": {"x": -178800, "y": 5000, "z": -8000},
+				"start": {"x": -178800, "y": 7500, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KGSP", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KGSP", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -178800, "y": 5000, "z": -14000},
+				"start": {"x": -178800, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -169500, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG01", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG01", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -169500, "y": 5000, "z": -14000},
+				"start": {"x": -169500, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -152800, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG02", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG02", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -152800, "y": 5000, "z": -14000},
+				"start": {"x": -152800, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -143800, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG03", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG03", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -143800, "y": 5000, "z": -14000},
+				"start": {"x": -143800, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -136150, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG04", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG04", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -136150, "y": 5000, "z": -14000},
+				"start": {"x": -136150, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
@@ -2000,37 +2005,37 @@
 				]
 			},
 			{
-				"start": {"x": -105300, "y": 5000, "z": -14000},
+				"start": {"x": -105300, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -95700, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG06", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG06", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -95700, "y": 5000, "z": -14000},
+				"start": {"x": -95700, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -81200, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG07", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG07", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -81200, "y": 5000, "z": -14000},
+				"start": {"x": -81200, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -74200, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG08", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG08", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -74200, "y": 5000, "z": -14000},
+				"start": {"x": -74200, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
@@ -2040,67 +2045,67 @@
 				]
 			},
 			{
-				"start": {"x": -52600, "y": 5000, "z": -14000},
+				"start": {"x": -52600, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -44900, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG10", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG10", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -44900, "y": 5000, "z": -14000},
+				"start": {"x": -44900, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -37600, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG11", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG11", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -37600, "y": 5000, "z": -14000},
+				"start": {"x": -37600, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -31400, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG12", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG12", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -31400, "y": 5000, "z": -14000},
+				"start": {"x": -31400, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -24400, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG13", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG13", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -24400, "y": 5000, "z": -14000},
+				"start": {"x": -24400, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
 				"start": {"x": -17100, "y": 5000, "z": -8000},
 				"components": [
-					{"type": "label", "position": 2000, "name": "KG14", "labelReverse": [-90, -1000, -1000]}
+					{"type": "label", "position": 2000, "name": "KG14", "labelReverse": [-90, -4000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -17100, "y": 5000, "z": -14000},
+				"start": {"x": -17100, "y": 7500, "z": -14000},
 				"chamber": {"type": "wall"}
 			},
 			{
-				"start": {"x": -4100, "y": 4000, "z": -8000},
+				"start": {"x": -4100, "y": 5000, "z": -8000},
 				"components": [
 					{"type": "label", "position": 2000, "name": "KG15", "labelReverse": [-90, -8000, -1000]}
 				]
 			},
 			{
-				"start": {"x": -4100, "y": 4000, "z": -14000}
+				"start": {"x": -4100, "y": 7500, "z": -14000}
 			},
 			{
 				"start": {"x": -157929, "y": 4000, "z": -1811},
@@ -2143,7 +2148,7 @@
 			},
 		
 			{
-				"start": {"x": -11400, "y": 4000, "z": -11600},
+				"start": {"x": -11400, "y": 5000, "z": -11600},
 				"components": [
 					{"type": "rar2", "position": 0, "name": "RAR2_KG15.02", "embedded":["slave-mod-k16-01"]},
 					{"type": "rv", "position": 800, "name": "RV_KG15.01", "width": 800, "height": 2000, "depth": 600, "embedded":[
@@ -2169,42 +2174,42 @@
 				]
 			},
 			{
-				"start": {"x": -1000, "y": 4000, "z": -11600},
+				"start": {"x": -1000, "y": 5000, "z": -11600},
 				"bending": {"rotateY": "PI"},
 				"components": [
 				]
 			},
 			{
-				"start": {"x": -10600, "y": 4000, "z": -8611},
+				"start": {"x": -10600, "y": 5000, "z": -8611},
 				"components": [
 					{"type": "rllrf", "position": 800, "name": "RLLRF_KG16", "labelReverse": [90, -1100, 350]},
 					{"type": "klystron", "position": 1400, "name": "TKLY_KG16", "labelReverse": [90, -1100, 350]}
 				]
 			},
 			{
-				"start": {"x": -7000, "y": 4000, "z": -8611},
+				"start": {"x": -7000, "y": 5000, "z": -8611},
 				"components": [
 				]
 			},
 			{
-				"start": {"x": -8100, "y": 4000, "z": -9011},
+				"start": {"x": -8100, "y": 5000, "z": -9011},
 				"components": [
 					{"type": "rar1", "position": 0, "name": "RAR1_KG15.02", "offset2d": [0, -300, 0], "offset3d": [-1100, 0, -1500], "reverse": false, "labelReverse": [90, -100, -100]}
 				]
 			},
 			{
-				"start": {"x": -8100, "y": 4000, "z": -7111},
+				"start": {"x": -8100, "y": 5000, "z": -7111},
 				"components": [
 				]
 			},
 			{
-				"start": {"x": -8400, "y": 4000, "z": -8411},
+				"start": {"x": -8400, "y": 5000, "z": -8411},
 				"components": [
 					{"type": "donatello", "position": -300, "name": "HVPS_KG16.02", "offset2d": [100, -500, 0], "offset3d": [-200, 0, -2300], "labelReverse": [-90, 2700, -200]}
 				]
 			},
 			{
-				"start": {"x": -8400, "y": 4000, "z": -9011},
+				"start": {"x": -8400, "y": 5000, "z": -9011},
 				"components": [
 				]
 			},
-- 
GitLab