From c3c1adcb4bd70ab1d8208b086f86a5f1e3a76dee Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Wed, 7 Aug 2024 00:37:33 +0000
Subject: [PATCH] Update elettra2_lattice.json

---
 elettra2_lattice.json | 789 +++++++++++++++++++++++++++++-------------
 1 file changed, 550 insertions(+), 239 deletions(-)

diff --git a/elettra2_lattice.json b/elettra2_lattice.json
index cc7c7fe..fb4cf77 100644
--- a/elettra2_lattice.json
+++ b/elettra2_lattice.json
@@ -1,78 +1,95 @@
 {
+	
 	"preinjector": {
 		"sections": [
 			{
-				"start": {"x": 19415, "z": 13125},
-				"components": [
-					{"type": "gun", "position": 0, "name": "Gun", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary"},
-					{"type": "cm", "position": 2270.5, "name": "CM_P1.1"},
-					{"type": "quadrupolebooster", "position": 2366, "length": 50, "name": "QD_P1.1"},
-					{"type": "quadrupolebooster", "position": 2449, "length": 50, "name": "QF_P1.2"},
-					{"type": "quadrupolebooster", "position": 2532, "length": 50, "name": "QD_P1.3"},
-					{"type": "bpm", "position": 2632, "name": "BPM_P1.1"},
-					{"type": "blm", "position": 2632, "name": "BPM_P1.1_R"},
-					{"type": "blm", "position": 2632, "name": "BPM_P1.1_L"},
-					{"type": "flsc", "position": 2882, "name": "FLSC_P1.2"},
-					{"type": "correctorbooster", "position": 3321.5, "name": "CHAS_P1.1"},
-					{"type": "cavitylinac", "position": 5604, "length": 4300, "rotateY": "PI/2", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary", "name": "ACCT_P1.1"},
-					{"type": "correctorbooster", "position": 7886.5, "name": "CHAS_P1.2"},
-					{"type": "quadrupolebooster", "position": 8272, "length": 50, "name": "QD_P1.4"},
-					{"type": "quadrupolebooster", "position": 8355, "length": 50, "name": "QF_P1.5"},
-					{"type": "quadrupolebooster", "position": 8438, "length": 50, "name": "QD_P1.6"},
-					{"type": "cm", "position": 8523, "name": "CM_P1.2"},
-					{"type": "bpm", "position": 8583, "name": "BPM_P1.2"},
-					{"type": "blm", "position": 8583, "name": "BPM_P1.2_R"},
-					{"type": "blm", "position": 8583, "name": "BPM_P1.2_L"},
-					{"type": "flsc", "position": 8838, "name": "FLSC_P1.3"},
-					{"type": "correctorbooster", "position": 9198.5, "name": "CHAS_P1.3"},
-					{"type": "cavitylinac", "position": 11481, "length": 4300, "rotateY": "PI/2", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary", "name": "ACCT_P1.2"},
-					{"type": "correctorbooster", "position": 13763.5, "name": "CHAS_P1.4"},
-					{"type": "cm", "position": 14169, "name": "CM_PTB1.1"},
-					{"type": "correctorbooster", "position": 14369, "name": "CH_PTB1.1"},
-					{"type": "bpm", "position": 14609, "name": "BPM_PTB1.1"},
+				"start": {"x": 19415, "z": 14125},
+				"components": [
+					{"type": "gun", "position": -300, "name": "GUN", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary"},
+					{"type": "lens", "position": 130, "name": "LENS_P1.1", "labelReverse": [270, 900, -50]},
+					{"type": "vlv", "position": 190, "name": "VLV_P1.1"},
+					{"type": "cm", "position": 360, "name": "CM_P1.1"},
+					{"type": "lens", "position": 500, "name": "LENS_P1.2", "labelReverse": [270, 900, -50]},
+					{"type": "lens", "position": 700, "name": "LENS_P1.3", "labelReverse": [270, 900, -50]},
+					{"type": "lens", "position": 890, "name": "LENS_P1.4", "labelReverse": [270, 900, -50]},
+					{"type": "lens", "position": 1050, "name": "LENS_P1.5", "labelReverse": [270, 900, -50]},
+					{"type": "cm", "position": 1150, "name": "CM_P1.2"},
+					{"type": "quadrupolebooster", "position": 1366, "length": 50, "name": "Q_P1.1"},
+					{"type": "quadrupolebooster", "position": 1649, "length": 50, "name": "Q_P1.2"},
+					{"type": "quadrupolebooster", "position": 1932, "length": 50, "name": "Q_P1.3"},
+					{"type": "bpm", "position": 2182, "name": "BPM_P1.1"},
+					{"type": "blm", "position": 2282, "name": "BPM_P1.1_R"},
+					{"type": "blm", "position": 2282, "name": "BPM_P1.1_L"},
+					{"type": "flsc", "position": 2382, "name": "FLSC_P1.2"},
+					{"type": "correctorbooster", "position": 2621.5, "name": "CH_P1.1"},
+					{"type": "correctorbooster", "position": 2881.5, "name": "CV_P1.1"},
+					{"type": "vlv", "position": 3100, "name": "VLV_P1.2"},
+					{"type": "cavitylinac", "position": 4804, "length": 3300, "rotateY": "PI/2", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary", "offset2d": [1100, 100], "name": "ACCT_P1.1"},
+					{"type": "vlv", "position": 6700, "name": "VLV_P1.3"},
+					{"type": "cm", "position": 7000, "name": "CM_P1.3"},
+					{"type": "correctorbooster", "position": 7256.5, "name": "CH_P1.2"},
+					{"type": "correctorbooster", "position": 7486.5, "name": "CV_P1.2"},
+					{"type": "quadrupolebooster", "position": 7772, "length": 50, "name": "Q_P1.4"},
+					{"type": "quadrupolebooster", "position": 8085, "length": 50, "name": "Q_P1.5"},
+					{"type": "quadrupolebooster", "position": 8338, "length": 50, "name": "Q_P1.6"},
+					{"type": "bpm", "position": 8723, "name": "BPM_P1.2"},
+					{"type": "blm", "position": 8783, "name": "BPM_P1.2_R"},
+					{"type": "blm", "position": 8783, "name": "BPM_P1.2_L"},
+					{"type": "flsc", "position": 9198, "name": "FLSC_P1.3"},
+					{"type": "cavitylinac", "position": 11281, "length": 3300, "rotateY": "PI/2", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary","offset2d": [1500, 170], "name": "ACCT_P1.2"},
+					{"type": "vlv", "position": 13000, "name": "VLV_PTB1.1"},
+					{"type": "cm", "position": 13316, "name": "CM_PTB1.1"},
+					{"type": "correctorbooster", "position": 13663.5, "name": "CV_PTB1.1"},
+					{"type": "correctorbooster", "position": 13869, "name": "CH_PTB1.1"},
+					{"type": "bpm", "position": 14409, "name": "BPM_PTB1.1"},
 					{"type": "blm", "position": 14609, "name": "BPM_PTB1.1_R"},
 					{"type": "blm", "position": 14609, "name": "BPM_PTB1.1_L"},
-					{"type": "quadrupolebooster", "position": 14951.9, "length": 175, "name": "QD_PTB1.1"},
+					{"type": "quadrupolebooster", "position": 14751.9, "length": 175, "name": "Q_PTB1.1"},
 					{"type": "blm", "position": 14952, "name": "BLM_Q_PTB1.1"},
-					{"type": "quadrupolebooster", "position": 15321.9, "length": 175, "name": "QF_PTB1.2"},
+					{"type": "quadrupolebooster", "position": 15121.9, "length": 175, "name": "Q_PTB1.2"},
 					{"type": "blm", "position": 15322, "name": "BLM_Q_PTB1.2"}
 				]
 			},
 			{
 				"start": {"x": 3560, "z": 11640},
-				"bending": {"type": "dipolebooster", "length": 200, "name": "B_PTB1.1"},
-				"chamber": {"type": "chamber"},
-				"components": [
-					{"type": "blm", "position": 100, "name": "BLM_B_PTB1.1_R"},
-					{"type": "blm", "position": 100, "name": "BLM_B_PTB1.1_L"},
-					{"type": "flsc", "position": 398.9, "name": "FLSC_PTB1.2"},
-					{"type": "blm", "position": 398, "name": "BLM_FLSC_PTB1.2"},
-					{"type": "bpm", "position": 647.9, "name": "BPM_PTB1.3"},
-					{"type": "correctorbooster", "position": 997.9, "name": "CH_PTB1.2"},
-					{"type": "quadrupolebooster", "position": 1335.9, "length": 175, "name": "QD_PTB1.3"},
-					{"type": "blm", "position": 1336, "name": "BLM_Q_PTB1.3"},
-					{"type": "quadrupolebooster", "position": 1705.9, "length": 175, "name": "QF_PTB1.4"},
-					{"type": "blm", "position": 1706, "name": "BLM_Q_PTB1.4"},
-					{"type": "bpm", "position": 1954.9, "name": "BPM_PTB1.4"},
-					{"type": "quadrupolebooster", "position": 2325.9, "length": 175, "name": "QD_PTB1.5"},
+				"bending": {"type": "bending_300", "length": 300, "name": "B_PTB1.1", "labelReverse": [270, -300, 10]},
+				"chamber": {"type": "chamber"},
+				"components": [
+					{"type": "blm", "position": 100, "name": "BLM_B_PTB1.1_R", "labelReverse": [270, 1600, -50]},
+					{"type": "blm", "position": 100, "name": "BLM_B_PTB1.1_L", "labelReverse": [270, 1600, -50]},
+					{"type": "vlv", "position": 400, "name": "VLV_PTB1.2", "labelReverse": [270, 900, -150]},
+					{"type": "flsc", "position": 600, "name": "FLSC_PTB1.2", "labelReverse": [270, -300, -150]},
+					{"type": "blm", "position": 698, "name": "BLM_FLSC_PTB1.2", "labelReverse": [270, -300, -50]},
+					{"type": "bpm", "position": 857.9, "name": "BPM_PTB1.3", "labelReverse": [270, -300, -50]},
+					{"type": "correctorbooster", "position": 1047.9, "name": "CH_PTB1.2", "labelReverse": [270, -300, -100]},
+					{"type": "correctorbooster", "position": 1297.9, "name": "CV_PTB1.2", "labelReverse": [270, -300, -100]},
+					{"type": "quadrupolebooster", "position": 1535.9, "length": 175, "name": "Q_PTB1.3", "labelReverse": [270, -300, -100]},
+					{"type": "blm", "position": 1436, "name": "BLM_Q_PTB1.3", "labelReverse": [270, 1600, -50]},
+					{"type": "quadrupolebooster", "position": 1805.9, "length": 175, "name": "Q_PTB1.4", "labelReverse": [270, -300, -100]},
+					{"type": "blm", "position": 1806, "name": "BLM_Q_PTB1.4"},
+					{"type": "bpm", "position": 2154.9, "name": "BPM_PTB1.4", "labelReverse": [270, -300, -100]},
+					{"type": "quadrupolebooster", "position": 2425.9, "length": 175, "name": "Q_PTB1.5"},
 					{"type": "blm", "position": 2326, "name": "BLM_Q_PTB1.5"},
 					{"type": "correctorbooster", "position": 2744.9, "name": "CH_PTB1.3"},
-					{"type": "quadrupolebooster", "position": 3483.9, "length": 175, "name": "QD_PTB1.6"},
+					{"type": "correctorbooster", "position": 2930.9, "name": "CV_PTB1.3"},
+					{"type": "quadrupolebooster", "position": 3183.9, "length": 175, "name": "Q_PTB1.6"},
 					{"type": "blm", "position": 3484, "name": "BLM_Q_PTB1.6"},
-					{"type": "quadrupolebooster", "position": 3853.9, "length": 175, "name": "QF_PTB1.7"},
+					{"type": "quadrupolebooster", "position": 3553.9, "length": 175, "name": "Q_PTB1.7"},
 					{"type": "blm", "position": 3854, "name": "BLM_Q_PTB1.7"},
 					{"type": "scraper", "position": 4077.9, "name": "SCRH_PTB1.1"},
 					{"type": "scraper", "position": 4272.9, "name": "SCRV_PTB1.1"},
 					{"type": "blm", "position": 4273, "name": "BLM_SCRV_PTB1.1_R"},
 					{"type": "blm", "position": 4273, "name": "BLM_SCRV_PTB1.1_L"},
-					{"type": "correctorbooster", "position": 4637.9, "name": "CH_PTB1.4"},
-					{"type": "flsc", "position": 4917.9, "name": "FLSC_PTB1.3"},
+					{"type": "flsc", "position": 4997.9, "name": "FLSC_PTB1.3"},
+					{"type": "correctorbooster", "position": 4517.9, "name": "CH_PTB1.4"},
+					{"type": "correctorbooster", "position": 4717.9, "name": "CV_PTB1.4"},
 					{"type": "blm", "position": 4918, "name": "BLM_FLSC_PTB1.3"},
-					{"type": "quadrupolebooster", "position": 5183.9, "length": 175, "name": "QD_PTB1.8"},
+					{"type": "quadrupolebooster", "position": 5183.9, "length": 175, "name": "Q_PTB1.8"},
 					{"type": "blm", "position": 5184, "name": "BLM_Q_PTB1.8"},
 					{"type": "cm", "position": 5452.9, "name": "CM_PTB1.2"},
-					{"type": "bpm", "position": 5452.9, "name": "BPM_PTB1.5"},
-					{"type": "si", "position": 6506.4, "length": 400, "name": "SIB_PTB1.1"}
+					{"type": "bpm", "position": 5652.9, "name": "BPM_PTB1.5"},
+					{"type": "vlv", "position": 5850, "name": "VLV_PTB1.3"}
+					
 				]
 			},
 			{
@@ -80,24 +97,40 @@
 				"chamber": {"type": "chamber"},
 				"components": [
 				]
-			}
-		],
-		"servicearea": [
+			},
 			{
-				"start": {"x": -2910, "z": 9230},
+				"start": {"x": 3560, "z": 11640},
 				"components": [
 				]
+			},
+			{
+				"start": {"x": 1975, "z": 11391},
+				"chamber": {"type": "chamber"},
+				"components": [
+					{"type": "flsc", "position": 1050, "name": "FLSC_PTB1.1", "labelReverse": [90, -500, 250]}
+				]
 			}
 		],
+		"servicearea": {
+			"sections": [
+				{
+					"start": {"x": -2910, "z": 9230},
+					"components": [
+					]
+				}	
+			]
+		},
 		"bpm": {
-			"pos": "https://pwma-dev.elettra.eu/misc/bpm.php?pos&amp;facility=preinjector",
-			"rms": "https://pwma-dev.elettra.eu/misc/bpm.php?rms&amp;facility=preinjector",
+			"orbitconf": "https://pwma-dev.elettra.eu/panther/updater.php?read&filename=preinjector.100.bpm.src",
+			"orbithor": "https://pwma-dev.elettra.eu/panther/updater.php?read&filename=preinjector.100.bpm",
+			"pos": "https://pwma-dev.elettra.eu/panther/updater.php?read&filename=preinjector.100.bpm",
+			"rms": "https://pwma-dev.elettra.eu/misc/bpm.php?rms&facility=preinjector",
 			"length": 6,
 			"offset": 3
 		},
 		"blm": {
-			"confsrc": "https://pwma-dev.elettra.eu/rchan.php?json&amp;valueOnly&amp;src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_p_ptb_a11.01(BlmConfiguration)",
-			"datasrc": "https://pwma-dev.elettra.eu/rchan.php?json&amp;valueOnly&amp;src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_p_ptb_a11.01/BlmData"
+			"confsrc": "https://pwma-dev.elettra.eu/rchan.php?json&valueOnly&src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_p_ptb_a11.01(BlmConfiguration)",
+			"datasrc": "https://pwma-dev.elettra.eu/rchan.php?json&valueOnly&src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_p_ptb_a11.01/BlmData"
 
 		}
 	},
@@ -116,8 +149,8 @@
 					{"type": "blm", "position": 2267, "name": "BLM_FLSC_B1.1_L"},
 					{"type": "dcct", "position": 3300, "name": "DCCT_B1.1"},
 					{"type": "bpm", "position": 3810, "name": "BPMT_B1.1"},
-					{"type": "quadrupolebooster", "position": 4950, "length": 280, "name": "QF_B1.2"},
-					{"type": "bpm", "position": 5180, "name": "BPM_B1.1"},
+					{"type": "quadrupolebooster", "position": 4750, "length": 280, "name": "QF_B1.2"},
+					{"type": "bpm", "position": 5080, "name": "BPM_B1.1"},
 					{"type": "sextupolebooster", "position": 5310, "name": "SF_B1.1"}
 				]
 			},
@@ -128,7 +161,7 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B2.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B2.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B2.1"},
+					{"type": "correctorbooster", "position": 1400, "name": "CV_B2.1"},
 					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B2.1"},
 					{"type": "sextupolebooster", "position": 2010, "name": "SD_B2.1"}
 				]
@@ -140,10 +173,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B3.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B3.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B3.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B3.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B3.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SF_B3.1"}
+					{"type": "correctorbooster", "position": 1200, "name": "CH_B3.1"},
+					{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B3.1"},
+					{"type": "bpm", "position": 1720, "name": "BPM_B3.1"},
+					{"type": "sextupolebooster", "position": 2080, "name": "SF_B3.1"}
 				]
 			},
 			{
@@ -153,10 +186,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B4.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B4.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B4.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B4.1"},
-					{"type": "bpm", "position": 1830, "name": "BPM_B4.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SD_B4.1"}
+					{"type": "correctorbooster", "position": 1200, "name": "CV_B4.1"},
+					{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B4.1"},
+					{"type": "bpm", "position": 1720, "name": "BPM_B4.1"},
+					{"type": "sextupolebooster", "position": 2080, "name": "SD_B4.1"}
 				]
 			},
 			{
@@ -166,10 +199,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B5.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B5.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B5.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B5.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B5.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SF_B5.1"}
+					{"type": "correctorbooster", "position": 1200, "name": "CH_B5.1"},
+					{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B5.1"},
+					{"type": "bpm", "position": 1720, "name": "BPM_B5.1"},
+					{"type": "sextupolebooster", "position": 2080, "name": "SF_B5.1"}
 				]
 			},
 			{
@@ -179,10 +212,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B6.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B6.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B6.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B6.1"},
-					{"type": "bpm", "position": 1830, "name": "BPM_B6.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SD_B6.1"}
+					{"type": "correctorbooster", "position": 1200, "name": "CV_B6.1"},
+					{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B6.1"},
+					{"type": "bpm", "position": 1720, "name": "BPM_B6.1"},
+					{"type": "sextupolebooster", "position": 2080, "name": "SD_B6.1"}
 				]
 			},
 			{
@@ -190,10 +223,12 @@
 				"bending": {"type": "dipolebooster", "name": "B_B7.1"},
 				"chamber": {"type": "chamber"},
 				"components": [
+					{"type": "plc", "position": 0, "name": "SPAC_B7", "offset3d": [0, -700, 0], "offset2d": [400, 200], "labelReverse": [270, 1100, -150]},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B7.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B7.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B7.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B7.1"}
+					{"type": "correctorbooster", "position": 1360, "name": "CH_B7.1"},
+					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B7.1"},
+					{"type": "vlv", "position": 1967, "name": "VLV_B7.1"}
 				]
 			},
 			{
@@ -203,10 +238,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B8.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B8.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B8.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B8.1"},
-					{"type": "bpm", "position": 1830, "name": "BPM_B8.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SD_B8.1"}
+					{"type": "correctorbooster", "position": 1200, "name": "CV_B8.1"},
+					{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B8.1"},
+					{"type": "bpm", "position": 1720, "name": "BPM_B8.1"},
+					{"type": "sextupolebooster", "position": 2080, "name": "SD_B8.1"}
 				]
 			},
 			{
@@ -216,10 +251,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B9.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B9.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B9.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B9.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B9.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SF_B9.1"}
+					{"type": "correctorbooster", "position": 1200, "name": "CH_B9.1"},
+					{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B9.1"},
+					{"type": "bpm", "position": 1720, "name": "BPM_B9.1"},
+					{"type": "sextupolebooster", "position": 2080, "name": "SF_B9.1"}
 				]
 			},
 			{
@@ -229,10 +264,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B10.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B10.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B10.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B10.1"},
-					{"type": "bpm", "position": 1830, "name": "BPM_B10.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SD_B10.1"}
+					{"type": "correctorbooster", "position": 1200, "name": "CV_B10.1"},
+					{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B10.1"},
+					{"type": "bpm", "position": 1720, "name": "BPM_B10.1"},
+					{"type": "sextupolebooster", "position": 2080, "name": "SD_B10.1"}
 				]
 			},
 			{
@@ -242,10 +277,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B11.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B11.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B11.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B11.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B11.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SF_B11.1"}
+					{"type": "correctorbooster", "position": 1200, "name": "CH_B11.1"},
+					{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B11.1"},
+					{"type": "bpm", "position": 1720, "name": "BPM_B11.1"},
+					{"type": "sextupolebooster", "position": 2080, "name": "SF_B11.1"}
 				]
 			},
 			{
@@ -255,7 +290,7 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B12.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B12.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B12.1"},
+					{"type": "correctorbooster", "position": 1400, "name": "CV_B12.1"},
 					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B12.1"},
 					{"type": "sextupolebooster", "position": 2010, "name": "SD_B12.1"}
 				]
@@ -265,13 +300,16 @@
 				"bending": {"type": "dipolebooster", "rotateY": "-PI", "name": "B_B13.1"},
 				"chamber": {"type": "chamber"},
 				"components": [
+					{"type": "plc", "position": 0, "name": "SPAC_B13", "offset3d": [0, -700, 0], "offset2d": [-200, 500], "labelReverse": [270, 1200, -150]},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B13.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B13.1_L"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B13.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B13.1"},
+					{"type": "quadrupolebooster", "position": 1350, "length": 280, "name": "QF_B13.1"},
+					{"type": "bpm", "position": 1650, "name": "BPM_B13.1"},
 					{"type": "sextupolebooster", "position": 2010, "name": "SF_B13.1"},
-					{"type": "kicker", "position": 2710, "name": "KE_B13.1"},
-					{"type": "correctorbooster", "position": 3560, "name": "CHL1_B13.1"},
+					{"type": "vlv", "position": 2250, "name": "VLVKE_B13.1"},
+					{"type": "kicker", "position": 2710, "name": "KEB_B2.1", "name2": "KE_B13.1", "labelReverse": [270, -400, -200]},
+					{"type": "vlv", "position": 3250, "name": "VLVKE_B13.2"},
+					{"type": "correctorbooster", "position": 3560, "name": "BUMPER_B13.1"},
 					{"type": "quadrupolebooster", "position": 4950, "length": 175, "name": "QD_B13.2"}
 				]
 			},
@@ -282,31 +320,36 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B14.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B14.1_L"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B14.1"},
-					{"type": "blm", "position": 1650, "name": "BLM_QF_B14.1_R"},
-					{"type": "blm", "position": 1650, "name": "BLM_QF_B14.1_L"},
-					{"type": "spte", "position": 2964.42, "name": "SE_B14.1"},
-					{"type": "blm", "position": 2965, "name": "BLM_SPTE_B14.1_R"},
-					{"type": "blm", "position": 2965, "name": "BLM_SPTE_B14.1_L"},
-					{"type": "correctorbooster", "position": 4562.5, "name": "CHL2_B14.1"},
-					{"type": "quadrupolebooster", "position": 4950, "length": 175, "name": "QD_B14.2"},
-					{"type": "bpm", "position": 5130, "name": "BPM_B14.1"},
-					{"type": "flsc", "position": 6600, "name": "FLSC_B14.1"},
-					{"type": "correctorbooster", "position": 7250, "name": "CHL3_B14.1"},
-					{"type": "quadrupolebooster", "position": 8250, "length": 280, "name": "QF_B14.3"}
+					{"type": "quadrupolebooster", "position": 1250, "length": 280, "name": "QF_B14.1"},
+					{"type": "blm", "position": 1350, "name": "BLM_QF_B14.1_R"},
+					{"type": "blm", "position": 1350, "name": "BLM_QF_B14.1_L"},
+					{"type": "vlv", "position": 1990, "name": "VLVVE_B14.1"},
+					{"type": "spte", "position": 2450,  "offset2d": [0, -50], "offset3d": [0, 0, 200], "ps": ["SEB_B2.1","SEB_B2.2"], "name": "SEB_B2.1 - 2.2", "name2": "SEB_B14.1 - SEB_B14.2"},
+					{"type": "blm", "position": 3300, "name": "BLM_SPTE_B14.1_R"},
+					{"type": "blm", "position": 3300, "name": "BLM_SPTE_B14.1_L"},
+					{"type": "correctorbooster", "position": 4262.5, "name": "CH_B14.1", "labelReverse": true},
+					{"type": "correctorbooster", "position": 4562.5, "name": "BUMPER_B14.2", "labelReverse": true},
+					{"type": "quadrupolebooster", "position": 4850, "length": 175, "name": "QD_B14.2", "labelReverse": true},
+					{"type": "bpm", "position": 5130, "name": "BPM_B14.1", "labelReverse": true},
+					{"type": "vlv", "position": 5700, "name": "VLVVE_B14.2", "labelReverse": [90, -500, 300]},
+					{"type": "flsc", "position": 6600, "name": "FLSC_B14.1", "labelReverse": [90, -500, 300]},
+					{"type": "correctorbooster", "position": 7250, "name": "BUMPER_B14.3", "labelReverse": true},
+					{"type": "bst", "position": 7600, "name": "BST_B14.1", "labelReverse": true},
+					{"type": "quadrupolebooster", "position": 8250, "length": 280, "name": "QF_B14.3", "labelReverse": true}
 				]
 			},
 			{
 				"start": {"x": 3865, "z": -20905},
-				"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B15.1"},
+				"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B15.1", "labelReverse": true},
 				"chamber": {"type": "chamber"},
 				"components": [
+					{"type": "plc", "position": 0, "name": "SPAC_B15", "offset3d": [0, -700, 0], "offset2d": [-100, -350], "labelReverse": [180, 1500, 50]},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B15.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B15.1_L"},
 					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B15.1"},
 					{"type": "strp", "position": 4202, "name": "STRP_B15.1"},
-					{"type": "quadrupolebooster", "position": 4950, "length": 280, "name": "QF_B15.2"},
-					{"type": "bpm", "position": 5180, "name": "BPM_B15.1"},
+					{"type": "quadrupolebooster", "position": 4650, "length": 280, "name": "QF_B15.2"},
+					{"type": "bpm", "position": 4930, "name": "BPM_B15.1"},
 					{"type": "sextupolebooster", "position": 5310, "name": "SF_B15.1"}
 				]
 			},
@@ -317,7 +360,7 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B16.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B16.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B16.1"},
+					{"type": "correctorbooster", "position": 1400, "name": "CV_B16.1"},
 					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B16.1"},
 					{"type": "sextupolebooster", "position": 2010, "name": "SD_B16.1"}
 				]
@@ -329,10 +372,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B17.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B17.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B17.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B17.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B17.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SF_B17.1"}
+					{"type": "correctorbooster", "position": 1260, "name": "CH_B17.1"},
+					{"type": "quadrupolebooster", "position": 1500, "length": 280, "name": "QF_B17.1"},
+					{"type": "bpm", "position": 1780, "name": "BPM_B17.1"},
+					{"type": "sextupolebooster", "position": 2150, "name": "SF_B17.1"}
 				]
 			},
 			{
@@ -342,10 +385,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B18.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B18.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B18.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B18.1"},
-					{"type": "bpm", "position": 1830, "name": "BPM_B18.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SD_B18.1"}
+					{"type": "correctorbooster", "position": 1260, "name": "CV_B18.1"},
+					{"type": "quadrupolebooster", "position": 1500, "length": 175, "name": "QD_B18.1"},
+					{"type": "bpm", "position": 1780, "name": "BPM_B18.1"},
+					{"type": "sextupolebooster", "position": 2150, "name": "SD_B18.1"}
 				]
 			},
 			{
@@ -355,10 +398,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B19.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B19.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B19.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B19.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B19.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SF_B19.1"}
+					{"type": "correctorbooster", "position": 1260, "name": "CH_B19.1"},
+					{"type": "quadrupolebooster", "position": 1500, "length": 280, "name": "QF_B19.1"},
+					{"type": "bpm", "position": 1780, "name": "BPM_B19.1"},
+					{"type": "sextupolebooster", "position": 2150, "name": "SF_B19.1"}
 				]
 			},
 			{
@@ -366,12 +409,13 @@
 				"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B20.1"},
 				"chamber": {"type": "chamber"},
 				"components": [
+					{"type": "plc", "position": 0, "name": "SPAC_B20", "offset3d": [0, -700, 0], "offset2d": [-500, -100], "labelReverse": [90, -250, 250]},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B20.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B20.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B20.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B20.1"},
-					{"type": "bpm", "position": 1830, "name": "BPM_B20.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SD_B20.1"}
+					{"type": "correctorbooster", "position": 1260, "name": "CV_B20.1"},
+					{"type": "quadrupolebooster", "position": 1500, "length": 175, "name": "QD_B20.1"},
+					{"type": "bpm", "position": 1780, "name": "BPM_B20.1"},
+					{"type": "sextupolebooster", "position": 2150, "name": "SD_B20.1"}
 				]
 			},
 			{
@@ -381,8 +425,9 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B21.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B21.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B21.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B21.1"}
+					{"type": "correctorbooster", "position": 1360, "name": "CH_B21.1"},
+					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B21.1"},
+					{"type": "vlv", "position": 2050, "name": "VLV_B21.1"}
 				]
 			},
 			{
@@ -392,10 +437,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B22.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B22.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B22.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B22.1"},
-					{"type": "bpm", "position": 1830, "name": "BPM_B22.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SD_B22.1"}
+					{"type": "correctorbooster", "position": 1260, "name": "CV_B22.1"},
+					{"type": "quadrupolebooster", "position": 1500, "length": 175, "name": "QD_B22.1"},
+					{"type": "bpm", "position": 1780, "name": "BPM_B22.1"},
+					{"type": "sextupolebooster", "position": 2150, "name": "SD_B22.1"}
 				]
 			},
 			{
@@ -405,10 +450,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B23.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B23.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B23.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B23.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B23.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SF_B23.1"}
+					{"type": "correctorbooster", "position": 1260, "name": "CH_B23.1"},
+					{"type": "quadrupolebooster", "position": 1500, "length": 280, "name": "QF_B23.1"},
+					{"type": "bpm", "position": 1780, "name": "BPM_B23.1"},
+					{"type": "sextupolebooster", "position": 2150, "name": "SF_B23.1"}
 				]
 			},
 			{
@@ -418,10 +463,10 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B24.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B24.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B24.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B24.1"},
-					{"type": "bpm", "position": 1830, "name": "BPM_B24.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SD_B24.1"}
+					{"type": "correctorbooster", "position": 1260, "name": "CV_B24.1"},
+					{"type": "quadrupolebooster", "position": 1500, "length": 175, "name": "QD_B24.1"},
+					{"type": "bpm", "position": 1780, "name": "BPM_B24.1"},
+					{"type": "sextupolebooster", "position": 2150, "name": "SD_B24.1"}
 				]
 			},
 			{
@@ -429,12 +474,13 @@
 				"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B25.1"},
 				"chamber": {"type": "chamber"},
 				"components": [
+					{"type": "plc", "position": 0, "name": "SPAC_B25", "offset3d": [0, -700, 0],  "offset2d": [-100, -500], "labelReverse": [90, -200, 250]},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B25.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B25.1_L"},
-					{"type": "correctorbooster", "position": 1360, "name": "HCM_B25.1"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B25.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B25.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SF_B25.1"}
+					{"type": "correctorbooster", "position": 1260, "name": "CH_B25.1"},
+					{"type": "quadrupolebooster", "position": 1500, "length": 280, "name": "QF_B25.1"},
+					{"type": "bpm", "position": 1780, "name": "BPM_B25.1"},
+					{"type": "sextupolebooster", "position": 2150, "name": "SF_B25.1"}
 				]
 			},
 			{
@@ -444,7 +490,7 @@
 				"components": [
 					{"type": "blm", "position": 1000, "name": "BLM_B_B26.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B26.1_L"},
-					{"type": "correctorbooster", "position": 1400, "name": "VCM_B26.1"},
+					{"type": "correctorbooster", "position": 1400, "name": "CV_B26.1"},
 					{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B26.1"},
 					{"type": "sextupolebooster", "position": 2010, "name": "SD_B26.1"}
 				]
@@ -457,37 +503,47 @@
 					{"type": "blm", "position": 1000, "name": "BLM_B_B27.1_R"},
 					{"type": "blm", "position": 1000, "name": "BLM_B_B27.1_L"},
 					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B27.1"},
-					{"type": "bpm", "position": 1880, "name": "BPM_B27.1"},
-					{"type": "sextupolebooster", "position": 2010, "name": "SF_B27.1"},
-					{"type": "cavity", "position": 3300.2, "name": "CAVT_B27.1"},
-					{"type": "quadrupolebooster", "position": 4950, "length": 175, "name": "QD_B27.2"}
+					{"type": "bpm", "position": 1900, "name": "BPM_B27.1"},
+					{"type": "sextupolebooster", "position": 2230, "name": "SF_B27.1"},
+					{"type": "vlv", "position": 3000, "name": "VLVRF_B27.1", "labelReverse": [90, -250, 250]},
+					{"type": "cavity", "position": 3300.2, "name": "RF_B27.1", "offset2d": [-70, 0], "labelReverse": [90, -390, 180]},
+					{"type": "vlv", "position": 3700, "name": "VLVRF_B27.2", "labelReverse": [90, -250, 250]},
+					{"type": "quadrupolebooster", "position": 4950, "length": 175, "name": "QD_B27.2", "labelReverse": [90, -250, 250]}
 				]
 			},
 			{
 				"start": {"x": 1055, "z": 9590},
-				"bending": {"type": "dipolebooster", "rotateY": "PI/2", "name": "B_B28.1"},
-				"chamber": {"type": "chamber"},
-				"components": [
-					{"type": "blm", "position": 1000, "name": "BLM_B_B28.1_R"},
-					{"type": "blm", "position": 1000, "name": "BLM_B_B28.1_L"},
-					{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B28.1"},
-					{"type": "flsc", "position": 2665, "name": "FLSC_B28.1"},
-					{"type": "blm", "position": 2665, "name": "BLM_FLSC_B27.1_R"},
-					{"type": "blm", "position": 2665, "name": "BLM_FLSC_B27.1_L"},
-					{"type": "strp", "position": 2915, "name": "STRP_B28.1"},
-					{"type": "si", "position": 3618.91, "name": "SI_B28.1"},
-					{"type": "flsc", "position": 4574, "name": "FLSC_B28.1"},
-					{"type": "rf", "position": 4800, "name": "RF_B28.1"},
-					{"type": "quadrupolebooster", "position": 4887.5, "length": 175, "name": "QD_B28.2"},
-					{"type": "bpm", "position": 5067.5, "name": "BPM_B28.1"},
-					{"type": "kicker", "position": 6937.5, "name": "KI_B28.1"},
-					{"type": "quadrupolebooster", "position": 8187.5, "length": 280, "name": "QF_B28.3"}
+				"bending": {"type": "dipolebooster", "rotateY": "PI/2", "name": "B_B28.1", "labelReverse": [90, 700, 0]},
+				"chamber": {"type": "chamber"},
+				"components": [
+					{"type": "blm", "position": 1400, "name": "BLM_B_B28.1_R"},
+					{"type": "blm", "position": 1400, "name": "BLM_B_B28.1_L"},
+					{"type": "flsc", "position": 1500, "name": "FLSC_B28.1", "labelReverse": [90, -500, 300]},
+					{"type": "quadrupolebooster", "position": 2100, "length": 280, "name": "QF_B28.1", "labelReverse": [90, -500, 300]},
+					{"type": "vlv", "position": 2900, "name": "VLVI_B28.1", "labelReverse": [90, -500, 300]},
+					{"type": "blm", "position": 2665, "name": "BLM_FLSC_B27.1_R", "labelReverse": true},
+					{"type": "blm", "position": 2665, "name": "BLM_FLSC_B27.1_L", "labelReverse": true},
+					{"type": "strp", "position": 2915, "name": "STRP_B28.1", "labelReverse": true},
+					{"type": "spte", "position": 3418.91, "offset2d": [-50, 50], "name": "SIB_B1.1", "name2": "SI_B28.1", "labelReverse": true},
+					{"type": "blm", "position": 4137, "name": "BLM_SIB_B28.1_R"},
+					{"type": "blm", "position": 4137, "name": "BLM_SIB_B28.1_L"},					
+					{"type": "vlv", "position": 4550, "name": "VLVI_B28.2"},
+					{"type": "flsc", "position": 4774, "name": "FLSC_B28.2"},
+					{"type": "quadrupolebooster", "position": 5087.5, "length": 175, "name": "QD_B28.2"},
+					{"type": "bpm", "position": 5467.5, "name": "BPM_B28.1"},
+					{"type": "correctorbooster", "position": 5867, "name": "CV_B28.1", "labelReverse": [270, -400, -150]},
+					{"type": "vlv", "position": 6367, "name": "VLVKI_B28.1"},
+					{"type": "kicker", "position": 6937.5, "name": "KIB_B28.1", "name2": "KIB_B1.1", "labelReverse": [270, -300, -150]},
+					{"type": "blm", "position": 7437, "name": "BLM_KIB_B28.1_R"},
+					{"type": "blm", "position": 7437, "name": "BLM_KIB_B28.1_L"},
+					{"type": "vlv", "position": 7567, "name": "VLVKI_B28.2"},
+					{"type": "quadrupolebooster", "position": 8187.5, "length": 280, "name": "QF_B28.2"}
+					
 				]
-			}
-		],
+			}		],
 		"blm": {
-			"confsrc": "https://pwma-dev.elettra.eu/rchan.php?json&amp;valueOnly&amp;src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_b_a11.01(BlmConfiguration)",
-			"datasrc": "https://pwma-dev.elettra.eu/rchan.php?json&amp;valueOnly&amp;src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_b_a11.01/BlmData"
+			"confsrc": "https://pwma-dev.elettra.eu/rchan.php?json&valueOnly&src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_b_a11.01(BlmConfiguration)",
+			"datasrc": "https://pwma-dev.elettra.eu/rchan.php?json&valueOnly&src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_b_a11.01/BlmData"
 		}
 	},
 	"bts": {
@@ -497,10 +553,10 @@
 				"components": [
 					{"type": "BTS_SEB1", "position": 0, "name": "BTS_SEB1"},
 					{"type": "BTS_SEB2", "position": 62.2, "name": "BTS_SEB2"},
-					{"type": "vlv", "position": 950, "name": "VLV_BTS1.1"},
-					{"type": "sip", "position": 1050, "name": "SIP55_BTS1.1"},
-					{"type": "corrector", "position": 2142.4, "name": "CM_BTS1.1"},
-					{"type": "flsc", "position": 2392.4, "name": "FLSC_BTS1.1"},
+					{"type": "vlv", "position": 1450, "name": "VLV_BTS1.1"},
+					{"type": "sip", "position": 1650, "name": "SIP55_BTS1.1"},
+					{"type": "cm", "position": 2142.4, "name": "CM_BTS1.1"},
+					{"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"},
@@ -512,14 +568,14 @@
 					{"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": "bst", "position": 5200, "name": "BST_BTS1.1"},
-					{"type": "bst", "position": 5400, "name": "BST_BTS1.2"},
-					{"type": "sip", "position": 5500, "name": "SIP55_BTS1.2"}
+					{"type": "bst", "position": 5400, "name": "BST_BTS1.1"},
+					{"type": "bst", "position": 6200, "name": "BST_BTS1.2"},
+					{"type": "sip", "position": 6300, "name": "SIP55_BTS1.2"}
 				]
 			},
 			{
 				"start": {"x": 5035, "z": -21920},
-				"bending": {"type": "dipolebooster", "length": 1200, "name": "B_BTS1.1"},
+				"bending": {"type": "dipolebooster", "length": 1200, "name": "B_BTS1.1", "labelReverse": 180},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 737, "name": "BLM_B_BTS1.1_R"},
@@ -527,7 +583,7 @@
 					{"type": "quadrupolebooster", "position": 2492, "name": "Q_BTS1.3"},
 					{"type": "blm", "position": 2492, "name": "BLM_Q_BTS1.3"},
 					{"type": "bpm", "position": 2744.5, "name": "BPM_BTS1.2"},
-					{"type": "vlv", "position": 2950, "name": "VLVP_BTS1.2"},
+					{"type": "vlv_notfound", "position": 2950, "name": "VLVP_BTS1.2"},
 					{"type": "sip", "position": 3150, "name": "SIP55_BTS1.3"},
 					{"type": "quadrupolebooster", "position": 3607, "name": "Q_BTS1.4"},
 					{"type": "blm", "position": 3607, "name": "BLM_Q_BTS1.4"},
@@ -538,6 +594,7 @@
 					{"type": "blm", "position": 7836, "name": "BLM_BPM_BTS1.3_R"},
 					{"type": "blm", "position": 7836, "name": "BLM_BPM_BTS1.3_L"},
 					{"type": "vlv", "position": 8050, "name": "VLV_BTS1.2"},
+					{"type": "plc", "position": 8400, "name": "SPAC_BTS1", "offset3d": [0, 100, -700], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
 					{"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"},
@@ -566,14 +623,14 @@
 				"components": [
 					{"type": "blm", "position": 737, "name": "BLM_B_BTS1.3_R"},
 					{"type": "blm", "position": 737, "name": "BLM_B_BTS1.3_L"},
-					{"type": "bst", "position": 750, "name": "BST_BTS1.3"},
+					{"type": "bst", "position": 950, "name": "BST_BTS1.3"},
 					{"type": "vlv", "position": 2950, "name": "VLV_BTS2.1"},
-					{"type": "corrector", "position": 1716.42, "name": "CH_BTS2.1"},
-					{"type": "corrector", "position": 1996.42, "name": "CV_BTS2.1"},
-					{"type": "quadrupolebooster", "position": 2248.92, "name": "Q_BTS2.1"},
-					{"type": "blm", "position": 2249, "name": "BLM_Q_BTS2.1_R"},
-					{"type": "blm", "position": 2249, "name": "BLM_Q_BTS2.1_L"},
-					{"type": "scraper", "position": 2922.15, "name": "SCRH_BTS2.1"}
+					{"type": "corrector", "position": 3516.42, "name": "CH_BTS2.1"},
+					{"type": "corrector", "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"},
+					{"type": "scraper", "position": 4522.15, "name": "SCRH_BTS2.1"}
 				]
 			},
 			{
@@ -585,7 +642,7 @@
 					{"type": "blm", "position": 737, "name": "BLM_B_BTS2.1_L"},
 					{"type": "sip", "position": 1270, "name": "SIP55_BTS2.1"},
 					{"type": "vgpe", "position": 1470, "name": "VGPE_BTS2.1"},
-					{"type": "vlv", "position": 1670, "name": "VLVP_BTS2.1"},
+					{"type": "vlv", "position": 1570, "name": "VLV_BTS2.2"},
 					{"type": "flsc", "position": 1849.77, "name": "FLSC_BTS2.1"},
 					{"type": "quadrupolebooster", "position": 2299.5, "name": "Q_BTS2.2"},
 					{"type": "blm", "position": 2300, "name": "BLM_Q_BTS2.2"},
@@ -603,46 +660,43 @@
 			},
 			{
 				"start": {"x": 33020, "z": -21875},
-				"bending": {"type": "dipolebooster", "rotateY": "PI", "length": 1200, "name": "B_BTS2.2"},
+				"bending": {"type": "dipolebooster", "rotateY": "PI", "length": 1200, "name": "B_BTS2.2", "labelReverse": [90, -500, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 737, "name": "BLM_B_BTS2.2_R"},
 					{"type": "blm", "position": 737, "name": "BLM_B_BTS2.2_L"},
-					{"type": "sip", "position": 1270, "name": "SIP55_BTS2.3"},
-					{"type": "vlv", "position": 1470, "name": "VLVP_BTS2.2"}
+					{"type": "sip", "position": 1270, "name": "SIP55_BTS2.3"}
 				]
 			},
 			{
 				"start": {"x": 35040, "z": -20380},
-				"bending": {"type": "dipole", "rotateY": "PI", "length": 2000, "name": "B_BTS2.3"},
+				"bending": {"type": "bending_2400", "rotateY": "PI", "length": 2000, "name": "B_BTS2.3", "labelReverse": [90, -500, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "blm", "position": 1217, "name": "BLM_B_BTS2.3_R"},
 					{"type": "blm", "position": 1217, "name": "BLM_B_BTS2.3_L"},
-					{"type": "quadrupolebooster", "position": 1523.5, "name": "Q_BTS2.5"},
-					{"type": "blm", "position": 1524, "name": "BLM_Q_BTS2.5"},
-					{"type": "quadrupolebooster", "position": 1808.5, "name": "Q_BTS2.6"},
-					{"type": "blm", "position": 1809, "name": "BLM_Q_BTS2.6"},
-					{"type": "corrector", "position": 2032, "name": "CH_BTS2.3"},
-					{"type": "corrector", "position": 2312, "name": "CV_BTS2.3"},
-					{"type": "bpm", "position": 2588.5, "name": "BPM_BTS2.2"},
-					{"type": "sip", "position": 2870, "name": "SIP55_BTS2.4"},
-					{"type": "vlv", "position": 3070, "name": "VLVP_BTS2.3"},
-					{"type": "flsc", "position": 3250, "name": "FLSC_BTS2.2"},
-					{"type": "blm", "position": 3250, "name": "BLM_FLSC_BTS2.2"},
-					{"type": "cm", "position": 3481.2, "name": "CM_BTS2.1"},
-					{"type": "bpm", "position": 3673.2, "name": "BPM_BTS2.3"},
-					{"type": "bst", "position": 4000, "name": "BST_BTS2.1"},
-					{"type": "quadrupolebooster", "position": 4465.8, "name": "Q_BTS2.7"},
-					{"type": "blm", "position": 4466, "name": "BLM_Q_BTS2.7"},
-					{"type": "corrector", "position": 4689.3, "name": "CH_BTS2.4"},
-					{"type": "corrector", "position": 4969.3, "name": "CV_BTS2.4"},
-					{"type": "sip", "position": 5170, "name": "SIP55_BTS2.5"},
-					{"type": "vgpe", "position": 5370, "name": "VGPE_BTS2.2"},
-					{"type": "bpm", "position": 5589.7, "name": "BPM_BTS2.4"},
-					{"type": "vlv", "position": 5670.2, "name": "VLV_BTS2.2"},
-					{"type": "BTS_SISR1", "position": 6154.7, "name": "BTS_SISR1"},
-					{"type": "BTS_SISR2", "position": 6218.93, "name": "BTS_SISR2"}
+					{"type": "quadrupolebooster", "position": 1523.5, "name": "Q_BTS2.5", "labelReverse": true},
+					{"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": "bpm", "position": 2588.5, "name": "BPM_BTS2.2", "labelReverse": true},
+					{"type": "sip", "position": 2870, "name": "SIP55_BTS2.4", "labelReverse": true},
+					{"type": "flsc", "position": 3150, "name": "FLSC_BTS2.2", "labelReverse": [90, -500, 300]},
+					{"type": "blm", "position": 3150, "name": "BLM_FLSC_BTS2.2", "labelReverse": true},
+					{"type": "cm", "position": 3481.2, "name": "CM_BTS2.1", "labelReverse": true},
+					{"type": "bpm", "position": 3673.2, "name": "BPM_BTS2.3", "labelReverse": true},
+					{"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": "sip", "position": 5170, "name": "SIP55_BTS2.5", "labelReverse": true},
+					{"type": "vgpe", "position": 5370, "name": "VGPE_BTS2.2", "labelReverse": true},
+					{"type": "bpm", "position": 5189.7, "name": "BPM_BTS2.4", "labelReverse": true}
+					
+					
 				]
 			},
 			{
@@ -654,16 +708,273 @@
 			}
 		],
 		"bpm": {
-			"pos": "https://pwma-dev.elettra.eu/misc/bpm.php?pos&amp;facility=bts",
-			"rms": "https://pwma-dev.elettra.eu/misc/bpm.php?rms&amp;facility=bts",
+			"orbitconf": "https://pwma-dev.elettra.eu/panther/updater.php?read&filename=bts.100.bpm.src",
+			"orbithor": "https://pwma-dev.elettra.eu/panther/updater.php?read&filename=bts.100.bpm",
+			"orbitver": "https://pwma-dev.elettra.eu/misc/bpm.php?orbitver&facility=bts",
+			"pos": "https://pwma-dev.elettra.eu/panther/updater.php?read&filename=bts.100.bpm",
+			"rms": "https://pwma-dev.elettra.eu/misc/bpm.php?rms&facility=bts",
 			"length": 10,
 			"offset": 9
 		},
 		"blm": {
-			"confsrc": "https://pwma-dev.elettra.eu/rchan.php?json&amp;valueOnly&amp;src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_bts_a11.01(BlmConfiguration)",
-			"datasrc": "https://pwma-dev.elettra.eu/rchan.php?json&amp;valueOnly&amp;src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_bts_a11.01/BlmData"
+			"confsrc": "https://pwma-dev.elettra.eu/rchan.php?json&valueOnly&src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_bts_a11.01(BlmConfiguration)",
+			"datasrc": "https://pwma-dev.elettra.eu/rchan.php?json&valueOnly&src=srv-tango-sre-01.ecs.elettra.trieste.it:20000/sa/radio_protection/blmmaster_bts_a11.01/BlmData"
 		}
 	},
+	"servicearea": {
+		"sections": [
+			{
+				"start": {"x": 10000, "z": 18000},
+				"components": [
+					{"type": "donatello", "position": -300, "name": "FUG", "labelReverse": [270, 2000, -150], "offset2d": [-299, -70], "embedded":[
+					]},
+					{"type": "rar1", "position": 800, "name": "RAR1_PSA1.1", "labelReverse": [270, 2700, -300], "offset2d": [180, 10], "embedded":[
+						"SPIN_MOD.01","ECLIPSA-1"
+					]},
+					{"type": "rar2", "position": 1200,  "name": "RAR2_PSA1.1", "labelReverse": [270, 2700, -300], "offset2d": [-220, -60], "embedded":[
+					]},					
+					{"type": "camod", "position": 2400, "name": "RMDK_PSA1.1", "labelReverse":[270, 3200, -700], "offset2d": [160, 10],"embedded":[
+						""
+					]},
+					{"type": "klystron", "position": 4200, "name": "K1", "labelReverse": [270, 2000, -300], "offset2d": [460, 60], "embedded":[
+						""
+					]},
+					{"type": "klystron", "position": 6300, "name": "K2", "labelReverse": [270, 2000, -300],  "offset2d": [200, 60],"embedded":[
+					]},
+					{"type": "camod", "position": 7100, "name": "RMDK_PSA1.2", "labelReverse":[270, 3200, -700], "embedded":[
+					]},
+					{"type": "rar2", "position": 8300, "name": "RAR2_PSA1.2", "labelReverse": [270, 2700, -300], "offset2d": [-320, -70], "embedded":[
+					]},
+					{"type": "rar1", "position": 9500, "name": "RAR1_PSA1.2", "labelReverse": [270, 2700, -300], "offset2d": [40, -10],"embedded":[
+						"SPIN_MOD.02","ECLIPSA-2"
+					]},
+					{"type": "rd", "position": 10100, "name": "RGUN", "labelReverse": [270, 2000, -150], "offset2d": [-180, -40],"embedded":[
+						"ECGUNPSA"
+					]},
+					{"type": "donatello", "position": 10400, "name": "FUG", "labelReverse": [270, 2000, -150], "offset2d": [-480, -100],"embedded":[
+					]}
+					
+				]
+			},
+			{
+				"start": {"x": -12500, "z": 14000}
+			},
+			{
+				"start": {"x": -10, "z": 22500},
+				"components": [
+					{"type": "rv", "position": 0, "name": "RV_PSA1.2", "labelReverse": [270, 2500, -310], "embedded":[
+						"PSSIP_PSA1.5","PSSIP55_PTB1.1","PSSIP55_PTB1.3",
+						"PSSIP_PSA1.7","PSSIP55_PTB1.5",
+						"TPG_PSA1.3","GVPE_PTB1.1","VGPI_PTB1.1","VGPE_PTB1.2",
+						"TPG_PSA1.4","GVPE_PTB1.3","VGPI_PTB1.2"
+					]},					
+					{"type": "rv", "position": 800, "name": "RV_PSA1.1", "labelReverse": [270, 2500, -310],"offset2d": [0, 0], "embedded":[
+						"PSSIP_PSA1.1","PSSIP40_P1.1","PSSIP40_P1.3",
+						"PSSIP_PSA1.2","PSSIP40_P1.2","PSSIP40_P1.4",
+						"PSSIP_PSA1.3","PSSIP300_P1.1","PSSIP300_P1.3",
+						"PSSIP_PSA1.4","PSSIP300_P1.2","PSSIP300_P1.4",
+						"TPG_PSA1.1","GVPE_P1.1","VGPI_P1.1","VGPE_P1.2","VGPI_P1.2",
+						"TPG_PSA1.2","GVPE_P1.3","VGPI_P1.3","VGPE_P1.4"
+					]},
+					{"type": "rc", "position": 1400, "name": "RC_PSA1.2", "labelReverse": [270, 2500, -310], "offset2d": [50, -200]}	
+				]
+			},
+			{
+				"start": {"x": 4500, "z": 0}
+			},
+			{
+				"start": {"x": -2300, "z": 22000},
+				"components": [
+					{"type": "rps", "position": 0, "name": "RPSP_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
+						"PSQ_P1.1","PSQ_P1.2","PSQ_P1.3","PSQ_P1.4","PSQ_P1.5","PSQ_P1.6",
+						"PSFCBNCH_P1.1",
+						"PSLENS_P1.1","PSLENS_P1.2","PSLENS_P1.3","PSLENS_P1.4","PSLENS_P1.5"
+					]},					
+					{"type": "rps", "position": 600, "name": "RPSCP_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
+						"PSCHAS_P1.1","PSCVAS_P1.1","PSCHAS_P1.2","PSCVAS_P1.2","PSCHAS_P1.3","PSCVAS_P1.3","PSCHAS_P1.4","PSCVAS_P1.4",
+						"PSCH_P1.1","PSCV_P1.1","PSCH_P1.2","PSCV_P1.2","PSCHBNCH_P1.1","PSCVBNCH_P1.1"
+					]},
+					{"type": "rc", "position": 1200, "name": "RC_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
+						"CMMPSPSA-1","ECPSPSA-1"
+					]}	
+				]
+			},
+			{
+				"start": {"x": 2500, "z": 0}
+			},
+			{
+				"start": {"x": -2900, "z": 16200},
+				"components": [
+					{"type": "rackTriplo", "position": -2000, "name": "Rack Triplo", "labelReverse": [90, -1350, 510], "reverse": true, "embedded":[
+					]},					
+					{"type": "rd", "position": 2600, "name": "RD_PSA1.1", "labelReverse": [90, -1350, 400], "reverse": true, "embedded":[
+						"ECFLSCPS","CMMTIMPSA","ECTIMPSA","ECCMPSA"
+					]},	
+					{"type": "rc", "position": 3200, "name": "RP_PSA1.1", "labelReverse": [90, -1350, 400], "reverse": true, "embedded":[
+						"CMMPSPSA-2","ECPSPSA-2","ECRFPSA"
+					]},	
+					{"type": "rps", "position": 3800, "name": "RPSBQPTB_PSA1.1", "labelReverse": [90, -1350, 400], "reverse": true, "embedded":[
+						"PSB-PTB1.1","PSQ-PTB1.1","PSQ-PTB1.2","PSQ-PTB1.3","PSQ-PTB1.4","PSQ-PTB1.5","PSQ-PTB1.6","PSQ-PTB1.7","PSQ-PTB1.8"
+					]},	
+					{"type": "rps", "position": 4400, "name": "RPSCPTB_PSA1.1", "labelReverse": [90, -1350, 400], "reverse": true, "embedded":[
+						"PSCH_PTB1.1","PSCV_PTB1.1","PSCH_PTB1.2","PSCV_PTB1.2","PSCH_PTB1.3","PSCV_PTB1.3","PSCH_PTB1.4","PSCV_PTB1.4"
+					]},
+					{"type": "rd", "position": 5000, "name": "RD_PSA1.2", "labelReverse": [90, -1350, 400], "reverse": true, "embedded":[
+						"ECBPMPSA"
+					]}
+				]
+			},
+			{
+				"start": {"x": -8000, "z":39000}
+			},
+			{
+				"start": {"x": -6000, "z": 1500},
+				"components": [
+					{"type": "rrf", "position": -500, "name": "RRFB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
+						"ECRFBSA1"
+					]},
+					{"type": "rrf", "position": 0, "name": "RRFB_BSA1.2", "labelReverse": [270, 2700, -150], "embedded":[
+					]},
+					{"type": "rrf", "position": 500, "name": "RRFB_BSA1.3", "labelReverse": [270, 2700, -150], "embedded":[
+					]},
+					{"type": "zero", "position": 1100,  "name": "INTB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
+						"SPAC_BSA1.1"
+					]},					
+					{"type": "plc", "position": 1100,  "name": "SPAC_BSA1.1", "offset2d": [400, 200], "offset3d": [280, 200, -120], "labelReverse": [270, -500, -150] 
+					},
+					{"type": "zero", "position": 1700, "name": "RSEPTB_BSA1.1", "labelReverse":[270, 2700, -150], "embedded":[
+						""
+					]},
+					{"type": "zero", "position": 2300, "name": "RKICKB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
+						""
+					]},
+					{"type": "rps", "position": 2900, "name": "RPSCB_BSA.01", "labelReverse": [270, 2700, -150], "embedded":[
+						"PSCV_B22.1","PSCH_B23.1","PSCV_B24.1","PSCH_B25.1","PSCV_B26.1","PSCV_B2.1","PSCH_B3.1","PSCV_B4.1","PSCV_B28.1"
+					]},
+					{"type": "rc", "position": 3500, "name": "RCB_BSA1.1", "labelReverse":[270, 2700, -150], "embedded":[
+						"ECINJBSA1","ECPSBSA1"
+					]},
+					{"type": "rv", "position": 4300, "name": "RV_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
+						"PSSIP_BSA1.1","PSSIP300RF_B27.1","PSSIP300RF_B27.2",
+						"PSSIP_BSA1.2","PSSIP500I_B28.1",
+						"PSSIP_BSA1.3","PSSIP500KI_B28.1",
+						"PSSIP_BSA1.4","PSSIP55_B27.1","PSSIP55_B1.2","PSSIP55_B6.1","PSSIP55_B11.1",
+						"PSSIP_BSA1.5","PSSIP55_B28.1","PSSIP55_B2.1","PSSIP55_B7.1","PSSIP55_B12.1",
+						"PSSIP_BSA1.6","PSSIP55_B28.2","PSSIP55_B3.1","PSSIP55_B8.1","PSSIP55_B13.1",
+						"PSSIP_BSA1.7","PSSIP55_B28.3","PSSIP55_B4.1","PSSIP55_B9.1",
+						"PSSIP_BSA1.8","PSSIP55_B1.1","PSSIP55_B5.1","PSSIP55_B10.1"
+					]},
+					{"type": "rv", "position": 5000, "name": "RVB_BSA1.2", "labelReverse": [270, 2700, -150], "embedded":[
+						"TPG_BSA1.1","VGPERF_B27.1","VGPIRF_B27.1","VGPERF_B27.2",
+						"TPG_BSA1.2","VGPE_B27.1","VGPI_B27.1","VGPE_B28.1","VGPI_B28.1",
+						"TPG_BSA1.3","VGPEI_B28.1","VGPII_B28.1","VGPEI_B28.2",
+						"TPG_BSA1.4","VGPEKI_B28.1","VGPIKI_B28.1","VGPEKI_B28.2",
+						"TPG_BSA1.5","VGPE_B2.1","VGPI_B3.1","VGPE_B6.1",
+						"TPG_BSA1.6","VGPE_B8.1","VGPI_B10.1","VGPE_B12.1"
+					]},
+					{"type": "rd", "position": 5500, "name": "RDB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
+						"EC TIMING"
+					]}
+				]
+			},
+			{
+				"start": {"x": -12500, "z": 1000}
+			},
+			{
+				"start": {"x": -15000, "z": -10000},
+				"components": [
+					{"type": "rpsb", "position": 0, "name": "CABB_BTS2.1", "labelReverse": [270, 3000, -500], "embedded":[
+						""
+					]},
+					{"type": "rpsb", "position": 2000, "name": "CABB_BTS2.2", "labelReverse": [270, 3000, -500], "embedded":[
+						""
+					]},
+					{"type": "rpsq", "position": 4000, "name": "CAQB_BTS2.1", "labelReverse": [270, 3000, -500], "embedded":[
+						""
+					]}
+				]
+			},
+			{
+				"start": {"x": -2500, "z": -18000}
+			},
+			{
+				"start": {"x": -4000, "z": -13500},
+				"components": [
+					{"type": "rps", "position": 0, "name": "RPSQBTS_BSA2.1", "labelReverse": [270, -200, -210], "embedded":[
+						"PSQ_BTS1.1","PSQ_BTS1.2","PSQ_BTS1.3","PSQ_BTS1.4","PSQ_BTS1.5","PSQ_BTS1.6"
+					]},					
+					{"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.1", "labelReverse": [270, -200, -210], "embedded":[
+						"PSCH_BTS1.1","PSCV_BTS1.1","PSCH_BTS1.2","PSCV_BTS1.2","PSCH_BTS1.3","PSCV_BTS1.3","PSCH_BTS1.4","PSCV_BTS1.4"
+					]},					
+					{"type": "rd", "position": 1200, "name": "RDB_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
+					]},
+					{"type": "rps", "position": 1800, "name": "RPSCB_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
+						"PSCH_B5.1","PSCV_B6.1","PSCH_B7.1","PSCV_B8.1","PSCH_B9.1","PSCV_B10.1","PSCH_B11.1","PSCV_B12.1"
+					]},
+					{"type": "rps", "position": 2400, "name": "RBUMP_BSA2.1", "labelReverse": [270, -200, -210], "embedded":[
+						"PSBUMP_B13.1","PSBUMP_B14.1","PSBUMP_B14.2","PSBUMP_B14.3"
+					]},
+					{"type": "rc", "position": 3000, "name": "RCBBSA2.1", "labelReverse": [270, -200, -210], "embedded":[
+						"ECEXTBSA2","ECPSBSA2.1","ECPSBSA2.2"
+					]}
+				]
+			},
+			{
+				"start": {"x": -16500, "z": -13450}
+			},			
+			{
+				"start": {"x": 1000, "z": -13500},
+				"components": [
+					{"type": "rps", "position": 0, "name": "RPSBBTS_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
+						"PSB_BTS1.3","PDUBTS_BSA2.3"
+					]},					
+					{"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.2", "labelReverse": [270, -200, -210], "embedded":[
+						"PSB_BTS1.1","PDUBTS_BSA2.1","PSB_BTS1.2","PDUBTS_BSA2.2"
+					]}				
+				]
+			},
+			{
+				"start": {"x": -16500, "z": -13450}
+			},
+			{
+				"start": {"x": 9000, "z": -6000},
+				"components": [
+					{"type": "rd", "position": 0, "name": "RDB_BSA3.1", "labelReverse": [270, -200, -210], "reverse": true, "embedded":[
+						"ECSCRBSA3"
+					]},
+					{"type": "rps", "position": 600, "name": "RPSCB_BSA3.1", "labelReverse": [270, -200, -210], "reverse": true, "embedded":[
+						"PSCV_B16.1","PSCH_B17.1","PSCV_B18.1","PSCH_B19.1","PSCV_B20.1","PSCH_B21.1","PSSF_B1","PSSD_B1"
+					]},
+					{"type": "rc", "position": 1200, "name": "RCB_BSA3.1", "labelReverse": [270, -200, -210], "reverse": true, "embedded":[
+						"ECPSBSA3"
+					]},
+					{"type": "rv", "position": 2000, "name": "RVB_BSA3.2", "labelReverse": [270, -200, -210], "reverse": true, "embedded":[
+						"PSSIP_BSA3.8","PSSIP55_BTS1.1","PSSIP55_BTS1.3","PSSIP55_BTS1.5","PSSIP55_BTS1.7",
+						"PSSIP_BSA3.9","PSSIP55_BTS1.2","PSSIP55_BTS1.4","PSSIP55_BTS1.6",
+						"TPG_BSA3.1","VGPEKE_B13.1","VGPIKE_B13.1","VGPEKE_B13.2",
+						"TPG_BSA3.2","VGPE_B14.1","VGPI_B14.1","VGPE_B15.1","VGPI_B17.1",
+						"TPG_BSA3.3","VGPEE_B14.1","VGPIE_B14.1","VGPEE_B14.2",
+						"TPG_BSA3.4","VGPE_B18.1","VGPE_B22.1",
+						"TPG_BSA3.5","VGPE_B26.1","VGPI_B24.1",
+						"TPG_BSA3.6","VGPE_BTS1.1","VGPI_BTS1.1","VGPE_BTS1.2","VGPI_BTS1.2",
+						"TPG_BSA3.7","VGPE_BTS1.3"
+					]},
+					{"type": "rv", "position": 2800, "name": "RVB_BSA3.1", "labelReverse": [270, -200, -210], "reverse": true, "embedded":[
+						"PSSIP_BSA3.1","PSSIP500KE_B13.1","PSSIP500KE_B14.1",
+						"PSSIP_BSA3.2","PSSIP500E_B14.2",
+						"PSSIP_BSA3.3","PSSIP55_B13.1","PSSIP55_B15.1","PSSIP55_B20.1","PSSIP55_B25.1",
+						"PSSIP_BSA3.4","PSSIP55_B14.1","PSSIP55_B16.1","PSSIP55_B21.1","PSSIP55_B26.1",
+						"PSSIP_BSA3.5","PSSIP55_B14.2","PSSIP55_B17.1","PSSIP55_B22.1","PSSIP55_B27.1",
+						"PSSIP_BSA3.6","PSSIP55_B14.3","PSSIP55_B18.1","PSSIP55_B23.1",
+						"PSSIP_BSA3.7","PSSIP55_B15.1","PSSIP55_B19.1","PSSIP55_B24.1"
+					]}
+				]
+			},
+			{
+				"start": {"x": 6000, "z": -10000}
+			}
+		]
+	},
 	"sr": {
 		"sections": [
 			{
@@ -701,7 +1012,7 @@
 					{"type": "quadrupole", "position": 1055, "name": "QF_S01.02"},
 					{"type": "shutter", "position": 1329, "name": "SH_S01.02", "devices":["QS_S01.02","CEV_S01.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S01.02"},
-					{"type": "undulator", "position": 4279, "name": "ID_S01.01"},
+					{"type": "undulator", "position": 4279, "labelReverse": [90, 1800, 560], "name": "ID_S01.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S01.03"},
 					{"type": "shutter", "position": 7230, "name": "SH_S01.03", "devices":["QS_S01.03","CEV_S01.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S01.03"},
@@ -782,7 +1093,7 @@
 					{"type": "quadrupole", "position": 1054, "name": "QF_S02.02"},
 					{"type": "shutter", "position": 1330, "name": "SH_S02.02", "devices":["QS_S02.02","CEV_S02.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S02.02"},
-					{"type": "undulator", "position": 4280, "name": "ID_S02.01"},
+					{"type": "undulator", "position": 4280, "labelReverse": [90, 1800, 560],"name": "ID_S02.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S02.03"},
 					{"type": "shutter", "position": 7230, "name": "SH_S02.03", "devices":["QS_S02.03","CEV_S02.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S02.03"},
@@ -864,7 +1175,7 @@
 					{"type": "quadrupole", "position": 1055, "name": "QF_S03.02"},
 					{"type": "shutter", "position": 1331, "name": "SH_S03.02", "devices":["QS_S03.02","CEV_S03.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S03.02"},
-					{"type": "undulator", "position": 4281, "name": "ID_S03.01"},
+					{"type": "undulator", "position": 4281, "labelReverse": [90, 1800, 560], "name": "ID_S03.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S03.03"},
 					{"type": "shutter", "position": 7231, "name": "SH_S03.03", "devices":["QS_S03.03","CEV_S03.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S03.03"},
@@ -946,7 +1257,7 @@
 					{"type": "quadrupole", "position": 1055, "name": "QF_S04.02"},
 					{"type": "shutter", "position": 1329, "name": "SH_S04.02", "devices":["QS_S04.02","CEV_S04.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S04.02"},
-					{"type": "undulator", "position": 4279, "name": "ID_S04.01"},
+					{"type": "undulator", "position": 4279, "labelReverse": [270, -800, -560],"name": "ID_S04.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S04.03"},
 					{"type": "shutter", "position": 7230, "name": "SH_S04.03", "devices":["QS_S04.03","CEV_S04.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S04.03"},
@@ -1027,7 +1338,7 @@
 					{"type": "quadrupole", "position": 1054, "name": "QF_S05.02"},
 					{"type": "shutter", "position": 1330, "name": "SH_S05.02", "devices":["QS_S05.02","CEV_S05.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S05.02"},
-					{"type": "undulator", "position": 4280, "name": "ID_S05.01"},
+					{"type": "undulator", "position": 4280, "labelReverse": [270, -800, -560],"name": "ID_S05.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S05.03"},
 					{"type": "shutter", "position": 7230, "name": "SH_S05.03", "devices":["QS_S05.03","CEV_S05.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S05.03"},
@@ -1108,7 +1419,7 @@
 					{"type": "quadrupole", "position": 1055, "name": "QF_S06.02"},
 					{"type": "shutter", "position": 1331, "name": "SH_S06.02", "devices":["QS_S06.02","CEV_S06.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S06.02"},
-					{"type": "undulator", "position": 4281, "name": "ID_S06.01"},
+					{"type": "undulator", "position": 4281, "labelReverse": [270, -800, -560],"name": "ID_S06.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S06.03"},
 					{"type": "shutter", "position": 7231, "name": "SH_S06.03", "devices":["QS_S06.03","CEV_S06.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S06.03"},
@@ -1189,7 +1500,7 @@
 					{"type": "quadrupole", "position": 1055, "name": "QF_S07.02"},
 					{"type": "shutter", "position": 1329, "name": "SH_S07.02", "devices":["QS_S07.02","CEV_S07.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S07.02"},
-					{"type": "undulator", "position": 4279, "name": "ID_S07.01"},
+					{"type": "undulator", "position": 4279, "labelReverse": [270, -800, -560],"name": "ID_S07.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S07.03"},
 					{"type": "shutter", "position": 7230, "name": "SH_S07.03", "devices":["QS_S07.03","CEV_S07.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S07.03"},
@@ -1270,7 +1581,7 @@
 					{"type": "quadrupole", "position": 1054, "name": "QF_S08.02"},
 					{"type": "shutter", "position": 1330, "name": "SH_S08.02", "devices":["QS_S08.02","CEV_S08.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S08.02"},
-					{"type": "undulator", "position": 4280, "name": "ID_S08.01"},
+					{"type": "undulator", "position": 4280, "labelReverse": [270, -800, -560],"name": "ID_S08.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S08.03"},
 					{"type": "shutter", "position": 7230, "name": "SH_S08.03", "devices":["QS_S08.03","CEV_S08.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S08.03"},
@@ -1352,7 +1663,7 @@
 					{"type": "quadrupole", "position": 1055, "name": "QF_S09.02"},
 					{"type": "shutter", "position": 1331, "name": "SH_S09.02", "devices":["QS_S09.02","CEV_S09.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S09.02"},
-					{"type": "undulator", "position": 4281, "name": "ID_S09.01"},
+					{"type": "undulator", "position": 4281, "labelReverse": [270, -800, -560],"name": "ID_S09.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S09.03"},
 					{"type": "shutter", "position": 7231, "name": "SH_S09.03", "devices":["QS_S09.03","CEV_S09.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S09.03"},
@@ -1434,7 +1745,7 @@
 					{"type": "quadrupole", "position": 1055, "name": "QF_S10.02"},
 					{"type": "shutter", "position": 1329, "name": "SH_S10.02", "devices":["QS_S10.02","CEV_S10.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S10.02"},
-					{"type": "undulator", "position": 4279, "name": "ID_S10.01"},
+					{"type": "undulator", "position": 4279, "labelReverse": [90, 1800, 560],"name": "ID_S10.01"},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S10.03"},
 					{"type": "shutter", "position": 7230, "name": "SH_S10.03", "devices":["QS_S10.03","CEV_S10.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S10.03"},
@@ -1515,8 +1826,8 @@
 					{"type": "quadrupole", "position": 1054, "name": "QF_S11.02"},
 					{"type": "shutter", "position": 1330, "name": "SH_S11.02", "devices":["QS_S11.02","CEV_S11.11"]},
 					{"type": "quadrupole", "position": 1515, "name": "QD_S11.02"},
-					{"type": "cavity_3hc", "position": 2480, "name": "3HC_S11.01"},
-					{"type": "scw", "position": 5280, "name": "SCW_S11.01"},
+					{"type": "cavity_3hc", "position": 2480, "name": "3HC_S11.01", "offset2d": [-100, -500]},
+					{"type": "scw", "position": 5280, "name": "SCW_S11.01", "offset2d": [-400, -700]},
 					{"type": "quadrupole", "position": 7045, "name": "QD_S11.03"},
 					{"type": "shutter", "position": 7230, "name": "SH_S11.03", "devices":["QS_S11.03","CEV_S11.12"]},
 					{"type": "quadrupole", "position": 7505, "name": "QF_S11.03"},
-- 
GitLab