From fa44b0b87b9d40bd12b5ddb01e32eb7f2e641d1c Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Tue, 11 Feb 2025 00:07:40 +0000
Subject: [PATCH] Update fermi_lattice.json

---
 fermi_lattice.json | 88 +++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/fermi_lattice.json b/fermi_lattice.json
index b1eb46d..8d0846c 100644
--- a/fermi_lattice.json
+++ b/fermi_lattice.json
@@ -46,7 +46,7 @@
 					{"type": "bpm", "position": 1890, "name": "BPM_INJ.01", "labelReverse": [90, 920, 130]},
 					{"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, -400, 150], "embedded": ["SIP75_L00.02", "SIP20_L00.01"]},
+					{"type": "sip", "position": 2550, "name": "SIP75_INJ.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L00.02", "SIP20_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"},
@@ -76,7 +76,7 @@
 					{"type": "sip", "position": 9775, "name": "SIP55_LH.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "quadrupolefermi", "position": 10111, "name": "Q_LH.02"},
 					{"type": "correctorfermi", "position": 10401, "ps": ["PSCH_LH.01","PSCV_LH.01"], "name": "CHV_LH.01"},
-					{"type": "sip", "position": 10811, "name": "SIP55_L00.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_L00.02"]},
+					{"type": "sip", "position": 10811, "name": "SIP75_LH.01", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_L00.02"]},
 					{"type": "quadrupolefermi", "position": 11111, "name": "Q_LH.03"},
 					{"type": "plc", "position": 11111, "name": "SPIN_LH01.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
 					{"type": "blm", "position": 11111, "name": "BLM_Q_LH.03"},
@@ -191,7 +191,7 @@
 				"components": [
 					{"type": "LH", "position": 496, "name": "LH_02"},
 					
-					{"type": "sip", "position": 250, "name": "SIP55_LH.03", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_L00.04"]},
+					{"type": "sip", "position": 250, "name": "SIP75_LH.03", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_L00.04"]},
 					{"type": "bpm", "position": 506, "name": "BPM_LH.05", "labelReverse": [90, -350, 150]},
 					{"type": "flsc", "position": 736, "name": "MSCR_LH.04", "labelReverse": [90, -350, 220]},
 					{"type": "blm", "position": 736, "name": "BLM_MSCR_LH.04"},
@@ -316,7 +316,7 @@
 					{"type": "correctorfermi", "position": 4267, "ps": ["PSCH_BC01.02","PSCV_BC01.02"], "name": "CHV_BC01.02", "labelReverse": [90, 1140, 200]},
 					{"type": "quadrupolefermi", "position": 4602, "name": "Q_BC01.05", "labelReverse": [90, 1010, 200]},
 					{"type": "blm", "position": 4602, "name": "BLM_Q_BC01.05"},
-					{"type": "sip", "position": 4852, "name": "SIP55_BC01.02","offset2d": [30, -40], "labelReverse": [90, -400, 150]},
+					{"type": "sip", "position": 4852, "name": "SIP75_BC01.02","offset2d": [30, -40], "labelReverse": [90, -400, 150]},
 					{"type": "quadrupolefermi", "position": 5092, "name": "Q_BC01.06", "labelReverse": [90, 1010, 200]},
 					{"type": "blm", "position": 5092, "name": "BLM_Q_BC01.06"},
 					{"type": "bpm", "position": 5423, "name": "BPM_BC01.03", "labelReverse": [90, 1145, 130]},
@@ -576,7 +576,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": "sip", "position": 43200, "name": "SIP75_L04.26", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP75_L04.28", "SIP75_L04.29", "SIP75_L04.30"]},
+					{"type": "sip", "position": 43200, "name": "SIP75_L04.26", "offset2d": [30, -40], "labelReverse": [90, -400, 150], "embedded": ["SIP55_L04.28", "SIP55_L04.29", "SIP55_L04.30"]},
 					{"type": "cavitylinac", "position": 43500, "length": 1700, "name": "ACCBT_L04.07 (K15)"},
 					{"type": "ACCT", "position": 43597, "name": "ACCT_L04.07"},
 					{"type": "quadrupolefermi", "position": 45933, "name": "Q_L04.07"},
@@ -788,7 +788,6 @@
 					{"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": "tent", "position": 3000, "name": "","offset2d": [0, -780]},
-					{"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]},
 					{"type": "quadrupolefermi", "position": 4052, "name": "Q_SFEL01.07", "labelReverse": [90, 1050, 200]},
@@ -909,7 +908,8 @@
 					{"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": "bpm", "position": 20050, "name": "BPM_IUFEL01.01", "labelReverse": [90, 1300, 130]},
+					{"type": "sip", "position": 20150, "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": "PHSH", "position": 22347, "name": "PHSH_IUFEL01.07", "labelReverse": [90, 1300, 100]},
@@ -1240,7 +1240,7 @@
 					{"type": "blm", "position": 43108, "name": "BLM_Q_MBD_FEL02.03", "labelReverse": true},
 					{"type": "vlv", "position": 43499, "name": "VLV_MBD_FEL02.02", "labelReverse": [90, -350, 150]},
 					{"type": "quadrupolefermi", "position": 43799, "name": "Q_MBD_FEL02.04", "labelReverse": [90, -350, 200]},
-					{"type": "sip", "position": 44128, "name": "SIP55_MBDFEL02.04","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
+					{"type": "sip", "position": 44028, "name": "SIP55_MBDFEL02.04","offset2d": [30, -40], "labelReverse": [90, -390, 150]},
 					{"type": "blm", "position": 44128, "name": "BLM_Q_MBD_FEL02.04_L", "labelReverse": true},
 					{"type": "blm", "position": 44128, "name": "BLM_Q_MBD_FEL02.04_R", "labelReverse": true},
 					{"type": "sip", "position": 45228, "name": "SIP55_MBDFEL02.05","offset2d": [30, 0], "labelReverse": [90, -390, 150]},
@@ -1333,21 +1333,21 @@
 				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS.02"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "vlv", "position": 2000, "name": "VLV_POS_TMR.01", "labelReverse": [90, 2000, 180]},
-					{"type": "vlv", "position": 5000, "name": "VLV_POS_TMR.02", "labelReverse": [90, 2000, 180]},
-					{"type": "vlv", "position": 9000, "name": "VLV_POS_TMR.03", "labelReverse": [90, 2000, 180]},
-					{"type": "vlv", "position": 11000, "name": "VLV_POS_TMR.04", "labelReverse": [90, 2000, 180]},
-					{"type": "vlv", "position": 13000, "name": "VLV_POS_TMR.05", "labelReverse": [90, 2000, 180]}
+					{"type": "vlv", "position": 2000, "name": "VLV_POS_TMR.01", "labelReverse": [90, 200, 180, 0]},
+					{"type": "vlv", "position": 5000, "name": "VLV_POS_TMR.02", "labelReverse": [90, 200, 180, 0]},
+					{"type": "vlv", "position": 9000, "name": "VLV_POS_TMR.03", "labelReverse": [90, 200, 180, 0]},
+					{"type": "vlv", "position": 11000, "name": "VLV_POS_TMR.04", "labelReverse": [90, 200, 180, 0]},
+					{"type": "vlv", "position": 13000, "name": "VLV_POS_TMR.05", "labelReverse": [90, 200, 180, 0]}
 				]
 			},
 			{
 				"start": {"x": 142100, "z": -8850},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMR.02", "labelReverse": [0, 2000, 300]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMR.02", "labelReverse": [7, 100, 600, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "vlv", "position": 1500, "name": "VLV_POS_TMR.06", "labelReverse": [90, 2000, 180]},
-					{"type": "vlv", "position": 2950, "name": "VLV_POS_TMR.07", "labelReverse": [90, 2000, 180]},
-					{"type": "vlv", "position": 6200, "name": "VLV_POS_TMR.08", "labelReverse": [180, 2000, -100]}
+					{"type": "vlv", "position": 1500, "name": "VLV_POS_TMR.06", "labelReverse": [90, 200, 180, 0]},
+					{"type": "vlv", "position": 2950, "name": "VLV_POS_TMR.07", "labelReverse": [90, 200, 180, 0]},
+					{"type": "vlv", "position": 6200, "name": "VLV_POS_TMR.08", "labelReverse": [180, 200, -100, 0]}
 				]
 			},
 			{
@@ -1355,7 +1355,7 @@
 				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMR.05", "labelReverse": [0, -300, -100]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "vlv", "position": 590, "name": "VLV_POS_TMR.09", "labelReverse": [90, 10, 180, 0]}
+					{"type": "vlv", "position": 590, "name": "VLV_POS_TMR.09", "labelReverse": [90, 100, 150, 0]}
 				]
 			},
 			{
@@ -1366,16 +1366,16 @@
 			{
 				"start": {"x": 142100, "z": -8850},
 				"components": [
-					{"type": "vlv", "position": 2200, "name": "VLV_POS_TMRB.01", "labelReverse": [90, 2000, 180]}
+					{"type": "vlv", "position": 2200, "name": "VLV_POS_TMRB.01", "labelReverse": [90, 200, 180, 0]}
 				]
 			},
 			{
 				"start": {"x": 144800, "z": -9150},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMR.04", "labelReverse": [6, 1800, 300]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMR.04", "labelReverse": [8, 100, 400, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "vlv", "position": 3500, "name": "VLV_POS_TMRA.01", "labelReverse": [90, 2000, 200]},
-					{"type": "vlv", "position": 9000, "name": "VLV_POS_TMRA.04", "labelReverse": [90, 2000, 200]}
+					{"type": "vlv", "position": 3500, "name": "VLV_POS_TMRA.01", "labelReverse": [90, 200, 200, 0]},
+					{"type": "vlv", "position": 9000, "name": "VLV_POS_TMRA.04", "labelReverse": [90, 200, 200, 0]}
 				]
 			},
 			{
@@ -1397,7 +1397,7 @@
 				"start": {"x": 151200, "z": -10930},
 				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRA.01"},
 				"components": [
-					{"type": "vlv", "position": 400, "name": "VLV_POS_TMRA.02", "labelReverse": [85, 2000, 200]}
+					{"type": "vlv", "position": 400, "name": "VLV_POS_TMRA.02", "labelReverse": [85, 200, 200, 0]}
 				]
 			},
 			{
@@ -1411,7 +1411,7 @@
 				"start": {"x": 152100, "z": -11200},
 				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRA.02"},
 				"components": [
-					{"type": "vlv", "position": 400, "name": "VLV_POS_TMRA.03", "labelReverse": [80, 2000, 200]}
+					{"type": "vlv", "position": 400, "name": "VLV_POS_TMRA.03", "labelReverse": [80, 200, 250, 0]}
 				]
 			},
 			{
@@ -1442,13 +1442,13 @@
 			{
 				"start": {"x": 144800, "z": -9150},
 				"components": [
-					{"type": "vlv", "position": 3500, "name": "VLV_POS_TMRB.02", "labelReverse": [180, 2100, -100]},
-					{"type": "vlv", "position": 8500, "name": "VLV_POS_TMRB.05", "labelReverse": [205, 2050, 200]}
+					{"type": "vlv", "position": 3500, "name": "VLV_POS_TMRB.02", "labelReverse": [180, 200, -100, 0]},
+					{"type": "vlv", "position": 8500, "name": "VLV_POS_TMRB.05", "labelReverse": [205, 200, 100, 0]}
 				]
 			},
 			{
 				"start": {"x": 154400, "z": -9750},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRB.03", "labelReverse": [25, 2000, 300]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRB.03", "labelReverse": [27, 300, 100, 0]},
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "vlv", "position": 300, "name": "VLV_POS_TMRB.07", "labelReverse": [235, 1150, 0]}
@@ -1473,9 +1473,9 @@
 			},
 			{
 				"start": {"x": 151400, "z": -9570},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRB.01", "labelReverse": [40, 1950, 300]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRB.01", "labelReverse": [40, 100, 250, 0]},
 				"components": [
-					{"type": "vlv", "position": 250, "name": "VLV_POS_TMRB.03", "labelReverse": [225, 2050, 250]}
+					{"type": "vlv", "position": 250, "name": "VLV_POS_TMRB.03", "labelReverse": [225, 300, 200, 0]}
 				]
 			},
 			{
@@ -1487,9 +1487,9 @@
 			},
 			{
 				"start": {"x": 152350, "z": -9630},
-				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRB.02", "labelReverse": [40, 2100, 250]},
+				"bending": {"type": "mrc", "label": "show", "name": "MRC_POS_TMRB.02", "labelReverse": [40, 100, 250, 0]},
 				"components": [
-					{"type": "vlv", "position": 250, "name": "VLV_POS_TMRB.04", "labelReverse": [225, 2050, 200]}
+					{"type": "vlv", "position": 250, "name": "VLV_POS_TMRB.04", "labelReverse": [225, 200, 100, 0]}
 				]
 			},
 			{
@@ -1676,14 +1676,14 @@
 					{"type": "rd", "position": 23500, "name": "RD_KG02.02"},
 					{"type": "rd", "position": 24100, "name": "RD_KG02.01", "embedded":[
 						"EC-BPM-KG02-01","LIBERA_BPM_SPINJ.01","LIBERA_BPM_INJ.01","LIBERA_BPM_L0.01","LIBERA_BPM_LH.01","LIBERA_BPM_LH.02","LIBERA_BPM_LH.03_A","LIBERA_BPM_LH.03_B","LIBERA_BPM_LH.04","LIBERA_BPM_SPLH.01","LIBERA_BPM_LH.05","LIBERA_BPM_L01.01",
-						"YSCR_INJ.01","YSCR_INJ.02","PSBPM_SPINJ.01","YSCR_SPINJ.01","YSCR_INJ.03","PSBPM_INJ.01","PSBPM_L00.01","PSMSCR_L00.01","PSMSCR_LH.01","PSBPM_LH.01","PSBPM_LH.02","PSMSCR_LH.02","PSMSCR_LH.03","PSBPM_LH.03","PSBPM_LH.04","PSBPM_SPLH.01","PSMSCR_SPLH.01","PSBPM_LH.05","PSMSCR_LH.04","PSBPM_L01.01"
+						"PSYSCR_INJ.01","PSYSCR_INJ.02","PSBPM_SPINJ.01","PSYSCR_SPINJ.01","PSYSCR_INJ.03","PSBPM_INJ.01","PSBPM_L00.01","PSMSCR_L00.01","PSMSCR_LH.01","PSBPM_LH.01","PSBPM_LH.02","PSMSCR_LH.02","PSMSCR_LH.03","PSBPM_LH.03","PSBPM_LH.04","PSBPM_SPLH.01","PSMSCR_SPLH.01","PSBPM_LH.05","PSMSCR_LH.04","PSBPM_L01.01"
 					]},
 					{"type": "rc", "position": 25300, "name": "RC_KG02.01", "embedded":["EC-PS-KG02-01","SPAC_KG02.01","CMM-PS-KG02-01"]},
 					{"type": "rps", "position": 25900, "name": "RPS_KG02.01", "embedded":[
 						"PSQ_L00.01","PSQ_L00.02","PSCV_L00.01","PSCH_L00.01","PSCV_L00.02","PSCH_L00.02","PSCV_L00.03","PSCH_L00.03","PSCV_L00.04","PSCH_L00.04","PSCV_L00.05","PSCH_L00.05","PSCV_L00.06","PSCH_L00.06"
 					]},
 					{"type": "rps", "position": 26500, "name": "RPS_KG02.02", "width": 800, "height": 2000, "depth": 800, "embedded":[
-						"PSCID_LH.01","PSCID_LH.02","PSCID_LH.03","PSCID_LH.04","PSCV_LH.01","PSCH_LH.01","PSCV_LH.02","PSCH_LH.02","PSCV_LH.03","PSCH_LH.03","PSCV_LH.04","PSCH_LH.04", "PSTRMCB_SPLH.01","PSQ_LH.01","PSQ_LH.02","PSQ_LH.03", "PSQ_LH.04","PSQ_LH.05","PSQ_LH.06","PSQ_LH.07", "PSB_SPLH.01", "PSB_LH"
+						"PSCID_LH.01","PSCID_LH.02","PSCID_LH.03","PSCID_LH.04","PSCV_LH.01","PSCH_LH.01","PSCV_LH.02","PSCH_LH.02","PSCV_LH.03","PSCH_LH.03","PSCV_LH.04","PSCH_LH.04", "PSTRMCB_SPLH.01","PSQ_LH.01","PSQ_LH.02","PSQ_LH.03", "PSQ_LH.04","PSQ_LH.05","PSQ_LH.06","PSQ_LH.07", "PSB_SPLH.01", "PSB_LH.01", "PSB_LH.02", "PSB_LH.03", "PSB_LH.04"
 					]},
 					{"type": "rps", "position": 27100, "name": "RPS_KG02.03", "embedded":[
 						"PSCV_L01.01","PSCH_L01.01","PSCV_L01.02","PSCH_L01.02", "PSCV_L01.03","PSCH_L01.03","PSCV_L01.04","PSCH_L01.04", "PSQ_L01.01","PSQ_L01.02","PSQ_L01.03","PSQ_L01.04"
@@ -1776,7 +1776,7 @@
 					]},
 					{"type": "rc", "position": 70700, "name": "RC_KG05.02", "embedded":["EC-PS-KG05-02","SPIN_KG05.02"]},
 					{"type": "rps", "position": 71300, "name": "RPS_KG05.03", "width": 800, "height": 2000, "depth": 800, "embedded":[
-						"PSQ_BC01.08","PSQ_BC01.09","PSQ_BC01.10","PSQ_BC01.11", "PSTRMCB_SPBC.01", "PSQ_SPBC1.01", "PSQ_SPBC1.02", "PSB_SPBC1"
+						"PSQ_BC01.08","PSQ_BC01.09","PSQ_BC01.10","PSQ_BC01.11", "PSTRMCB_SPBC.01", "PSQ_SPBC01.01", "PSQ_SPBC01.02", "PSB_SPBC01.01"
 					]},
 					{"type": "rps", "position": 71900, "name": "RPS_KG05.04", "embedded":[
 						"PSCV_L02.01","PSCH_L02.01","PSCV_L02.02","PSCH_L02.02", "PSCV_L02.03","PSCH_L02.03","PSCV_L02.04","PSCH_L02.04", "PSQ_L02.01","PSQ_L02.02","PSQ_L02.03","PSQ_L02.04"
@@ -1859,7 +1859,7 @@
 					{"type": "rd", "position": 118700, "name": "RD_KG09.02"},
 					{"type": "rc", "position": 119900, "name": "RC_KG09.01", "embedded":["EC-PS-KG09-01", "SPIN_K09.01"]},
 					{"type": "rps", "position": 120500, "name": "RPS_KG09.01", "embedded":[
-						"PSTRMCB_BC02.01", "PSTRMCB_BC02.02", "PSTRMCB_BC02.03", "PSTRMCB_BC02.04", "PSQ_BC02.01", "PSQ_BC02.02", "PSCV_BC02.01", "PSCH_BC02.01", "SPARE", "PSQ_BC02.03", "PSB_BC02"
+						"PSTRMCB_BC02.01", "PSTRMCB_BC02.02", "PSTRMCB_BC02.03", "PSTRMCB_BC02.04", "PSQ_BC02.01", "PSQ_BC02.02", "PSCV_BC02.01", "PSCH_BC02.01", "SPARE", "PSQ_BC02.03", "PSB_BC02.01", "PSB_BC02.02", "PSB_BC02.03", "PSB_BC02.04"
 					]},
 					{"type": "rps", "position": 121100, "name": "RPS_KG09.02", "width": 800, "height": 2000, "depth": 800, "embedded":[
 						"PSCV_L04.01", "PSCH_L04.01", "PSCV_L04.02", "PSCH_L04.02", "PSCV_L04.03", "PSCH_L04.03", "PSCV_L04.04", "PSCH_L04.04", "PSCV_L04.05", "PSCH_L04.05"
@@ -2131,7 +2131,7 @@
 						"PSCV_BC01.01","PSCH_BC01.01","PSCV_BC01.02","PSCH_BC01.02", "PSCV_BC01.03","PSCH_BC01.03","PSCV_BC01.04","PSCH_BC01.04", "PSCV_BC01.05","PSCH_BC01.05","PSCV_BC01.06","PSCH_BC01.06", "PSTRMCB_BC01.01","PSTRMCB_BC01.02","PSTRMCB_BC01.03","PSTRMCB_BC01.04", "PSQ_BC01.01","PSQ_BC01.02","PSQ_BC01.03","PSQ_BC01.06"
 					]},
 					{"type": "rps", "position": 1200, "name": "RPS_KG05.02", "width": 800, "height": 2000, "depth": 800, "embedded":[
-						"PSQ_BC01.04","PSQ_BC01.05","PSQ_BC01.07", "PSB_BC01"
+						"PSQ_BC01.04","PSQ_BC01.05","PSQ_BC01.07", "PSB_BC01.01", "PSB_BC01.02", "PSB_BC01.03", "PSB_BC01.04"
 					]},
 					{"type": "rv", "position": 1800, "name": "RV_KG05.01", "embedded":[
 						"PSSIP_KG05.01","PSSIP150_BC01.01","PSSIP300_BC01.01",
@@ -2185,7 +2185,7 @@
 					{"type": "rps", "position": 3400, "name": "RPS_KG15.02", "embedded":[
 						"PSQ_DBD.01", "PSQ_DBD.02", "PSQ_DBD.03", "PSQ_DBD.04", "PSQ_DBD.05"
 					]},
-					{"type": "rpsb", "position": 4000, "name": "RPSB_KG15.03","width": 1000, "height": 2100, "depth": 1000, "offset3d": [900, 0, 0], "embedded":["PSB_DBD"]}
+					{"type": "rpsb", "position": 4000, "name": "RPSB_KG15.03","width": 1000, "height": 2100, "depth": 1000, "offset3d": [900, 0, 0], "embedded":["PSB_DBD.01","PSB_DBD.02"]}
 				]
 			},
 			{
@@ -2234,7 +2234,7 @@
 				"start": {"x": 4000, "y": 4000, "z": -7600},
 				"components": [
 					{"type": "rps", "position": 300, "name": "RPS_SSA.01", "labelReverse": [90, -1200, 300], "embedded":[
-						"PSCV_SFEL01.01","PSCH_SFEL01.01","PSCV_SFEL01.02","PSCH_SFEL01.02", "PSCV_SFEL01.03","PSCH_SFEL01.03","PSCV_SFEL01.04","PSCH_SFEL01.04", "PSB_SCL-FEL1 ", "PSB_SFEL2"
+						"PSCV_SFEL01.01","PSCH_SFEL01.01","PSCV_SFEL01.02","PSCH_SFEL01.02", "PSCV_SFEL01.03","PSCH_SFEL01.03","PSCV_SFEL01.04","PSCH_SFEL01.04", "PSB_SCL.01","PSB_SCL.02","PSB_EEHG_FEL.01.01","PSB_EEHG_FEL.01.02","PSB_EEHG_FEL.01.03","PSB_EEHG_FEL.01.04","PSB_SFEL.02.01", "PSB_SFEL.02.02"
 					]},
 					{"type": "rps", "position": 900, "name": "RPS_SSA.02", "labelReverse": [90, -1200, 300], "embedded":[
 						"PSCV_SFEL01.05","PSCH_SFEL01.05","PSCV_SFEL01.06","PSCH_SFEL01.06", "PSQ_SFEL01.01", "PSQ_SFEL01.07", "PSQ_SFEL02.01", "PSQ_SFEL02.02", "PSQ_SFEL02.04"
@@ -2246,7 +2246,7 @@
 						"PSQ_SFEL01.02", "PSQ_SFEL01.03","PSQ_SFEL01.04","PSQ_SFEL01.05","PSQ_SFEL01.06", "PSQ_SFEL01.08","PSQ_SFEL01.09","PSQ_SFEL01.10","PSQ_SFEL01.11"
 					]},
 					{"type": "rps", "position": 2700, "name": "RPS_SSA.05", "labelReverse": [90, -1200, 300], "embedded":[
-						"PSCV_SFEL02.02","PSCH_SFEL02.02","PSCV_SFEL02.04","PSCH_SFEL02.04", "PSCV_SFEL02.01","PSCH_SFEL02.01","PSCV_SFEL02.03","PSCH_SFEL02.03", "PSTRMCB_SFEL02.01","SPARE","SPARE","PSQ_SFEL02.03", "PSQ_SFEL02.05","PSQ_SFEL02.06","PSQ_SFEL02.07","PSQ_SFEL02.08"
+						"PSCV_SFEL02.02","PSCH_SFEL02.02","PSCV_SFEL02.04","PSCH_SFEL02.04", "PSCV_SFEL02.01","PSCH_SFEL02.01","PSCV_SFEL02.03","PSCH_SFEL02.03", "PSTRMCB_SFEL02.01","SPARE","SPARE","PSQ_SFEL02.03", "PSQ_SFEL02.05","PSQ_SFEL02.06","PSQ_SFEL02.07","PSQ_SFEL02.08","PSW_FEL01.01","PSW_FEL01.02","PSW_FEL02.01"
 					]}
 				]
 			},
@@ -2324,7 +2324,7 @@
 						"PSCV_IUFEL01.01","PSCH_IUFEL01.01","PSCV_IUFEL01.02","PSCH_IUFEL01.02", "PSCV_IUFEL01.03","PSCH_IUFEL01.03","PSCV_IUFEL01.04","PSCH_IUFEL01.04", "PSQ_IUFEL01.01","PSQ_IUFEL01.02","PSQ_IUFEL01.03","PSQ_IUFEL01.04", "PSQ_IUFEL01.05","PSQ_IUFEL01.06","PSQ_IUFEL01.07","PSQ_IUFEL01.08", "PSQ_FEL02.01","PSQ_FEL02.02","PSQ_FEL02.03","PSQ_FEL02.04"
 					]},
 					{"type": "rps", "position": 28500, "name": "RPS_USA.04","reverse2d" : true, "embedded":[
-						"PSCV_IUFEL01.05","PSCH_IUFEL01.05","PSCV_IUFEL01.06","PSCH_IUFEL01.06", "PSCV_IUFEL01.07","PSCH_IUFEL01.07","PSCV_IUFEL01.08","PSCH_IUFEL01.08", "PSTRMCB_FEL02.01","PSTRMCB_FEL02.01","PSTRMCB_FEL02.03","PSTRMCB_FEL02.04", "PSTRMCW_FEL02.01","PSTRMCW_FEL02.02","PSCV_FEL02.01","PSCH_FEL02.01", "PSCV_FEL02.02","PSCH_FEL02.02","PSCV_FEL02.03","PSCH_FEL02.03"
+						"PSCV_IUFEL01.05","PSCH_IUFEL01.05","PSCV_IUFEL01.06","PSCH_IUFEL01.06", "PSCV_IUFEL01.07","PSCH_IUFEL01.07","PSCV_IUFEL01.08","PSCH_IUFEL01.08", "PSTRMCB_FEL02.01","PSTRMCB_FEL02.01","PSTRMCB_FEL02.03","PSTRMCB_FEL02.04", "PSTRMCW_FEL02.01","PSTRMCW_FEL02.02","PSCV_FEL02.01","PSCH_FEL02.01", "PSCV_FEL02.02","PSCH_FEL02.02","PSCV_FEL02.03","PSCH_FEL02.03","PSB_FEL02.01","PSB_FEL02.02","PSB_FEL02.03","PSB_FEL02.04"
 					]},
 					{"type": "rps", "position": 27900, "name": "RPS_USA.05","reverse2d" : true, "embedded":[
 						"PSCV_FEL02.04","PSCH_FEL02.04","PSTRMCW_FEL02.03","PSTRMCW_FEL02.04", "PSCID_FEL02.01","PSCID_FEL02.02","PSCID_FEL02.03","PSCID_FEL02.04","PSCID_FEL02.05","PSCID_FEL02.06","PSCID_FEL02.07","PSCID_FEL02.08"
@@ -2356,7 +2356,7 @@
 					{"type": "rid", "position": 17300, "name": "RID_USA.13","reverse2d" : true, "embedded":["ID_FEL02.08"]},
 					{"type": "rid", "position": 16700, "name": "RID_USA.14","reverse2d" : true, "embedded":["ID_FEL01.06"]},
 					{"type": "rd", "position": 16100, "name": "RD_USA.01","reverse2d" : true, "embedded":[
-						"BAM_SFEL01.01","PSBPM_FEL01.01","PSBPM_FEL01.02","PSBPM_IUFEL01.02","EC-CBPM-USA-01"
+						"PSBAM_SFEL01.01","PSBPM_FEL01.01","PSBPM_FEL01.02","PSBPM_IUFEL01.02","EC-CBPM-USA-01"
 					]},
 					{"type": "rc", "position": 15500, "name": "RC_USA.02","reverse2d" : true, "embedded":["EC-MPS-USA-01","MAST MPS_USA_01"]},
 					{"type": "rv", "position": 14700, "name": "RV_USA.02","reverse2d" : true, "embedded":[
@@ -2394,8 +2394,8 @@
 						"MASTIN_USA.01" 
 					]},
 					
-					{"type": "rid", "position": 6500, "name": "RID_USA.21","reverse2d" : true, "embedded":["ID_FEL01.08"]},
-					{"type": "rid", "position": 5900, "name": "RID_USA.22","reverse2d" : true, "embedded":["ID_FEL01.09"]},
+					{"type": "rid", "position": 6500, "name": "RID_USA.21","reverse2d" : true, "embedded":["RID_FEL01.08"]},
+					{"type": "rid", "position": 5900, "name": "RID_USA.22","reverse2d" : true, "embedded":["RID_FEL01.09"]},
 
 					{"type": "rd", "position": 4300, "name": "RD_USA.03","reverse2d" : true, "embedded":[
 						"PSMSCR_FEL01.01","PSMSCR_EEHG_FEL01.01","PSMSCR_FEL01.02","PSMSCR_IUFEL01.02","PSMSCR_IUFEL01.03","PSMSCR_IUFEL01.04","PSMSCR_IUFEL01.06","PSMSCR_IUFEL01.08","PSMSCR_FEL02.01","PSMSCR_IUFEL02.02","PSMSCR_FEL02.02","PSMSCR_FEL02.03","PSMSCR_IUFEL02.03","PSMSCR_IUFEL02.05","PSMSCR_IUFEL02.07","PSMSCR_IUFEL02.08","PSMSCR_IUFEL02.09","EC-SE-USA-01","CMM-IUFEL-USA-01"
@@ -2504,7 +2504,7 @@
 						"sw-c-esa-04", "pdu-rc-esa-04"
 					]},
 					{"type": "rd", "position": 2000, "name": "RD_ESA.01", "labelReverse": [90, 950, 300], "embedded": [
-						"sw-c-esa-05","sw-mscr-esa-01","sw-bpm-esa-01","ec-bpm-esa-01","CM_SFEL01.01", "CM_SFEL02.01", "CM_MBD_FEL01.01", "PSBPM_MBD_FEL01.01", "PSMSCR_MBD_FEL01.01", "PSBPM_MBD_FEL01.02", "PSBPM_MBD_FEL01.03", "CM_MBD_FEL02.01", "PSBPM_MBD_FEL02.01", "PSMSCR_MBD_FEL02.01", "PSBPM_MBD_FEL02.02", "PSBPM_MBD.01", "PSBPM_MBD.02", "PSBPM_MBD.03", "CM_MBD.01", "PSMSCR_MBD.01","EC-BPM-ESA-01","LIBERA_BPM_IUFEL01.01","LIBERA_BPM_MBD01.02","LIBERA_BPM_MBD02.01","LIBERA_BPM_MBD01.01","LIBERA_BPM_IUFEL02.02","LIBERA_BPM_MBD01.03","LIBERA_BPM_MBD02.02","LIBERA_BPM_MBD01","LIBERA_BPM_MBD02","LIBERA_BPM_MBD03"
+						"sw-c-esa-05","sw-mscr-esa-01","sw-bpm-esa-01","ec-bpm-esa-01","PSCM_SFEL01.01", "PSCM_SFEL02.01", "PSCM_MBD_FEL01.01", "PSBPM_MBD_FEL01.01", "PSMSCR_MBD_FEL01.01", "PSBPM_MBD_FEL01.02", "PSBPM_MBD_FEL01.03", "PSCM_MBD_FEL02.01", "PSBPM_MBD_FEL02.01", "PSMSCR_MBD_FEL02.01", "PSBPM_MBD_FEL02.02", "PSBPM_MBD.01", "PSBPM_MBD.02", "PSBPM_MBD.03", "PSCM_MBD.01", "PSMSCR_MBD.01","EC-BPM-ESA-01","LIBERA_BPM_IUFEL01.01","LIBERA_BPM_MBD01.02","LIBERA_BPM_MBD02.01","LIBERA_BPM_MBD01.01","LIBERA_BPM_IUFEL02.02","LIBERA_BPM_MBD01.03","LIBERA_BPM_MBD02.02","LIBERA_BPM_MBD01","LIBERA_BPM_MBD02","LIBERA_BPM_MBD03"
 					]}
 				]
 			},
-- 
GitLab