From 227489c5fa5cc3e3a9fa26b84f4b3563021a3bf7 Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Fri, 16 Aug 2024 03:12:57 +0000
Subject: [PATCH] Update elettra2_lattice.json
---
elettra2_lattice.json | 1681 ++++++++++++++++++-----------------------
1 file changed, 725 insertions(+), 956 deletions(-)
diff --git a/elettra2_lattice.json b/elettra2_lattice.json
index fb4cf77..5850585 100644
--- a/elettra2_lattice.json
+++ b/elettra2_lattice.json
@@ -982,11 +982,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S01.01", "devices":["TRCEB_S01.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S01.02", "devices":["CEH_S01.03","CEV_S01.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S01.02", "devices":["CEH_S01.03","CEV_S01.03"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S01.03"},
{"type": "quadrupole", "position": 860, "name": "QAB_S01.02"},
- {"type": "sextupole", "position": 1150, "name": "SF_S01.02", "devices":["CEH_S01.04","CEV_S01.04"]},
+ {"type": "sextupole_CHV", "position": 1150, "name": "SF_S01.02", "devices":["CEH_S01.04","CEV_S01.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S01.03"},
- {"type": "sextupole", "position": 1669, "name": "SD_S01.03", "devices":["CEH_S01.05","CEV_S01.05"]}
+ {"type": "bpm", "position": 1569, "name": "BPM_S01.04"},
+ {"type": "sextupole_CHV", "position": 1669, "name": "SD_S01.03", "devices":["CEH_S01.05","CEV_S01.05"]},
+ {"type": "corrector", "position": 2080, "name": "CFH_S01.02"},
+ {"type": "corrector", "position": 2180, "name": "CFV_S01.02"}
]
},
{
@@ -994,12 +998,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S01.02", "devices":["TRCEB_S01.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 661, "name": "SD_S01.04", "devices":["CEH_S01.06","CEV_S01.06"]},
+ {"type": "sextupole_CHV", "position": 661, "name": "SD_S01.04", "devices":["CEH_S01.06","CEV_S01.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S01.04"},
- {"type": "sextupole", "position": 1181, "name": "SF_S01.03", "devices":["CEH_S01.07","CEV_S01.07"]},
- {"type": "octupole", "position": 1421, "name": "OCT_S01.01", "devices":["CEH_S01.08","CEV_S01.08"]},
+ {"type": "sextupole_CHV", "position": 1181, "name": "SF_S01.03", "devices":["CEH_S01.07","CEV_S01.07"]},
+ {"type": "bpm", "position": 1321, "name": "BPM_S01.05"},
+ {"type": "octupole_CHV", "position": 1421, "name": "OCT_S01.01", "devices":["CEH_S01.08","CEV_S01.08"]},
{"type": "quadrupole", "position": 1641, "name": "QF_S01.01"},
- {"type": "sextupole", "position": 1890, "name": "SD_S01.05", "devices":["QS_S01.01","CEV_S01.09"]}
+ {"type": "sextupole_QK", "position": 1890, "name": "SD_S01.05", "devices":["QS_S01.01","CEV_S01.09"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S01.03"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S01.03"}
]
},
{
@@ -1007,17 +1014,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S01.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S01.01", "devices":["OCT_S01.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S01.01", "devices":["CEH_S01.10","CEV_S01.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S01.02", "devices":["QD_S01.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S01.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S01.01", "devices":["CEH_S01.10","CEV_S01.10"]},
{"type": "quadrupole", "position": 1055, "name": "QF_S01.02"},
- {"type": "shutter", "position": 1329, "name": "SH_S01.02", "devices":["QS_S01.02","CEV_S01.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [90, 1800, 560], "name": "ID_S01.01"},
+ {"type": "corrector", "position": 4079, "name": "CV_S01.01"},
+ {"type": "bpm", "position": 4179, "name": "BPM_S01.07"},
+ {"type": "undulator", "position": 4279, "name": "ID_S01.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S01.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S01.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S01.03"},
- {"type": "shutter", "position": 7230, "name": "SH_S01.03", "devices":["QS_S01.03","CEV_S01.12"]},
+ {"type": "shutter_QK", "position": 7230, "name": "SH_S01.03", "devices":["QS_S01.03","CEV_S01.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S01.03"},
- {"type": "shutter", "position": 7790, "name": "SH_S01.04", "devices":["CEH_S01.13","CEV_S01.13"]},
- {"type": "quadrupole", "position": 8015, "name": "QD_S01.04", "devices":["OCT_S01.03"]}
+ {"type": "shutter_CHV", "position": 7790, "name": "SH_S01.04", "devices":["CEH_S01.13","CEV_S01.13"]},
+ {"type": "octupole_QD", "position": 8015, "name": "OCT_S01.03", "devices":["QD_S01.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S01.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S01.04"}
]
},
{
@@ -1025,12 +1039,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S01.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 550, "name": "SD_S01.06", "devices":["QS_S01.04","CEV_S01.14"]},
+ {"type": "sextupole_QK", "position": 550, "name": "SD_S01.06", "devices":["QS_S01.04","CEV_S01.14"]},
{"type": "quadrupole", "position": 780, "name": "QF_S01.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S01.04", "devices":["CEH_S01.15","CEV_S01.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S01.04", "devices":["CEH_S01.16","CEV_S01.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S01.04", "devices":["CEH_S01.15","CEV_S01.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S01.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S01.04", "devices":["CEH_S01.16","CEV_S01.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S01.05"},
- {"type": "sextupole", "position": 1761, "name": "SD_S01.07", "devices":["CEH_S01.17","CEV_S01.17"]}
+ {"type": "sextupole_CHV", "position": 1761, "name": "SD_S01.07", "devices":["CEH_S01.17","CEV_S01.17"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S01.05"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S01.05"}
]
},
{
@@ -1038,11 +1055,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S01.05", "devices":["TRCEB_S01.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S01.08", "devices":["CEH_S01.18","CEV_S01.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S01.08", "devices":["CEH_S01.18","CEV_S01.18"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S01.12"},
{"type": "quadrupole", "position": 860, "name": "QAB_S01.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S01.05", "devices":["CEH_S01.19","CEV_S01.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S01.05", "devices":["CEH_S01.19","CEV_S01.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S01.07"},
- {"type": "sextupole", "position": 1671, "name": "SD_S01.09", "devices":["CEH_S01.20","CEV_S01.20"]}
+ {"type": "bpm", "position": 1571, "name": "BPM_S01.13"},
+ {"type": "sextupole_CHV", "position": 1671, "name": "SD_S01.09", "devices":["CEH_S01.20","CEV_S01.20"]},
+ {"type": "corrector", "position": 2080, "name": "CFH_S01.06"},
+ {"type": "corrector", "position": 2180, "name": "CFV_S01.06"}
]
},
{
@@ -1050,12 +1071,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S01.06", "devices":["TRCEB_S01.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S01.10", "devices":["CEH_S01.21","CEV_S01.21"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S01.10", "devices":["CEH_S01.21","CEV_S01.21"]},
{"type": "quadrupole", "position": 861, "name": "QAB_S01.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S01.06", "devices":["CEH_S01.22","CEV_S01.22"]},
- {"type": "sextupole", "position": 2531, "name": "SF_S02.01", "devices":["CEH_S02.01","CEV_S02.01"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S01.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S01.06", "devices":["CEH_S01.22","CEV_S01.22"]},
+ {"type": "undulator", "position": 2431, "name": "SHID_S02.01"},
+ {"type": "sextupole_CHV", "position": 2531, "name": "SF_S02.01", "devices":["CEH_S02.01","CEV_S02.01"]},
+ {"type": "bpm", "position": 2681, "name": "BPM_S02.01"},
{"type": "quadrupole", "position": 2781, "name": "QAB_S02.01"},
- {"type": "sextupole", "position": 3031, "name": "SD_S02.01", "devices":["CEH_S02.02","CEV_S02.02"]}
+ {"type": "sextupole_CHV", "position": 3031, "name": "SD_S02.01", "devices":["CEH_S02.02","CEV_S02.02"]},
+ {"type": "corrector", "position": 3441, "name": "CFH_S02.01"},
+ {"type": "corrector", "position": 3541, "name": "CFV_S02.01"}
]
},
{
@@ -1063,11 +1089,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S02.01", "devices":["TRCEB_S02.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S02.02", "devices":["CEH_S02.03","CEV_S02.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S02.02", "devices":["CEH_S02.03","CEV_S02.03"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S02.03"},
{"type": "quadrupole", "position": 860, "name": "QAB_S02.02"},
- {"type": "sextupole", "position": 1151, "name": "SF_S02.02", "devices":["CEH_S02.04","CEV_S02.04"]},
+ {"type": "sextupole_CHV", "position": 1151, "name": "SF_S02.02", "devices":["CEH_S02.04","CEV_S02.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S02.03"},
- {"type": "sextupole", "position": 1670, "name": "SD_S02.03", "devices":["CEH_S02.05","CEV_S02.05"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S02.04"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S02.03", "devices":["CEH_S02.05","CEV_S02.05"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S02.02"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S02.02"}
]
},
{
@@ -1075,12 +1105,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S02.02", "devices":["TRCEB_S02.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 661, "name": "SD_S02.04", "devices":["CEH_S02.06","CEV_S02.06"]},
+ {"type": "sextupole_CHV", "position": 661, "name": "SD_S02.04", "devices":["CEH_S02.06","CEV_S02.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S02.04"},
- {"type": "sextupole", "position": 1181, "name": "SF_S02.03", "devices":["CEH_S02.07","CEV_S02.07"]},
- {"type": "octupole", "position": 1421, "name": "OCT_S02.01", "devices":["CEH_S02.08","CEV_S02.08"]},
+ {"type": "sextupole_CHV", "position": 1181, "name": "SF_S02.03", "devices":["CEH_S02.07","CEV_S02.07"]},
+ {"type": "bpm", "position": 1321, "name": "BPM_S02.05"},
+ {"type": "octupole_CHV", "position": 1421, "name": "OCT_S02.01", "devices":["CEH_S02.08","CEV_S02.08"]},
{"type": "quadrupole", "position": 1641, "name": "QF_S02.01"},
- {"type": "sextupole", "position": 1891, "name": "SD_S02.05", "devices":["QS_S02.01","CEV_S02.09"]}
+ {"type": "sextupole_QK", "position": 1891, "name": "SD_S02.05", "devices":["QS_S02.01","CEV_S02.09"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S02.03"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S02.03"}
]
},
{
@@ -1088,17 +1121,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S02.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S02.01", "devices":["OCT_S02.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S02.01", "devices":["CEH_S02.10","CEV_S02.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S02.02", "devices":["QD_S02.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S02.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S02.01", "devices":["CEH_S02.10","CEV_S02.10"]},
{"type": "quadrupole", "position": 1054, "name": "QF_S02.02"},
- {"type": "shutter", "position": 1330, "name": "SH_S02.02", "devices":["QS_S02.02","CEV_S02.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [90, 1800, 560],"name": "ID_S02.01"},
+ {"type": "corrector", "position": 4080, "name": "CV_S02.01"},
+ {"type": "bpm", "position": 4180, "name": "BPM_S02.07"},
+ {"type": "undulator", "position": 4280, "name": "ID_S02.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S02.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S02.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S02.03"},
- {"type": "shutter", "position": 7230, "name": "SH_S02.03", "devices":["QS_S02.03","CEV_S02.12"]},
+ {"type": "shutter_QK", "position": 7230, "name": "SH_S02.03", "devices":["QS_S02.03","CEV_S02.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S02.03"},
- {"type": "shutter", "position": 7789, "name": "SH_S02.04", "devices":["CEH_S02.13","CEV_S02.13"]},
- {"type": "quadrupole", "position": 8015, "name": "QD_S02.04", "devices":["OCT_S02.03"]}
+ {"type": "shutter_CHV", "position": 7789, "name": "SH_S02.04", "devices":["CEH_S02.13","CEV_S02.13"]},
+ {"type": "octupole_QD", "position": 8015, "name": "OCT_S02.03", "devices":["QD_S02.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S02.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S02.04"}
]
},
{
@@ -1106,12 +1146,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S02.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 550, "name": "SD_S02.06", "devices":["QS_S02.04","CEV_S02.14"]},
+ {"type": "sextupole_QK", "position": 550, "name": "SD_S02.06", "devices":["QS_S02.04","CEV_S02.14"]},
{"type": "quadrupole", "position": 780, "name": "QF_S02.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S02.04", "devices":["CEH_S02.15","CEV_S02.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S02.04", "devices":["CEH_S02.16","CEV_S02.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S02.04", "devices":["CEH_S02.15","CEV_S02.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S02.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S02.04", "devices":["CEH_S02.16","CEV_S02.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S02.05"},
- {"type": "sextupole", "position": 1760, "name": "SD_S02.07", "devices":["CEH_S02.17","CEV_S02.17"]}
+ {"type": "sextupole_CHV", "position": 1760, "name": "SD_S02.07", "devices":["CEH_S02.17","CEV_S02.17"]},
+ {"type": "corrector", "position": 2220, "name": "CFH_S02.05"},
+ {"type": "corrector", "position": 2320, "name": "CFV_S02.05"}
]
},
{
@@ -1119,11 +1162,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S02.05", "devices":["TRCEB_S02.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S02.08", "devices":["CEH_S02.18","CEV_S02.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S02.08", "devices":["CEH_S02.18","CEV_S02.18"]},
+ {"type": "bpm", "position": 761, "name": "BPM_S02.12"},
{"type": "quadrupole", "position": 861, "name": "QAB_S02.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S02.05", "devices":["CEH_S02.19","CEV_S02.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S02.05", "devices":["CEH_S02.19","CEV_S02.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S02.07"},
- {"type": "sextupole", "position": 1670, "name": "SD_S02.09", "devices":["CEH_S02.20","CEV_S02.20"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S02.13"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S02.09", "devices":["CEH_S02.20","CEV_S02.20"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S02.06"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S02.06"}
]
},
{
@@ -1131,13 +1178,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S02.06", "devices":["TRCEB_S02.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S02.10", "devices":["CEH_S02.21","CEV_S02.21"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S02.10", "devices":["CEH_S02.21","CEV_S02.21"]},
{"type": "quadrupole", "position": 860, "name": "QAB_S02.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S02.06", "devices":["CEH_S02.22","CEV_S02.22"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S02.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S02.06", "devices":["CEH_S02.22","CEV_S02.22"]},
{"type": "cavrf", "position": 1820, "name": "CAVRF_S03.01"},
- {"type": "sextupole", "position": 2530, "name": "SF_S03.01", "devices":["CEH_S03.01","CEV_S03.01"]},
+ {"type": "sextupole_CHV", "position": 2530, "name": "SF_S03.01", "devices":["CEH_S03.01","CEV_S03.01"]},
+ {"type": "bpm", "position": 2679, "name": "BPM_S03.01"},
{"type": "quadrupole", "position": 2779, "name": "QAB_S03.01"},
- {"type": "sextupole", "position": 3030, "name": "SD_S03.01", "devices":["CEH_S03.02","CEV_S03.02"]}
+ {"type": "sextupole_CHV", "position": 3030, "name": "SD_S03.01", "devices":["CEH_S03.02","CEV_S03.02"]},
+ {"type": "corrector", "position": 3440, "name": "CFH_S03.01"},
+ {"type": "corrector", "position": 3540, "name": "CFV_S03.01"}
]
},
{
@@ -1145,11 +1196,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S03.01", "devices":["TRCEB_S03.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S03.02", "devices":["CEH_S03.03","CEV_S03.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S03.02", "devices":["CEH_S03.03","CEV_S03.03"]},
+ {"type": "bpm", "position": 761, "name": "BPM_S03.03"},
{"type": "quadrupole", "position": 861, "name": "QAB_S03.02"},
- {"type": "sextupole", "position": 1151, "name": "SF_S03.02", "devices":["CEH_S03.04","CEV_S03.04"]},
+ {"type": "sextupole_CHV", "position": 1151, "name": "SF_S03.02", "devices":["CEH_S03.04","CEV_S03.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S03.03"},
- {"type": "sextupole", "position": 1670, "name": "SD_S03.03", "devices":["CEH_S03.05","CEV_S03.05"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S03.04"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S03.03", "devices":["CEH_S03.05","CEV_S03.05"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S03.02"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S03.02"}
]
},
{
@@ -1157,12 +1212,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S03.02", "devices":["TRCEB_S03.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 660, "name": "SD_S03.04", "devices":["CEH_S03.06","CEV_S03.06"]},
+ {"type": "sextupole_CHV", "position": 660, "name": "SD_S03.04", "devices":["CEH_S03.06","CEV_S03.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S03.04"},
- {"type": "sextupole", "position": 1180, "name": "SF_S03.03", "devices":["CEH_S03.07","CEV_S03.07"]},
- {"type": "octupole", "position": 1420, "name": "OCT_S03.01", "devices":["CEH_S03.08","CEV_S03.08"]},
+ {"type": "sextupole_CHV", "position": 1180, "name": "SF_S03.03", "devices":["CEH_S03.07","CEV_S03.07"]},
+ {"type": "bpm", "position": 1320, "name": "BPM_S03.05"},
+ {"type": "octupole_CHV", "position": 1420, "name": "OCT_S03.01", "devices":["CEH_S03.08","CEV_S03.08"]},
{"type": "quadrupole", "position": 1640, "name": "QF_S03.01"},
- {"type": "sextupole", "position": 1890, "name": "SD_S03.05", "devices":["QS_S03.01","CEV_S03.09"]}
+ {"type": "sextupole_QK", "position": 1890, "name": "SD_S03.05", "devices":["QS_S03.01","CEV_S03.09"]},
+ {"type": "corrector", "position": 2220, "name": "CFH_S03.03"},
+ {"type": "corrector", "position": 2320, "name": "CFV_S03.03"}
]
},
{
@@ -1170,17 +1228,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S03.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S03.01", "devices":["OCT_S03.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S03.01", "devices":["CEH_S03.10","CEV_S03.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S03.02", "devices":["QD_S03.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S03.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S03.01", "devices":["CEH_S03.10","CEV_S03.10"]},
{"type": "quadrupole", "position": 1055, "name": "QF_S03.02"},
- {"type": "shutter", "position": 1331, "name": "SH_S03.02", "devices":["QS_S03.02","CEV_S03.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [90, 1800, 560], "name": "ID_S03.01"},
+ {"type": "corrector", "position": 4081, "name": "CV_S03.01"},
+ {"type": "bpm", "position": 4181, "name": "BPM_S03.07"},
+ {"type": "undulator", "position": 4281, "name": "ID_S03.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S03.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S03.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S03.03"},
- {"type": "shutter", "position": 7231, "name": "SH_S03.03", "devices":["QS_S03.03","CEV_S03.12"]},
+ {"type": "shutter_QK", "position": 7231, "name": "SH_S03.03", "devices":["QS_S03.03","CEV_S03.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S03.03"},
- {"type": "shutter", "position": 7790, "name": "SH_S03.04", "devices":["CEH_S03.13","CEV_S03.13"]},
- {"type": "quadrupole", "position": 8016, "name": "QD_S03.04", "devices":["OCT_S03.03"]}
+ {"type": "shutter_CHV", "position": 7790, "name": "SH_S03.04", "devices":["CEH_S03.13","CEV_S03.13"]},
+ {"type": "octupole_QD", "position": 8016, "name": "OCT_S03.03", "devices":["QD_S03.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S03.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S03.04"}
]
},
{
@@ -1188,12 +1253,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S03.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 551, "name": "SD_S03.06", "devices":["QS_S03.04","CEV_S03.14"]},
+ {"type": "sextupole_QK", "position": 551, "name": "SD_S03.06", "devices":["QS_S03.04","CEV_S03.14"]},
{"type": "quadrupole", "position": 781, "name": "QF_S03.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S03.04", "devices":["CEH_S03.15","CEV_S03.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S03.04", "devices":["CEH_S03.16","CEV_S03.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S03.04", "devices":["CEH_S03.15","CEV_S03.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S03.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S03.04", "devices":["CEH_S03.16","CEV_S03.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S03.05"},
- {"type": "sextupole", "position": 1760, "name": "SD_S03.07", "devices":["CEH_S03.17","CEV_S03.17"]}
+ {"type": "sextupole_CHV", "position": 1760, "name": "SD_S03.07", "devices":["CEH_S03.17","CEV_S03.17"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S03.05"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S03.05"}
]
},
{
@@ -1201,11 +1269,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S03.05", "devices":["TRCEB_S03.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S03.08", "devices":["CEH_S03.18","CEV_S03.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S03.08", "devices":["CEH_S03.18","CEV_S03.18"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S03.12"},
{"type": "quadrupole", "position": 860, "name": "QAB_S03.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S03.05", "devices":["CEH_S03.19","CEV_S03.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S03.05", "devices":["CEH_S03.19","CEV_S03.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S03.07"},
- {"type": "sextupole", "position": 1670, "name": "SD_S03.09", "devices":["CEH_S03.20","CEV_S03.20"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S03.13"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S03.09", "devices":["CEH_S03.20","CEV_S03.20"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S03.06"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S03.06"}
]
},
{
@@ -1213,13 +1285,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S03.06", "devices":["TRCEB_S03.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S03.10", "devices":["CEH_S03.21","CEV_S03.21"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S03.10", "devices":["CEH_S03.21","CEV_S03.21"]},
{"type": "quadrupole", "position": 860, "name": "QAB_S03.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S03.06", "devices":["CEH_S03.22","CEV_S03.22"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S03.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S03.06", "devices":["CEH_S03.22","CEV_S03.22"]},
{"type": "cavrf", "position": 1819, "name": "CAVRF_S04.01"},
- {"type": "sextupole", "position": 2530, "name": "SF_S04.01", "devices":["CEH_S04.01","CEV_S04.01"]},
+ {"type": "sextupole_CHV", "position": 2530, "name": "SF_S04.01", "devices":["CEH_S04.01","CEV_S04.01"]},
+ {"type": "bpm", "position": 2680, "name": "BPM_S04.01"},
{"type": "quadrupole", "position": 2780, "name": "QAB_S04.01"},
- {"type": "sextupole", "position": 3030, "name": "SD_S04.01", "devices":["CEH_S04.02","CEV_S04.02"]}
+ {"type": "sextupole_CHV", "position": 3030, "name": "SD_S04.01", "devices":["CEH_S04.02","CEV_S04.02"]},
+ {"type": "corrector", "position": 3440, "name": "CFH_S04.01"},
+ {"type": "corrector", "position": 3540, "name": "CFV_S04.01"}
]
},
{
@@ -1227,11 +1303,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S04.01", "devices":["TRCEB_S04.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S04.02", "devices":["CEH_S04.03","CEV_S04.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S04.02", "devices":["CEH_S04.03","CEV_S04.03"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S04.03"},
{"type": "quadrupole", "position": 860, "name": "QAB_S04.02"},
- {"type": "sextupole", "position": 1150, "name": "SF_S04.02", "devices":["CEH_S04.04","CEV_S04.04"]},
+ {"type": "sextupole_CHV", "position": 1150, "name": "SF_S04.02", "devices":["CEH_S04.04","CEV_S04.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S04.03"},
- {"type": "sextupole", "position": 1669, "name": "SD_S04.03", "devices":["CEH_S04.05","CEV_S04.05"]}
+ {"type": "bpm", "position": 1569, "name": "BPM_S04.04"},
+ {"type": "sextupole_CHV", "position": 1669, "name": "SD_S04.03", "devices":["CEH_S04.05","CEV_S04.05"]},
+ {"type": "corrector", "position": 2080, "name": "CFH_S04.02"},
+ {"type": "corrector", "position": 2180, "name": "CFV_S04.02"}
]
},
{
@@ -1239,12 +1319,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S04.02", "devices":["TRCEB_S04.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 661, "name": "SD_S04.04", "devices":["CEH_S04.06","CEV_S04.06"]},
+ {"type": "sextupole_CHV", "position": 661, "name": "SD_S04.04", "devices":["CEH_S04.06","CEV_S04.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S04.04"},
- {"type": "sextupole", "position": 1181, "name": "SF_S04.03", "devices":["CEH_S04.07","CEV_S04.07"]},
- {"type": "octupole", "position": 1421, "name": "OCT_S04.01", "devices":["CEH_S04.08","CEV_S04.08"]},
+ {"type": "sextupole_CHV", "position": 1181, "name": "SF_S04.03", "devices":["CEH_S04.07","CEV_S04.07"]},
+ {"type": "bpm", "position": 1321, "name": "BPM_S04.05"},
+ {"type": "octupole_CHV", "position": 1421, "name": "OCT_S04.01", "devices":["CEH_S04.08","CEV_S04.08"]},
{"type": "quadrupole", "position": 1641, "name": "QF_S04.01"},
- {"type": "sextupole", "position": 1890, "name": "SD_S04.05", "devices":["QS_S04.01","CEV_S04.09"]}
+ {"type": "sextupole_QK", "position": 1890, "name": "SD_S04.05", "devices":["QS_S04.01","CEV_S04.09"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S04.03"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S04.03"}
]
},
{
@@ -1252,17 +1335,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S04.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S04.01", "devices":["OCT_S04.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S04.01", "devices":["CEH_S04.10","CEV_S04.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S04.02", "devices":["QD_S04.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S04.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S04.01", "devices":["CEH_S04.10","CEV_S04.10"]},
{"type": "quadrupole", "position": 1055, "name": "QF_S04.02"},
- {"type": "shutter", "position": 1329, "name": "SH_S04.02", "devices":["QS_S04.02","CEV_S04.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [270, -800, -560],"name": "ID_S04.01"},
+ {"type": "corrector", "position": 4079, "name": "CV_S04.01"},
+ {"type": "bpm", "position": 4179, "name": "BPM_S04.07"},
+ {"type": "undulator", "position": 4279, "name": "ID_S04.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S04.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S04.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S04.03"},
- {"type": "shutter", "position": 7230, "name": "SH_S04.03", "devices":["QS_S04.03","CEV_S04.12"]},
+ {"type": "shutter_QK", "position": 7230, "name": "SH_S04.03", "devices":["QS_S04.03","CEV_S04.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S04.03"},
- {"type": "shutter", "position": 7790, "name": "SH_S04.04", "devices":["CEH_S04.13","CEV_S04.13"]},
- {"type": "quadrupole", "position": 8015, "name": "QD_S04.04", "devices":["OCT_S04.03"]}
+ {"type": "shutter_CHV", "position": 7790, "name": "SH_S04.04", "devices":["CEH_S04.13","CEV_S04.13"]},
+ {"type": "octupole_QD", "position": 8015, "name": "OCT_S04.03", "devices":["QD_S04.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S04.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S04.04"}
]
},
{
@@ -1270,12 +1360,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S04.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 550, "name": "SD_S04.06", "devices":["QS_S04.04","CEV_S04.14"]},
+ {"type": "sextupole_QK", "position": 550, "name": "SD_S04.06", "devices":["QS_S04.04","CEV_S04.14"]},
{"type": "quadrupole", "position": 780, "name": "QF_S04.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S04.04", "devices":["CEH_S04.15","CEV_S04.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S04.04", "devices":["CEH_S04.16","CEV_S04.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S04.04", "devices":["CEH_S04.15","CEV_S04.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S04.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S04.04", "devices":["CEH_S04.16","CEV_S04.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S04.05"},
- {"type": "sextupole", "position": 1761, "name": "SD_S04.07", "devices":["CEH_S04.17","CEV_S04.17"]}
+ {"type": "sextupole_CHV", "position": 1761, "name": "SD_S04.07", "devices":["CEH_S04.17","CEV_S04.17"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S04.05"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S04.05"}
]
},
{
@@ -1283,11 +1376,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S04.05", "devices":["TRCEB_S04.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S04.08", "devices":["CEH_S04.18","CEV_S04.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S04.08", "devices":["CEH_S04.18","CEV_S04.18"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S04.12"},
{"type": "quadrupole", "position": 860, "name": "QAB_S04.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S04.05", "devices":["CEH_S04.19","CEV_S04.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S04.05", "devices":["CEH_S04.19","CEV_S04.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S04.07"},
- {"type": "sextupole", "position": 1671, "name": "SD_S04.09", "devices":["CEH_S04.20","CEV_S04.20"]}
+ {"type": "bpm", "position": 1571, "name": "BPM_S04.13"},
+ {"type": "sextupole_CHV", "position": 1671, "name": "SD_S04.09", "devices":["CEH_S04.20","CEV_S04.20"]},
+ {"type": "corrector", "position": 2080, "name": "CFH_S04.06"},
+ {"type": "corrector", "position": 2180, "name": "CFV_S04.06"}
]
},
{
@@ -1295,12 +1392,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S04.06", "devices":["TRCEB_S04.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S04.10", "devices":["CEH_S04.21","CEV_S04.21"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S04.10", "devices":["CEH_S04.21","CEV_S04.21"]},
{"type": "quadrupole", "position": 861, "name": "QAB_S04.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S04.06", "devices":["CEH_S04.22","CEV_S04.22"]},
- {"type": "sextupole", "position": 2531, "name": "SF_S05.01", "devices":["CEH_S05.01","CEV_S05.01"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S04.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S04.06", "devices":["CEH_S04.22","CEV_S04.22"]},
+ {"type": "undulator", "position": 2431, "name": "SHID_S05.01"},
+ {"type": "sextupole_CHV", "position": 2531, "name": "SF_S05.01", "devices":["CEH_S05.01","CEV_S05.01"]},
+ {"type": "bpm", "position": 2681, "name": "BPM_S05.01"},
{"type": "quadrupole", "position": 2781, "name": "QAB_S05.01"},
- {"type": "sextupole", "position": 3031, "name": "SD_S05.01", "devices":["CEH_S05.02","CEV_S05.02"]}
+ {"type": "sextupole_CHV", "position": 3031, "name": "SD_S05.01", "devices":["CEH_S05.02","CEV_S05.02"]},
+ {"type": "corrector", "position": 3441, "name": "CFH_S05.01"},
+ {"type": "corrector", "position": 3541, "name": "CFV_S05.01"}
]
},
{
@@ -1308,11 +1410,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S05.01", "devices":["TRCEB_S05.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S05.02", "devices":["CEH_S05.03","CEV_S05.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S05.02", "devices":["CEH_S05.03","CEV_S05.03"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S05.03"},
{"type": "quadrupole", "position": 860, "name": "QAB_S05.02"},
- {"type": "sextupole", "position": 1151, "name": "SF_S05.02", "devices":["CEH_S05.04","CEV_S05.04"]},
+ {"type": "sextupole_CHV", "position": 1151, "name": "SF_S05.02", "devices":["CEH_S05.04","CEV_S05.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S05.03"},
- {"type": "sextupole", "position": 1670, "name": "SD_S05.03", "devices":["CEH_S05.05","CEV_S05.05"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S05.04"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S05.03", "devices":["CEH_S05.05","CEV_S05.05"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S05.02"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S05.02"}
]
},
{
@@ -1320,12 +1426,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S05.02", "devices":["TRCEB_S05.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 661, "name": "SD_S05.04", "devices":["CEH_S05.06","CEV_S05.06"]},
+ {"type": "sextupole_CHV", "position": 661, "name": "SD_S05.04", "devices":["CEH_S05.06","CEV_S05.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S05.04"},
- {"type": "sextupole", "position": 1181, "name": "SF_S05.03", "devices":["CEH_S05.07","CEV_S05.07"]},
- {"type": "octupole", "position": 1421, "name": "OCT_S05.01", "devices":["CEH_S05.08","CEV_S05.08"]},
+ {"type": "sextupole_CHV", "position": 1181, "name": "SF_S05.03", "devices":["CEH_S05.07","CEV_S05.07"]},
+ {"type": "bpm", "position": 1321, "name": "BPM_S05.05"},
+ {"type": "octupole_CHV", "position": 1421, "name": "OCT_S05.01", "devices":["CEH_S05.08","CEV_S05.08"]},
{"type": "quadrupole", "position": 1641, "name": "QF_S05.01"},
- {"type": "sextupole", "position": 1891, "name": "SD_S05.05", "devices":["QS_S05.01","CEV_S05.09"]}
+ {"type": "sextupole_QK", "position": 1891, "name": "SD_S05.05", "devices":["QS_S05.01","CEV_S05.09"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S05.03"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S05.03"}
]
},
{
@@ -1333,17 +1442,29 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S05.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S05.01", "devices":["OCT_S05.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S05.01", "devices":["CEH_S05.10","CEV_S05.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S05.02", "devices":["QD_S05.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S05.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S05.01", "devices":["CEH_S05.10","CEV_S05.10"]},
{"type": "quadrupole", "position": 1054, "name": "QF_S05.02"},
- {"type": "shutter", "position": 1330, "name": "SH_S05.02", "devices":["QS_S05.02","CEV_S05.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [270, -800, -560],"name": "ID_S05.01"},
+ {"type": "corrector", "position": 2430, "name": "CV_S05.01"},
+ {"type": "bpm", "position": 2530, "name": "BPM_S05.07"},
+ {"type": "mbf", "position": 2630, "name": "MBFLK_S05.01"},
+ {"type": "undulator", "position": 4280, "name": "ID_S05.01"},
+ {"type": "mbf", "position": 5947, "name": "MBFHK_S05.01"},
+ {"type": "mbf", "position": 6323, "name": "MBFVK_S05.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S05.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S05.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S05.03"},
- {"type": "shutter", "position": 7230, "name": "SH_S05.03", "devices":["QS_S05.03","CEV_S05.12"]},
+ {"type": "shutter_QK", "position": 7230, "name": "SH_S05.03", "devices":["QS_S05.03","CEV_S05.12"]},
+ {"type": "bpm", "position": 7347, "name": "MBFBPM_S05.01"},
{"type": "quadrupole", "position": 7505, "name": "QF_S05.03"},
- {"type": "shutter", "position": 7789, "name": "SH_S05.04", "devices":["CEH_S05.13","CEV_S05.13"]},
- {"type": "quadrupole", "position": 8015, "name": "QD_S05.04", "devices":["OCT_S05.03"]}
+ {"type": "bpm", "position": 7667, "name": "MBFBPM_S05.02"},
+ {"type": "shutter_CHV", "position": 7789, "name": "SH_S05.04", "devices":["CEH_S05.13","CEV_S05.13"]},
+ {"type": "octupole_QD", "position": 8015, "name": "OCT_S05.03", "devices":["QD_S05.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S05.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S05.04"}
]
},
{
@@ -1351,12 +1472,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S05.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 550, "name": "SD_S05.06", "devices":["QS_S05.04","CEV_S05.14"]},
+ {"type": "sextupole_QK", "position": 550, "name": "SD_S05.06", "devices":["QS_S05.04","CEV_S05.14"]},
{"type": "quadrupole", "position": 780, "name": "QF_S05.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S05.04", "devices":["CEH_S05.15","CEV_S05.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S05.04", "devices":["CEH_S05.16","CEV_S05.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S05.04", "devices":["CEH_S05.15","CEV_S05.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S05.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S05.04", "devices":["CEH_S05.16","CEV_S05.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S05.05"},
- {"type": "sextupole", "position": 1760, "name": "SD_S05.07", "devices":["CEH_S05.17","CEV_S05.17"]}
+ {"type": "sextupole_CHV", "position": 1760, "name": "SD_S05.07", "devices":["CEH_S05.17","CEV_S05.17"]},
+ {"type": "corrector", "position": 2220, "name": "CFH_S05.05"},
+ {"type": "corrector", "position": 2320, "name": "CFV_S05.05"}
]
},
{
@@ -1364,11 +1488,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S05.05", "devices":["TRCEB_S05.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S05.08", "devices":["CEH_S05.18","CEV_S05.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S05.08", "devices":["CEH_S05.18","CEV_S05.18"]},
+ {"type": "bpm", "position": 761, "name": "BPM_S05.12"},
{"type": "quadrupole", "position": 861, "name": "QAB_S05.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S05.05", "devices":["CEH_S05.19","CEV_S05.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S05.05", "devices":["CEH_S05.19","CEV_S05.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S05.07"},
- {"type": "sextupole", "position": 1670, "name": "SD_S05.09", "devices":["CEH_S05.20","CEV_S05.20"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S05.13"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S05.09", "devices":["CEH_S05.20","CEV_S05.20"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S05.06"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S05.06"}
]
},
{
@@ -1376,12 +1504,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S05.06", "devices":["TRCEB_S05.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S05.10", "devices":["CEH_S05.21","CEV_S05.21"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S05.10", "devices":["CEH_S05.21","CEV_S05.21"]},
{"type": "quadrupole", "position": 860, "name": "QAB_S05.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S05.06", "devices":["CEH_S05.22","CEV_S05.22"]},
- {"type": "sextupole", "position": 2530, "name": "SF_S06.01", "devices":["CEH_S06.01","CEV_S06.01"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S05.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S05.06", "devices":["CEH_S05.22","CEV_S05.22"]},
+ {"type": "undulator", "position": 2430, "name": "SHID_S06.01"},
+ {"type": "sextupole_CHV", "position": 2530, "name": "SF_S06.01", "devices":["CEH_S06.01","CEV_S06.01"]},
+ {"type": "bpm", "position": 2679, "name": "BPM_S06.01"},
{"type": "quadrupole", "position": 2779, "name": "QAB_S06.01"},
- {"type": "sextupole", "position": 3030, "name": "SD_S06.01", "devices":["CEH_S06.02","CEV_S06.02"]}
+ {"type": "sextupole_CHV", "position": 3030, "name": "SD_S06.01", "devices":["CEH_S06.02","CEV_S06.02"]},
+ {"type": "corrector", "position": 3440, "name": "CFH_S06.01"},
+ {"type": "corrector", "position": 3540, "name": "CFV_S06.01"}
]
},
{
@@ -1389,11 +1522,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S06.01", "devices":["TRCEB_S06.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S06.02", "devices":["CEH_S06.03","CEV_S06.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S06.02", "devices":["CEH_S06.03","CEV_S06.03"]},
+ {"type": "bpm", "position": 761, "name": "BPM_S06.03"},
{"type": "quadrupole", "position": 861, "name": "QAB_S06.02"},
- {"type": "sextupole", "position": 1151, "name": "SF_S06.02", "devices":["CEH_S06.04","CEV_S06.04"]},
+ {"type": "sextupole_CHV", "position": 1151, "name": "SF_S06.02", "devices":["CEH_S06.04","CEV_S06.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S06.03"},
- {"type": "sextupole", "position": 1670, "name": "SD_S06.03", "devices":["CEH_S06.05","CEV_S06.05"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S06.04"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S06.03", "devices":["CEH_S06.05","CEV_S06.05"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S06.02"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S06.02"}
]
},
{
@@ -1401,12 +1538,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S06.02", "devices":["TRCEB_S06.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 660, "name": "SD_S06.04", "devices":["CEH_S06.06","CEV_S06.06"]},
+ {"type": "sextupole_CHV", "position": 660, "name": "SD_S06.04", "devices":["CEH_S06.06","CEV_S06.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S06.04"},
- {"type": "sextupole", "position": 1180, "name": "SF_S06.03", "devices":["CEH_S06.07","CEV_S06.07"]},
- {"type": "octupole", "position": 1420, "name": "OCT_S06.01", "devices":["CEH_S06.08","CEV_S06.08"]},
+ {"type": "sextupole_CHV", "position": 1180, "name": "SF_S06.03", "devices":["CEH_S06.07","CEV_S06.07"]},
+ {"type": "bpm", "position": 1320, "name": "BPM_S06.05"},
+ {"type": "octupole_CHV", "position": 1420, "name": "OCT_S06.01", "devices":["CEH_S06.08","CEV_S06.08"]},
{"type": "quadrupole", "position": 1640, "name": "QF_S06.01"},
- {"type": "sextupole", "position": 1890, "name": "SD_S06.05", "devices":["QS_S06.01","CEV_S06.09"]}
+ {"type": "sextupole_QK", "position": 1890, "name": "SD_S06.05", "devices":["QS_S06.01","CEV_S06.09"]},
+ {"type": "corrector", "position": 2220, "name": "CFH_S06.03"},
+ {"type": "corrector", "position": 2320, "name": "CFV_S06.03"}
]
},
{
@@ -1414,17 +1554,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S06.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S06.01", "devices":["OCT_S06.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S06.01", "devices":["CEH_S06.10","CEV_S06.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S06.02", "devices":["QD_S06.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S06.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S06.01", "devices":["CEH_S06.10","CEV_S06.10"]},
{"type": "quadrupole", "position": 1055, "name": "QF_S06.02"},
- {"type": "shutter", "position": 1331, "name": "SH_S06.02", "devices":["QS_S06.02","CEV_S06.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [270, -800, -560],"name": "ID_S06.01"},
+ {"type": "corrector", "position": 4081, "name": "CV_S06.01"},
+ {"type": "bpm", "position": 4181, "name": "BPM_S06.07"},
+ {"type": "undulator", "position": 4281, "name": "ID_S06.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S06.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S06.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S06.03"},
- {"type": "shutter", "position": 7231, "name": "SH_S06.03", "devices":["QS_S06.03","CEV_S06.12"]},
+ {"type": "shutter_QK", "position": 7231, "name": "SH_S06.03", "devices":["QS_S06.03","CEV_S06.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S06.03"},
- {"type": "shutter", "position": 7790, "name": "SH_S06.04", "devices":["CEH_S06.13","CEV_S06.13"]},
- {"type": "quadrupole", "position": 8016, "name": "QD_S06.04", "devices":["OCT_S06.03"]}
+ {"type": "shutter_CHV", "position": 7790, "name": "SH_S06.04", "devices":["CEH_S06.13","CEV_S06.13"]},
+ {"type": "octupole_QD", "position": 8016, "name": "OCT_S06.03", "devices":["QD_S06.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S06.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S06.04"}
]
},
{
@@ -1432,12 +1579,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S06.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 551, "name": "SD_S06.06", "devices":["QS_S06.04","CEV_S06.14"]},
+ {"type": "sextupole_QK", "position": 551, "name": "SD_S06.06", "devices":["QS_S06.04","CEV_S06.14"]},
{"type": "quadrupole", "position": 781, "name": "QF_S06.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S06.04", "devices":["CEH_S06.15","CEV_S06.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S06.04", "devices":["CEH_S06.16","CEV_S06.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S06.04", "devices":["CEH_S06.15","CEV_S06.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S06.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S06.04", "devices":["CEH_S06.16","CEV_S06.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S06.05"},
- {"type": "sextupole", "position": 1760, "name": "SD_S06.07", "devices":["CEH_S06.17","CEV_S06.17"]}
+ {"type": "sextupole_CHV", "position": 1760, "name": "SD_S06.07", "devices":["CEH_S06.17","CEV_S06.17"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S06.05"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S06.05"}
]
},
{
@@ -1445,11 +1595,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S06.05", "devices":["TRCEB_S06.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S06.08", "devices":["CEH_S06.18","CEV_S06.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S06.08", "devices":["CEH_S06.18","CEV_S06.18"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S06.12"},
{"type": "quadrupole", "position": 860, "name": "QAB_S06.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S06.05", "devices":["CEH_S06.19","CEV_S06.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S06.05", "devices":["CEH_S06.19","CEV_S06.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S06.07"},
- {"type": "sextupole", "position": 1670, "name": "SD_S06.09", "devices":["CEH_S06.20","CEV_S06.20"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S06.13"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S06.09", "devices":["CEH_S06.20","CEV_S06.20"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S06.06"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S06.06"}
]
},
{
@@ -1457,12 +1611,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S06.06", "devices":["TRCEB_S06.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S06.10", "devices":["CEH_S06.21","CEV_S06.21"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S06.10", "devices":["CEH_S06.21","CEV_S06.21"]},
{"type": "quadrupole", "position": 860, "name": "QAB_S06.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S06.06", "devices":["CEH_S06.22","CEV_S06.22"]},
- {"type": "sextupole", "position": 2530, "name": "SF_S07.01", "devices":["CEH_S07.01","CEV_S07.01"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S06.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S06.06", "devices":["CEH_S06.22","CEV_S06.22"]},
+ {"type": "undulator", "position": 2430, "name": "SHID_S07.01"},
+ {"type": "sextupole_CHV", "position": 2530, "name": "SF_S07.01", "devices":["CEH_S07.01","CEV_S07.01"]},
+ {"type": "bpm", "position": 2680, "name": "BPM_S07.01"},
{"type": "quadrupole", "position": 2780, "name": "QAB_S07.01"},
- {"type": "sextupole", "position": 3030, "name": "SD_S07.01", "devices":["CEH_S07.02","CEV_S07.02"]}
+ {"type": "sextupole_CHV", "position": 3030, "name": "SD_S07.01", "devices":["CEH_S07.02","CEV_S07.02"]},
+ {"type": "corrector", "position": 3440, "name": "CFH_S07.01"},
+ {"type": "corrector", "position": 3540, "name": "CFV_S07.01"}
]
},
{
@@ -1470,11 +1629,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S07.01", "devices":["TRCEB_S07.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S07.02", "devices":["CEH_S07.03","CEV_S07.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S07.02", "devices":["CEH_S07.03","CEV_S07.03"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S07.03"},
{"type": "quadrupole", "position": 860, "name": "QAB_S07.02"},
- {"type": "sextupole", "position": 1150, "name": "SF_S07.02", "devices":["CEH_S07.04","CEV_S07.04"]},
+ {"type": "sextupole_CHV", "position": 1150, "name": "SF_S07.02", "devices":["CEH_S07.04","CEV_S07.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S07.03"},
- {"type": "sextupole", "position": 1669, "name": "SD_S07.03", "devices":["CEH_S07.05","CEV_S07.05"]}
+ {"type": "bpm", "position": 1569, "name": "BPM_S07.04"},
+ {"type": "sextupole_CHV", "position": 1669, "name": "SD_S07.03", "devices":["CEH_S07.05","CEV_S07.05"]},
+ {"type": "corrector", "position": 2080, "name": "CFH_S07.02"},
+ {"type": "corrector", "position": 2180, "name": "CFV_S07.02"}
]
},
{
@@ -1482,12 +1645,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S07.02", "devices":["TRCEB_S07.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 661, "name": "SD_S07.04", "devices":["CEH_S07.06","CEV_S07.06"]},
+ {"type": "sextupole_CHV", "position": 661, "name": "SD_S07.04", "devices":["CEH_S07.06","CEV_S07.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S07.04"},
- {"type": "sextupole", "position": 1181, "name": "SF_S07.03", "devices":["CEH_S07.07","CEV_S07.07"]},
- {"type": "octupole", "position": 1421, "name": "OCT_S07.01", "devices":["CEH_S07.08","CEV_S07.08"]},
+ {"type": "sextupole_CHV", "position": 1181, "name": "SF_S07.03", "devices":["CEH_S07.07","CEV_S07.07"]},
+ {"type": "bpm", "position": 1321, "name": "BPM_S07.05"},
+ {"type": "octupole_CHV", "position": 1421, "name": "OCT_S07.01", "devices":["CEH_S07.08","CEV_S07.08"]},
{"type": "quadrupole", "position": 1641, "name": "QF_S07.01"},
- {"type": "sextupole", "position": 1890, "name": "SD_S07.05", "devices":["QS_S07.01","CEV_S07.09"]}
+ {"type": "sextupole_QK", "position": 1890, "name": "SD_S07.05", "devices":["QS_S07.01","CEV_S07.09"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S07.03"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S07.03"}
]
},
{
@@ -1495,17 +1661,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S07.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S07.01", "devices":["OCT_S07.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S07.01", "devices":["CEH_S07.10","CEV_S07.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S07.02", "devices":["QD_S07.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S07.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S07.01", "devices":["CEH_S07.10","CEV_S07.10"]},
{"type": "quadrupole", "position": 1055, "name": "QF_S07.02"},
- {"type": "shutter", "position": 1329, "name": "SH_S07.02", "devices":["QS_S07.02","CEV_S07.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [270, -800, -560],"name": "ID_S07.01"},
+ {"type": "corrector", "position": 4079, "name": "CV_S07.01"},
+ {"type": "bpm", "position": 4179, "name": "BPM_S07.07"},
+ {"type": "undulator", "position": 4279, "name": "ID_S07.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S07.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S07.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S07.03"},
- {"type": "shutter", "position": 7230, "name": "SH_S07.03", "devices":["QS_S07.03","CEV_S07.12"]},
+ {"type": "shutter_QK", "position": 7230, "name": "SH_S07.03", "devices":["QS_S07.03","CEV_S07.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S07.03"},
- {"type": "shutter", "position": 7790, "name": "SH_S07.04", "devices":["CEH_S07.13","CEV_S07.13"]},
- {"type": "quadrupole", "position": 8015, "name": "QD_S07.04", "devices":["OCT_S07.03"]}
+ {"type": "shutter_CHV", "position": 7790, "name": "SH_S07.04", "devices":["CEH_S07.13","CEV_S07.13"]},
+ {"type": "octupole_QD", "position": 8015, "name": "OCT_S07.03", "devices":["QD_S07.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S07.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S07.04"}
]
},
{
@@ -1513,12 +1686,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S07.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 550, "name": "SD_S07.06", "devices":["QS_S07.04","CEV_S07.14"]},
+ {"type": "sextupole_QK", "position": 550, "name": "SD_S07.06", "devices":["QS_S07.04","CEV_S07.14"]},
{"type": "quadrupole", "position": 780, "name": "QF_S07.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S07.04", "devices":["CEH_S07.15","CEV_S07.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S07.04", "devices":["CEH_S07.16","CEV_S07.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S07.04", "devices":["CEH_S07.15","CEV_S07.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S07.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S07.04", "devices":["CEH_S07.16","CEV_S07.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S07.05"},
- {"type": "sextupole", "position": 1761, "name": "SD_S07.07", "devices":["CEH_S07.17","CEV_S07.17"]}
+ {"type": "sextupole_CHV", "position": 1761, "name": "SD_S07.07", "devices":["CEH_S07.17","CEV_S07.17"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S07.05"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S07.05"}
]
},
{
@@ -1526,11 +1702,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S07.05", "devices":["TRCEB_S07.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S07.08", "devices":["CEH_S07.18","CEV_S07.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S07.08", "devices":["CEH_S07.18","CEV_S07.18"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S07.12"},
{"type": "quadrupole", "position": 860, "name": "QAB_S07.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S07.05", "devices":["CEH_S07.19","CEV_S07.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S07.05", "devices":["CEH_S07.19","CEV_S07.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S07.07"},
- {"type": "sextupole", "position": 1671, "name": "SD_S07.09", "devices":["CEH_S07.20","CEV_S07.20"]}
+ {"type": "bpm", "position": 1571, "name": "BPM_S07.13"},
+ {"type": "sextupole_CHV", "position": 1671, "name": "SD_S07.09", "devices":["CEH_S07.20","CEV_S07.20"]},
+ {"type": "corrector", "position": 2080, "name": "CFH_S07.06"},
+ {"type": "corrector", "position": 2180, "name": "CFV_S07.06"}
]
},
{
@@ -1538,12 +1718,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S07.06", "devices":["TRCEB_S07.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S07.10", "devices":["CEH_S07.21","CEV_S07.21"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S07.10", "devices":["CEH_S07.21","CEV_S07.21"]},
{"type": "quadrupole", "position": 861, "name": "QAB_S07.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S07.06", "devices":["CEH_S07.22","CEV_S07.22"]},
- {"type": "sextupole", "position": 2531, "name": "SF_S08.01", "devices":["CEH_S08.01","CEV_S08.01"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S07.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S07.06", "devices":["CEH_S07.22","CEV_S07.22"]},
+ {"type": "dcct", "position": 2331, "name": "DCCT_S08.01"},
+ {"type": "bpm", "position": 2431, "name": "DBPM_S08.01"},
+ {"type": "sextupole_CHV", "position": 2531, "name": "SF_S08.01", "devices":["CEH_S08.01","CEV_S08.01"]},
+ {"type": "bpm", "position": 2681, "name": "BPM_S08.01"},
{"type": "quadrupole", "position": 2781, "name": "QAB_S08.01"},
- {"type": "sextupole", "position": 3031, "name": "SD_S08.01", "devices":["CEH_S08.02","CEV_S08.02"]}
+ {"type": "sextupole_CHV", "position": 3031, "name": "SD_S08.01", "devices":["CEH_S08.02","CEV_S08.02"]},
+ {"type": "bpm", "position": 3541, "name": "BPM_S08.02"}
]
},
{
@@ -1551,11 +1736,13 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S08.01"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S08.02", "devices":["CEH_S08.03","CEV_S08.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S08.02", "devices":["CEH_S08.03","CEV_S08.03"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S08.03"},
{"type": "quadrupole", "position": 860, "name": "QAB_S08.02"},
- {"type": "sextupole", "position": 1151, "name": "SF_S08.02", "devices":["CEH_S08.04","CEV_S08.04"]},
+ {"type": "sextupole_CHV", "position": 1151, "name": "SF_S08.02", "devices":["CEH_S08.04","CEV_S08.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S08.03"},
- {"type": "sextupole", "position": 1670, "name": "SD_S08.03", "devices":["CEH_S08.05","CEV_S08.05"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S08.04"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S08.03", "devices":["CEH_S08.05","CEV_S08.05"]}
]
},
{
@@ -1563,12 +1750,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S08.02", "devices":["TRCEB_S08.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 661, "name": "SD_S08.04", "devices":["CEH_S08.06","CEV_S08.06"]},
+ {"type": "sextupole_CHV", "position": 661, "name": "SD_S08.04", "devices":["CEH_S08.06","CEV_S08.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S08.04"},
- {"type": "sextupole", "position": 1181, "name": "SF_S08.03", "devices":["CEH_S08.07","CEV_S08.07"]},
- {"type": "octupole", "position": 1421, "name": "OCT_S08.01", "devices":["CEH_S08.08","CEV_S08.08"]},
+ {"type": "sextupole_CHV", "position": 1181, "name": "SF_S08.03", "devices":["CEH_S08.07","CEV_S08.07"]},
+ {"type": "bpm", "position": 1321, "name": "BPM_S08.05"},
+ {"type": "octupole_CHV", "position": 1421, "name": "OCT_S08.01", "devices":["CEH_S08.08","CEV_S08.08"]},
{"type": "quadrupole", "position": 1641, "name": "QF_S08.01"},
- {"type": "sextupole", "position": 1891, "name": "SD_S08.05", "devices":["QS_S08.01","CEV_S08.09"]}
+ {"type": "sextupole_QK", "position": 1891, "name": "SD_S08.05", "devices":["QS_S08.01","CEV_S08.09"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S08.03"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S08.03"}
]
},
{
@@ -1576,17 +1766,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S08.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S08.01", "devices":["OCT_S08.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S08.01", "devices":["CEH_S08.10","CEV_S08.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S08.02", "devices":["QD_S08.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S08.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S08.01", "devices":["CEH_S08.10","CEV_S08.10"]},
{"type": "quadrupole", "position": 1054, "name": "QF_S08.02"},
- {"type": "shutter", "position": 1330, "name": "SH_S08.02", "devices":["QS_S08.02","CEV_S08.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [270, -800, -560],"name": "ID_S08.01"},
+ {"type": "corrector", "position": 4080, "name": "CV_S08.01"},
+ {"type": "bpm", "position": 4180, "name": "BPM_S08.07"},
+ {"type": "undulator", "position": 4280, "name": "ID_S08.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S08.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S08.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S08.03"},
- {"type": "shutter", "position": 7230, "name": "SH_S08.03", "devices":["QS_S08.03","CEV_S08.12"]},
+ {"type": "shutter_QK", "position": 7230, "name": "SH_S08.03", "devices":["QS_S08.03","CEV_S08.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S08.03"},
- {"type": "shutter", "position": 7789, "name": "SH_S08.04", "devices":["CEH_S08.13","CEV_S08.13"]},
- {"type": "quadrupole", "position": 8015, "name": "QD_S08.04", "devices":["OCT_S08.03"]}
+ {"type": "shutter_CHV", "position": 7789, "name": "SH_S08.04", "devices":["CEH_S08.13","CEV_S08.13"]},
+ {"type": "octupole_QD", "position": 8015, "name": "OCT_S08.03", "devices":["QD_S08.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S08.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S08.04"}
]
},
{
@@ -1594,12 +1791,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S08.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 550, "name": "SD_S08.06", "devices":["QS_S08.04","CEV_S08.14"]},
+ {"type": "sextupole_QK", "position": 550, "name": "SD_S08.06", "devices":["QS_S08.04","CEV_S08.14"]},
{"type": "quadrupole", "position": 780, "name": "QF_S08.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S08.04", "devices":["CEH_S08.15","CEV_S08.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S08.04", "devices":["CEH_S08.16","CEV_S08.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S08.04", "devices":["CEH_S08.15","CEV_S08.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S08.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S08.04", "devices":["CEH_S08.16","CEV_S08.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S08.05"},
- {"type": "sextupole", "position": 1760, "name": "SD_S08.07", "devices":["CEH_S08.17","CEV_S08.17"]}
+ {"type": "sextupole_CHV", "position": 1760, "name": "SD_S08.07", "devices":["CEH_S08.17","CEV_S08.17"]},
+ {"type": "corrector", "position": 2220, "name": "CFH_S08.05"},
+ {"type": "corrector", "position": 2320, "name": "CFV_S08.05"}
]
},
{
@@ -1607,11 +1807,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S08.05", "devices":["TRCEB_S08.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S08.08", "devices":["CEH_S08.18","CEV_S08.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S08.08", "devices":["CEH_S08.18","CEV_S08.18"]},
+ {"type": "bpm", "position": 761, "name": "BPM_S08.12"},
{"type": "quadrupole", "position": 861, "name": "QAB_S08.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S08.05", "devices":["CEH_S08.19","CEV_S08.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S08.05", "devices":["CEH_S08.19","CEV_S08.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S08.07"},
- {"type": "sextupole", "position": 1670, "name": "SD_S08.09", "devices":["CEH_S08.20","CEV_S08.20"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S08.13"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S08.09", "devices":["CEH_S08.20","CEV_S08.20"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S08.06"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S08.06"}
]
},
{
@@ -1619,13 +1823,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S08.06", "devices":["TRCEB_S08.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S08.10", "devices":["CEH_S08.21","CEV_S08.21"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S08.10", "devices":["CEH_S08.21","CEV_S08.21"]},
{"type": "quadrupole", "position": 860, "name": "QAB_S08.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S08.06", "devices":["CEH_S08.22","CEV_S08.22"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S08.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S08.06", "devices":["CEH_S08.22","CEV_S08.22"]},
{"type": "cavrf", "position": 1820, "name": "CAVRF_S09.01"},
- {"type": "sextupole", "position": 2530, "name": "SF_S09.01", "devices":["CEH_S09.01","CEV_S09.01"]},
+ {"type": "sextupole_CHV", "position": 2530, "name": "SF_S09.01", "devices":["CEH_S09.01","CEV_S09.01"]},
+ {"type": "bpm", "position": 2679, "name": "BPM_S09.01"},
{"type": "quadrupole", "position": 2779, "name": "QAB_S09.01"},
- {"type": "sextupole", "position": 3030, "name": "SD_S09.01", "devices":["CEH_S09.02","CEV_S09.02"]}
+ {"type": "sextupole_CHV", "position": 3030, "name": "SD_S09.01", "devices":["CEH_S09.02","CEV_S09.02"]},
+ {"type": "corrector", "position": 3440, "name": "CFH_S09.01"},
+ {"type": "corrector", "position": 3540, "name": "CFV_S09.01"}
]
},
{
@@ -1633,11 +1841,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S09.01", "devices":["TRCEB_S09.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S09.02", "devices":["CEH_S09.03","CEV_S09.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S09.02", "devices":["CEH_S09.03","CEV_S09.03"]},
+ {"type": "bpm", "position": 761, "name": "BPM_S09.03"},
{"type": "quadrupole", "position": 861, "name": "QAB_S09.02"},
- {"type": "sextupole", "position": 1151, "name": "SF_S09.02", "devices":["CEH_S09.04","CEV_S09.04"]},
+ {"type": "sextupole_CHV", "position": 1151, "name": "SF_S09.02", "devices":["CEH_S09.04","CEV_S09.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S09.03"},
- {"type": "sextupole", "position": 1670, "name": "SD_S09.03", "devices":["CEH_S09.05","CEV_S09.05"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S09.04"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S09.03", "devices":["CEH_S09.05","CEV_S09.05"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S09.02"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S09.02"}
]
},
{
@@ -1645,12 +1857,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S09.02", "devices":["TRCEB_S09.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 660, "name": "SD_S09.04", "devices":["CEH_S09.06","CEV_S09.06"]},
+ {"type": "sextupole_CHV", "position": 660, "name": "SD_S09.04", "devices":["CEH_S09.06","CEV_S09.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S09.04"},
- {"type": "sextupole", "position": 1180, "name": "SF_S09.03", "devices":["CEH_S09.07","CEV_S09.07"]},
- {"type": "octupole", "position": 1420, "name": "OCT_S09.01", "devices":["CEH_S09.08","CEV_S09.08"]},
+ {"type": "sextupole_CHV", "position": 1180, "name": "SF_S09.03", "devices":["CEH_S09.07","CEV_S09.07"]},
+ {"type": "bpm", "position": 1320, "name": "BPM_S09.05"},
+ {"type": "octupole_CHV", "position": 1420, "name": "OCT_S09.01", "devices":["CEH_S09.08","CEV_S09.08"]},
{"type": "quadrupole", "position": 1640, "name": "QF_S09.01"},
- {"type": "sextupole", "position": 1890, "name": "SD_S09.05", "devices":["QS_S09.01","CEV_S09.09"]}
+ {"type": "sextupole_QK", "position": 1890, "name": "SD_S09.05", "devices":["QS_S09.01","CEV_S09.09"]},
+ {"type": "corrector", "position": 2220, "name": "CFH_S09.03"},
+ {"type": "corrector", "position": 2320, "name": "CFV_S09.03"}
]
},
{
@@ -1658,17 +1873,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S09.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S09.01", "devices":["OCT_S09.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S09.01", "devices":["CEH_S09.10","CEV_S09.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S09.02", "devices":["QD_S09.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S09.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S09.01", "devices":["CEH_S09.10","CEV_S09.10"]},
{"type": "quadrupole", "position": 1055, "name": "QF_S09.02"},
- {"type": "shutter", "position": 1331, "name": "SH_S09.02", "devices":["QS_S09.02","CEV_S09.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [270, -800, -560],"name": "ID_S09.01"},
+ {"type": "corrector", "position": 4081, "name": "CV_S09.01"},
+ {"type": "bpm", "position": 4181, "name": "BPM_S09.07"},
+ {"type": "undulator", "position": 4281, "name": "ID_S09.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S09.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S09.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S09.03"},
- {"type": "shutter", "position": 7231, "name": "SH_S09.03", "devices":["QS_S09.03","CEV_S09.12"]},
+ {"type": "shutter_QK", "position": 7231, "name": "SH_S09.03", "devices":["QS_S09.03","CEV_S09.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S09.03"},
- {"type": "shutter", "position": 7790, "name": "SH_S09.04", "devices":["CEH_S09.13","CEV_S09.13"]},
- {"type": "quadrupole", "position": 8016, "name": "QD_S09.04", "devices":["OCT_S09.03"]}
+ {"type": "shutter_CHV", "position": 7790, "name": "SH_S09.04", "devices":["CEH_S09.13","CEV_S09.13"]},
+ {"type": "octupole_QD", "position": 8016, "name": "OCT_S09.03", "devices":["QD_S09.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S09.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S09.04"}
]
},
{
@@ -1676,12 +1898,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S09.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 551, "name": "SD_S09.06", "devices":["QS_S09.04","CEV_S09.14"]},
+ {"type": "sextupole_QK", "position": 551, "name": "SD_S09.06", "devices":["QS_S09.04","CEV_S09.14"]},
{"type": "quadrupole", "position": 781, "name": "QF_S09.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S09.04", "devices":["CEH_S09.15","CEV_S09.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S09.04", "devices":["CEH_S09.16","CEV_S09.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S09.04", "devices":["CEH_S09.15","CEV_S09.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S09.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S09.04", "devices":["CEH_S09.16","CEV_S09.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S09.05"},
- {"type": "sextupole", "position": 1760, "name": "SD_S09.07", "devices":["CEH_S09.17","CEV_S09.17"]}
+ {"type": "sextupole_CHV", "position": 1760, "name": "SD_S09.07", "devices":["CEH_S09.17","CEV_S09.17"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S09.05"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S09.05"}
]
},
{
@@ -1689,11 +1914,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S09.05", "devices":["TRCEB_S09.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S09.08", "devices":["CEH_S09.18","CEV_S09.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S09.08", "devices":["CEH_S09.18","CEV_S09.18"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S09.12"},
{"type": "quadrupole", "position": 860, "name": "QAB_S09.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S09.05", "devices":["CEH_S09.19","CEV_S09.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S09.05", "devices":["CEH_S09.19","CEV_S09.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S09.07"},
- {"type": "sextupole", "position": 1670, "name": "SD_S09.09", "devices":["CEH_S09.20","CEV_S09.20"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S09.13"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S09.09", "devices":["CEH_S09.20","CEV_S09.20"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S09.06"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S09.06"}
]
},
{
@@ -1701,13 +1930,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S09.06", "devices":["TRCEB_S09.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S09.10", "devices":["CEH_S09.21","CEV_S09.21"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S09.10", "devices":["CEH_S09.21","CEV_S09.21"]},
{"type": "quadrupole", "position": 860, "name": "QAB_S09.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S09.06", "devices":["CEH_S09.22","CEV_S09.22"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S09.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S09.06", "devices":["CEH_S09.22","CEV_S09.22"]},
{"type": "cavrf", "position": 1819, "name": "CAVRF_S10.01"},
- {"type": "sextupole", "position": 2530, "name": "SF_S10.01", "devices":["CEH_S10.01","CEV_S10.01"]},
+ {"type": "sextupole_CHV", "position": 2530, "name": "SF_S10.01", "devices":["CEH_S10.01","CEV_S10.01"]},
+ {"type": "bpm", "position": 2680, "name": "BPM_S10.01"},
{"type": "quadrupole", "position": 2780, "name": "QAB_S10.01"},
- {"type": "sextupole", "position": 3030, "name": "SD_S10.01", "devices":["CEH_S10.02","CEV_S10.02"]}
+ {"type": "sextupole_CHV", "position": 3030, "name": "SD_S10.01", "devices":["CEH_S10.02","CEV_S10.02"]},
+ {"type": "corrector", "position": 3440, "name": "CFH_S10.01"},
+ {"type": "corrector", "position": 3540, "name": "CFV_S10.01"}
]
},
{
@@ -1715,11 +1948,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S10.01", "devices":["TRCEB_S10.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S10.02", "devices":["CEH_S10.03","CEV_S10.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S10.02", "devices":["CEH_S10.03","CEV_S10.03"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S10.03"},
{"type": "quadrupole", "position": 860, "name": "QAB_S10.02"},
- {"type": "sextupole", "position": 1150, "name": "SF_S10.02", "devices":["CEH_S10.04","CEV_S10.04"]},
+ {"type": "sextupole_CHV", "position": 1150, "name": "SF_S10.02", "devices":["CEH_S10.04","CEV_S10.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S10.03"},
- {"type": "sextupole", "position": 1669, "name": "SD_S10.03", "devices":["CEH_S10.05","CEV_S10.05"]}
+ {"type": "bpm", "position": 1569, "name": "BPM_S10.04"},
+ {"type": "sextupole_CHV", "position": 1669, "name": "SD_S10.03", "devices":["CEH_S10.05","CEV_S10.05"]},
+ {"type": "corrector", "position": 2080, "name": "CFH_S10.02"},
+ {"type": "corrector", "position": 2180, "name": "CFV_S10.02"}
]
},
{
@@ -1727,12 +1964,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S10.02", "devices":["TRCEB_S10.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 661, "name": "SD_S10.04", "devices":["CEH_S10.06","CEV_S10.06"]},
+ {"type": "sextupole_CHV", "position": 661, "name": "SD_S10.04", "devices":["CEH_S10.06","CEV_S10.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S10.04"},
- {"type": "sextupole", "position": 1181, "name": "SF_S10.03", "devices":["CEH_S10.07","CEV_S10.07"]},
- {"type": "octupole", "position": 1421, "name": "OCT_S10.01", "devices":["CEH_S10.08","CEV_S10.08"]},
+ {"type": "sextupole_CHV", "position": 1181, "name": "SF_S10.03", "devices":["CEH_S10.07","CEV_S10.07"]},
+ {"type": "bpm", "position": 1321, "name": "BPM_S10.05"},
+ {"type": "octupole_CHV", "position": 1421, "name": "OCT_S10.01", "devices":["CEH_S10.08","CEV_S10.08"]},
{"type": "quadrupole", "position": 1641, "name": "QF_S10.01"},
- {"type": "sextupole", "position": 1890, "name": "SD_S10.05", "devices":["QS_S10.01","CEV_S10.09"]}
+ {"type": "sextupole_QK", "position": 1890, "name": "SD_S10.05", "devices":["QS_S10.01","CEV_S10.09"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S10.03"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S10.03"}
]
},
{
@@ -1740,17 +1980,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S10.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S10.01", "devices":["OCT_S10.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S10.01", "devices":["CEH_S10.10","CEV_S10.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S10.02", "devices":["QD_S10.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S10.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S10.01", "devices":["CEH_S10.10","CEV_S10.10"]},
{"type": "quadrupole", "position": 1055, "name": "QF_S10.02"},
- {"type": "shutter", "position": 1329, "name": "SH_S10.02", "devices":["QS_S10.02","CEV_S10.11"]},
+ {"type": "shutter_QK", "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, "labelReverse": [90, 1800, 560],"name": "ID_S10.01"},
+ {"type": "corrector", "position": 4079, "name": "CV_S10.01"},
+ {"type": "bpm", "position": 4179, "name": "BPM_S10.07"},
+ {"type": "undulator", "position": 4279, "name": "ID_S10.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S10.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S10.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S10.03"},
- {"type": "shutter", "position": 7230, "name": "SH_S10.03", "devices":["QS_S10.03","CEV_S10.12"]},
+ {"type": "shutter_QK", "position": 7230, "name": "SH_S10.03", "devices":["QS_S10.03","CEV_S10.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S10.03"},
- {"type": "shutter", "position": 7790, "name": "SH_S10.04", "devices":["CEH_S10.13","CEV_S10.13"]},
- {"type": "quadrupole", "position": 8015, "name": "QD_S10.04", "devices":["OCT_S10.03"]}
+ {"type": "shutter_CHV", "position": 7790, "name": "SH_S10.04", "devices":["CEH_S10.13","CEV_S10.13"]},
+ {"type": "octupole_QD", "position": 8015, "name": "OCT_S10.03", "devices":["QD_S10.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S10.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S10.04"}
]
},
{
@@ -1758,12 +2005,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S10.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 550, "name": "SD_S10.06", "devices":["QS_S10.04","CEV_S10.14"]},
+ {"type": "sextupole_QK", "position": 550, "name": "SD_S10.06", "devices":["QS_S10.04","CEV_S10.14"]},
{"type": "quadrupole", "position": 780, "name": "QF_S10.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S10.04", "devices":["CEH_S10.15","CEV_S10.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S10.04", "devices":["CEH_S10.16","CEV_S10.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S10.04", "devices":["CEH_S10.15","CEV_S10.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S10.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S10.04", "devices":["CEH_S10.16","CEV_S10.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S10.05"},
- {"type": "sextupole", "position": 1761, "name": "SD_S10.07", "devices":["CEH_S10.17","CEV_S10.17"]}
+ {"type": "sextupole_CHV", "position": 1761, "name": "SD_S10.07", "devices":["CEH_S10.17","CEV_S10.17"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S10.05"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S10.05"}
]
},
{
@@ -1771,11 +2021,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S10.05", "devices":["TRCEB_S10.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S10.08", "devices":["CEH_S10.18","CEV_S10.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S10.08", "devices":["CEH_S10.18","CEV_S10.18"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S10.12"},
{"type": "quadrupole", "position": 860, "name": "QAB_S10.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S10.05", "devices":["CEH_S10.19","CEV_S10.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S10.05", "devices":["CEH_S10.19","CEV_S10.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S10.07"},
- {"type": "sextupole", "position": 1671, "name": "SD_S10.09", "devices":["CEH_S10.20","CEV_S10.20"]}
+ {"type": "bpm", "position": 1571, "name": "BPM_S10.13"},
+ {"type": "sextupole_CHV", "position": 1671, "name": "SD_S10.09", "devices":["CEH_S10.20","CEV_S10.20"]},
+ {"type": "corrector", "position": 2080, "name": "CFH_S10.06"},
+ {"type": "corrector", "position": 2180, "name": "CFV_S10.06"}
]
},
{
@@ -1783,12 +2037,17 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S10.06", "devices":["TRCEB_S10.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S10.10", "devices":["CEH_S10.21","CEV_S10.21"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S10.10", "devices":["CEH_S10.21","CEV_S10.21"]},
{"type": "quadrupole", "position": 861, "name": "QAB_S10.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S10.06", "devices":["CEH_S10.22","CEV_S10.22"]},
- {"type": "sextupole", "position": 2531, "name": "SF_S11.01", "devices":["CEH_S11.01","CEV_S11.01"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S10.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S10.06", "devices":["CEH_S10.22","CEV_S10.22"]},
+ {"type": "undulator", "position": 2431, "name": "SHID_S11.01"},
+ {"type": "sextupole_CHV", "position": 2531, "name": "SF_S11.01", "devices":["CEH_S11.01","CEV_S11.01"]},
+ {"type": "bpm", "position": 2681, "name": "BPM_S11.01"},
{"type": "quadrupole", "position": 2781, "name": "QAB_S11.01"},
- {"type": "sextupole", "position": 3031, "name": "SD_S11.01", "devices":["CEH_S11.02","CEV_S11.02"]}
+ {"type": "sextupole_CHV", "position": 3031, "name": "SD_S11.01", "devices":["CEH_S11.02","CEV_S11.02"]},
+ {"type": "corrector", "position": 3441, "name": "CFH_S11.01"},
+ {"type": "corrector", "position": 3541, "name": "CFV_S11.01"}
]
},
{
@@ -1796,11 +2055,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S11.01", "devices":["TRCEB_S11.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S11.02", "devices":["CEH_S11.03","CEV_S11.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S11.02", "devices":["CEH_S11.03","CEV_S11.03"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S11.03"},
{"type": "quadrupole", "position": 860, "name": "QAB_S11.02"},
- {"type": "sextupole", "position": 1151, "name": "SF_S11.02", "devices":["CEH_S11.04","CEV_S11.04"]},
+ {"type": "sextupole_CHV", "position": 1151, "name": "SF_S11.02", "devices":["CEH_S11.04","CEV_S11.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S11.03"},
- {"type": "sextupole", "position": 1670, "name": "SD_S11.03", "devices":["CEH_S11.05","CEV_S11.05"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S11.04"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S11.03", "devices":["CEH_S11.05","CEV_S11.05"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S11.02"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S11.02"}
]
},
{
@@ -1808,12 +2071,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S11.02", "devices":["TRCEB_S11.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 661, "name": "SD_S11.04", "devices":["CEH_S11.06","CEV_S11.06"]},
+ {"type": "sextupole_CHV", "position": 661, "name": "SD_S11.04", "devices":["CEH_S11.06","CEV_S11.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S11.04"},
- {"type": "sextupole", "position": 1181, "name": "SF_S11.03", "devices":["CEH_S11.07","CEV_S11.07"]},
- {"type": "octupole", "position": 1421, "name": "OCT_S11.01", "devices":["CEH_S11.08","CEV_S11.08"]},
+ {"type": "sextupole_CHV", "position": 1181, "name": "SF_S11.03", "devices":["CEH_S11.07","CEV_S11.07"]},
+ {"type": "bpm", "position": 1321, "name": "BPM_S11.05"},
+ {"type": "octupole_CHV", "position": 1421, "name": "OCT_S11.01", "devices":["CEH_S11.08","CEV_S11.08"]},
{"type": "quadrupole", "position": 1641, "name": "QF_S11.01"},
- {"type": "sextupole", "position": 1891, "name": "SD_S11.05", "devices":["QS_S11.01","CEV_S11.09"]}
+ {"type": "sextupole_QK", "position": 1891, "name": "SD_S11.05", "devices":["QS_S11.01","CEV_S11.09"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S11.03"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S11.03"}
]
},
{
@@ -1821,18 +2087,25 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S11.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S11.01", "devices":["OCT_S11.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S11.01", "devices":["CEH_S11.10","CEV_S11.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S11.02", "devices":["QD_S11.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S11.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S11.01", "devices":["CEH_S11.10","CEV_S11.10"]},
{"type": "quadrupole", "position": 1054, "name": "QF_S11.02"},
- {"type": "shutter", "position": 1330, "name": "SH_S11.02", "devices":["QS_S11.02","CEV_S11.11"]},
+ {"type": "shutter_QK", "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", "offset2d": [-100, -500]},
- {"type": "scw", "position": 5280, "name": "SCW_S11.01", "offset2d": [-400, -700]},
+ {"type": "corrector", "position": 4080, "name": "CV_S11.01"},
+ {"type": "bpm", "position": 4180, "name": "BPM_S11.07"},
+ {"type": "cavity_3hc", "position": 2480, "name": "3HC_S11.01"},
+ {"type": "scw", "position": 5280, "name": "SCW_S11.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S11.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S11.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S11.03"},
- {"type": "shutter", "position": 7230, "name": "SH_S11.03", "devices":["QS_S11.03","CEV_S11.12"]},
+ {"type": "shutter_QK", "position": 7230, "name": "SH_S11.03", "devices":["QS_S11.03","CEV_S11.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S11.03"},
- {"type": "shutter", "position": 7789, "name": "SH_S11.04", "devices":["CEH_S11.13","CEV_S11.13"]},
- {"type": "quadrupole", "position": 8015, "name": "QD_S11.04", "devices":["OCT_S11.03"]}
+ {"type": "shutter_CHV", "position": 7789, "name": "SH_S11.04", "devices":["CEH_S11.13","CEV_S11.13"]},
+ {"type": "octupole_QD", "position": 8015, "name": "OCT_S11.03", "devices":["QD_S11.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S11.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S11.04"}
]
},
{
@@ -1840,12 +2113,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S11.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 550, "name": "SD_S11.06", "devices":["QS_S11.04","CEV_S11.14"]},
+ {"type": "sextupole_QK", "position": 550, "name": "SD_S11.06", "devices":["QS_S11.04","CEV_S11.14"]},
{"type": "quadrupole", "position": 780, "name": "QF_S11.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S11.04", "devices":["CEH_S11.15","CEV_S11.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S11.04", "devices":["CEH_S11.16","CEV_S11.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S11.04", "devices":["CEH_S11.15","CEV_S11.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S11.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S11.04", "devices":["CEH_S11.16","CEV_S11.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S11.05"},
- {"type": "sextupole", "position": 1760, "name": "SD_S11.07", "devices":["CEH_S11.17","CEV_S11.17"]}
+ {"type": "sextupole_CHV", "position": 1760, "name": "SD_S11.07", "devices":["CEH_S11.17","CEV_S11.17"]},
+ {"type": "corrector", "position": 2220, "name": "CFH_S11.05"},
+ {"type": "corrector", "position": 2320, "name": "CFV_S11.05"}
]
},
{
@@ -1853,11 +2129,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S11.05", "devices":["TRCEB_S11.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S11.08", "devices":["CEH_S11.18","CEV_S11.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S11.08", "devices":["CEH_S11.18","CEV_S11.18"]},
+ {"type": "bpm", "position": 761, "name": "BPM_S11.12"},
{"type": "quadrupole", "position": 861, "name": "QAB_S11.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S11.05", "devices":["CEH_S11.19","CEV_S11.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S11.05", "devices":["CEH_S11.19","CEV_S11.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S11.07"},
- {"type": "sextupole", "position": 1670, "name": "SD_S11.09", "devices":["CEH_S11.20","CEV_S11.20"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S11.13"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S11.09", "devices":["CEH_S11.20","CEV_S11.20"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S11.06"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S11.06"}
]
},
{
@@ -1865,24 +2145,31 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S11.06", "devices":["TRCEB_S11.04"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S11.10", "devices":["CEH_S11.21","CEV_S11.21"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S11.10", "devices":["CEH_S11.21","CEV_S11.21"]},
{"type": "quadrupole", "position": 860, "name": "QAB_S11.08"},
- {"type": "sextupole", "position": 1110, "name": "SF_S11.06", "devices":["CEH_S11.22","CEV_S11.22"]},
- {"type": "sextupole", "position": 2530, "name": "SF_S12.01", "devices":["CEH_S12.01","CEV_S12.01"]},
+ {"type": "bpm", "position": 1010, "name": "BPM_S11.14"},
+ {"type": "sextupole_CHV", "position": 1110, "name": "SF_S11.06", "devices":["CEH_S11.22","CEV_S11.22"]},
+ {"type": "flsc", "position": 2330, "name": "FLSC_S12.01"},
+ {"type": "bpm", "position": 2430, "name": "DBPM_12.01"},
+ {"type": "sextupole_CHV", "position": 2530, "name": "SF_S12.01", "devices":["CEH_S12.01","CEV_S12.01"]},
+ {"type": "bpm", "position": 2679, "name": "BPM_S12.01"},
{"type": "quadrupole", "position": 2779, "name": "QAB_S12.01"},
- {"type": "sextupole", "position": 3030, "name": "SD_S12.01", "devices":["CEH_S12.02","CEV_S12.02"]}
+ {"type": "sextupole_CHV", "position": 3030, "name": "SD_S12.01", "devices":["CEH_S12.02","CEV_S12.02"]},
+ {"type": "bpm", "position": 3540, "name": "BPM_S12.02"}
]
},
{
"start": {"x": 35458, "z": -21373},
- "bending": {"type": "dipole", "label": "show", "name": "B_S12.01"},
+ "bending": {"type": "dipole", "label": "show", "name": "B_S12.01", "devices":["TRCEB_S12.01"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 611, "name": "SD_S12.02", "devices":["CEH_S12.03","CEV_S12.03"]},
+ {"type": "sextupole_CHV", "position": 611, "name": "SD_S12.02", "devices":["CEH_S12.03","CEV_S12.03"]},
+ {"type": "bpm", "position": 761, "name": "BPM_S12.03"},
{"type": "quadrupole", "position": 861, "name": "QAB_S12.02"},
- {"type": "sextupole", "position": 1151, "name": "SF_S12.02", "devices":["CEH_S12.04","CEV_S12.04"]},
+ {"type": "sextupole_CHV", "position": 1151, "name": "SF_S12.02", "devices":["CEH_S12.04","CEV_S12.04"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S12.03"},
- {"type": "sextupole", "position": 1670, "name": "SD_S12.03", "devices":["CEH_S12.05","CEV_S12.05"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S12.04"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S12.03", "devices":["CEH_S12.05","CEV_S12.05"]}
]
},
{
@@ -1890,12 +2177,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S12.02", "devices":["TRCEB_S12.02"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 660, "name": "SD_S12.04", "devices":["CEH_S12.06","CEV_S12.06"]},
+ {"type": "sextupole_CHV", "position": 660, "name": "SD_S12.04", "devices":["CEH_S12.06","CEV_S12.06"]},
{"type": "quadrupole", "position": 910, "name": "QAB_S12.04"},
- {"type": "sextupole", "position": 1180, "name": "SF_S12.03", "devices":["CEH_S12.07","CEV_S12.07"]},
- {"type": "octupole", "position": 1420, "name": "OCT_S12.01", "devices":["CEH_S12.08","CEV_S12.08"]},
+ {"type": "sextupole_CHV", "position": 1180, "name": "SF_S12.03", "devices":["CEH_S12.07","CEV_S12.07"]},
+ {"type": "bpm", "position": 1320, "name": "BPM_S12.05"},
+ {"type": "octupole_CHV", "position": 1420, "name": "OCT_S12.01", "devices":["CEH_S12.08","CEV_S12.08"]},
{"type": "quadrupole", "position": 1640, "name": "QF_S12.01"},
- {"type": "sextupole", "position": 1890, "name": "SD_S12.05", "devices":["QS_S12.01","CEV_S12.09"]}
+ {"type": "sextupole_QK", "position": 1890, "name": "SD_S12.05", "devices":["QS_S12.01","CEV_S12.09"]},
+ {"type": "corrector", "position": 2220, "name": "CFH_S12.03"},
+ {"type": "corrector", "position": 2320, "name": "CFV_S12.03"}
]
},
{
@@ -1903,17 +2193,24 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S12.03"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "quadrupole", "position": 545, "name": "QD_S12.01", "devices":["OCT_S12.02"]},
- {"type": "shutter", "position": 770, "name": "SH_S12.01", "devices":["CEH_S12.10","CEV_S12.10"]},
+ {"type": "octupole_QD", "position": 545, "name": "OCT_S12.02", "devices":["QD_S12.01"]},
+ {"type": "bpm", "position": 670, "name": "BPM_S12.06"},
+ {"type": "shutter_CHV", "position": 770, "name": "SH_S12.01", "devices":["CEH_S12.10","CEV_S12.10"]},
{"type": "quadrupole", "position": 1055, "name": "QF_S12.02"},
- {"type": "shutter", "position": 1331, "name": "SH_S12.02", "devices":["QS_S12.02","CEV_S12.11"]},
+ {"type": "shutter_QK", "position": 1331, "name": "SH_S12.02", "devices":["QS_S12.02","CEV_S12.11"]},
{"type": "quadrupole", "position": 1515, "name": "QD_S12.02"},
+ {"type": "corrector", "position": 4081, "name": "CV_S12.01"},
+ {"type": "bpm", "position": 4181, "name": "BPM_S12.07"},
{"type": "inj", "position": 4281, "name": "INJ_S12.01"},
+ {"type": "corrector", "position": 6845, "name": "CH_S12.02"},
+ {"type": "corrector", "position": 6945, "name": "CV_S12.02"},
{"type": "quadrupole", "position": 7045, "name": "QD_S12.03"},
- {"type": "shutter", "position": 7231, "name": "SH_S12.03", "devices":["QS_S12.03","CEV_S12.12"]},
+ {"type": "shutter_QK", "position": 7231, "name": "SH_S12.03", "devices":["QS_S12.03","CEV_S12.12"]},
{"type": "quadrupole", "position": 7505, "name": "QF_S12.03"},
- {"type": "shutter", "position": 7790, "name": "SH_S12.04", "devices":["CEH_S12.13","CEV_S12.13"]},
- {"type": "quadrupole", "position": 8016, "name": "QD_S12.04", "devices":["OCT_S12.03"]}
+ {"type": "shutter_CHV", "position": 7790, "name": "SH_S12.04", "devices":["CEH_S12.13","CEV_S12.13"]},
+ {"type": "octupole_QD", "position": 8016, "name": "OCT_S12.03", "devices":["QD_S12.04"]},
+ {"type": "corrector", "position": 8360, "name": "CFH_S12.04"},
+ {"type": "corrector", "position": 8460, "name": "CFV_S12.04"}
]
},
{
@@ -1921,12 +2218,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S12.04"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 551, "name": "SD_S12.06", "devices":["QS_S12.04","CEV_S12.14"]},
+ {"type": "sextupole_QK", "position": 551, "name": "SD_S12.06", "devices":["QS_S12.04","CEV_S12.14"]},
{"type": "quadrupole", "position": 781, "name": "QF_S12.04"},
- {"type": "octupole", "position": 1000, "name": "OCT_S12.04", "devices":["CEH_S12.15","CEV_S12.15"]},
- {"type": "sextupole", "position": 1240, "name": "SF_S12.04", "devices":["CEH_S12.16","CEV_S12.16"]},
+ {"type": "octupole_CHV", "position": 1000, "name": "OCT_S12.04", "devices":["CEH_S12.15","CEV_S12.15"]},
+ {"type": "bpm", "position": 1140, "name": "BPM_S12.10"},
+ {"type": "sextupole_CHV", "position": 1240, "name": "SF_S12.04", "devices":["CEH_S12.16","CEV_S12.16"]},
{"type": "quadrupole", "position": 1510, "name": "QAB_S12.05"},
- {"type": "sextupole", "position": 1760, "name": "SD_S12.07", "devices":["CEH_S12.17","CEV_S12.17"]}
+ {"type": "sextupole_CHV", "position": 1760, "name": "SD_S12.07", "devices":["CEH_S12.17","CEV_S12.17"]},
+ {"type": "corrector", "position": 2221, "name": "CFH_S12.05"},
+ {"type": "corrector", "position": 2321, "name": "CFV_S12.05"}
]
},
{
@@ -1934,11 +2234,15 @@
"bending": {"type": "dipole", "label": "show", "name": "B_S12.05", "devices":["TRCEB_S12.03"]},
"chamber": {"type": "chamber"},
"components": [
- {"type": "sextupole", "position": 610, "name": "SD_S12.08", "devices":["CEH_S12.18","CEV_S12.18"]},
+ {"type": "sextupole_CHV", "position": 610, "name": "SD_S12.08", "devices":["CEH_S12.18","CEV_S12.18"]},
+ {"type": "bpm", "position": 760, "name": "BPM_S12.12"},
{"type": "quadrupole", "position": 860, "name": "QAB_S12.06"},
- {"type": "sextupole", "position": 1130, "name": "SF_S12.05", "devices":["CEH_S12.19","CEV_S12.19"]},
+ {"type": "sextupole_CHV", "position": 1130, "name": "SF_S12.05", "devices":["CEH_S12.19","CEV_S12.19"]},
{"type": "quadrupole", "position": 1420, "name": "QAB_S12.07"},
- {"type": "sextupole", "position": 1670, "name": "SD_S12.09", "devices":["CEH_S12.20","CEV_S12.20"]}
+ {"type": "bpm", "position": 1570, "name": "BPM_S12.13"},
+ {"type": "sextupole_CHV", "position": 1670, "name": "SD_S12.09", "devices":["CEH_S12.20","CEV_S12.20"]},
+ {"type": "corrector", "position": 2081, "name": "CFH_S12.06"},
+ {"type": "corrector", "position": 2181, "name": "CFV_S12.06"}
]
},
{
@@ -1951,256 +2255,6 @@
},
"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": "XXXXX", "labelReverse":[270, 2700, -150], "embedded":[
- ""
- ]},
- {"type": "zero", "position": 2300, "name": "XXXXXX", "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"
- ]},
- {"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}
- },
{
"start": {"x": 33249, "y": -300, "z": 4557},
"components": [
@@ -2231,56 +2285,29 @@
{"type": "rd", "position": 0, "name": "RD_AA01.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 2457, "name": "RV_AA01.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 1649, "name": "RV_AA01.10" ,"reverse": true, "devices":[]},
- {"type": "rc", "position": 676, "name": "RCF_AA01.05" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 828, "name": "RCF_AA01.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 37576, "y": -300, "z": -105}
+ "start": {"x": 35662, "y": -300, "z": -1898}
},
{
- "start": {"x": 33502, "y": -300, "z": 2873},
+ "start": {"x": 33415, "y": -300, "z": 3512},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB01.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 33501, "y": -300, "z": 2883}
+ "start": {"x": 33414, "y": -300, "z": 3522}
},
{
- "start": {"x": 31997, "y": -300, "z": 10335},
+ "start": {"x": 31769, "y": -300, "z": 10939},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB01.10" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 31994, "y": -300, "z": 10345}
- },
- {
- "start": {"x": 29716, "y": -300, "z": 15735},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AB01.15" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 29711, "y": -300, "z": 15744}
- },
- {
- "start": {"x": 33415, "y": -300, "z": 3513},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB01.05" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 33414, "y": -300, "z": 3523}
- },
- {
- "start": {"x": 31769, "y": -300, "z": 10940},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB01.10" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 31766, "y": -300, "z": 10949}
+ "start": {"x": 31766, "y": -300, "z": 10948}
},
{
"start": {"x": 36910, "y": -300, "z": 2848},
@@ -2323,56 +2350,29 @@
{"type": "rd", "position": 0, "name": "RD_AA02.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 2585, "name": "RV_AA02.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 1777, "name": "RV_AA02.10" ,"reverse": true, "devices":[]},
- {"type": "rc", "position": 676, "name": "RCF_AA02.05" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 953, "name": "RCF_AA02.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 32604, "y": -300, "z": 18698}
+ "start": {"x": 32736, "y": -300, "z": 15112}
},
{
- "start": {"x": 27577, "y": -300, "z": 19239},
+ "start": {"x": 27182, "y": -300, "z": 19749},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB02.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 27571, "y": -300, "z": 19247}
+ "start": {"x": 27176, "y": -300, "z": 19757}
},
{
- "start": {"x": 23817, "y": -300, "z": 23735},
+ "start": {"x": 23340, "y": -300, "z": 24169},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB02.10" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 23810, "y": -300, "z": 23742}
- },
- {
- "start": {"x": 22717, "y": -300, "z": 29078},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AA02.05" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 22709, "y": -300, "z": 29084}
- },
- {
- "start": {"x": 27182, "y": -300, "z": 19750},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB02.05" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 27176, "y": -300, "z": 19758}
- },
- {
- "start": {"x": 23340, "y": -300, "z": 24170},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB02.10" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 23333, "y": -300, "z": 24177}
+ "start": {"x": 23333, "y": -300, "z": 24176}
},
{
"start": {"x": 32967, "y": -300, "z": 16798},
@@ -2434,79 +2434,50 @@
{"type": "rd", "position": 0, "name": "RD_AA03.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 2521, "name": "RV_AA03.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 1713, "name": "RV_AA03.10" ,"reverse": true, "devices":[]},
- {"type": "rc", "position": 676, "name": "RCF_AA03.05" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 890, "name": "RCF_AA03.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 18879, "y": -300, "z": 32489}
+ "start": {"x": 20122, "y": -300, "z": 29684}
},
{
- "start": {"x": 14263, "y": -300, "z": 30450},
+ "start": {"x": 13666, "y": -300, "z": 30695},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB03.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 14254, "y": -300, "z": 30454}
+ "start": {"x": 13657, "y": -300, "z": 30699}
},
{
- "start": {"x": 8759, "y": -300, "z": 32465},
+ "start": {"x": 8128, "y": -300, "z": 32601},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB03.10" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 8749, "y": -300, "z": 32468}
- },
- {
- "start": {"x": 5135, "y": -300, "z": 36541},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AA03.05" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 5125, "y": -300, "z": 36542}
- },
- {
- "start": {"x": 13666, "y": -300, "z": 30696},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB03.05" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 13657, "y": -300, "z": 30700}
- },
- {
- "start": {"x": 8128, "y": -300, "z": 32602},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB03.10" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 8118, "y": -300, "z": 32604}
+ "start": {"x": 8118, "y": -300, "z": 32603}
},
{
"start": {"x": 11248, "y": -300, "z": 35270},
"components": [
{"type": "rid", "position": 0, "name": "RID_AA03.05" ,"reverse": true, "devices":[]},
{"type": "rid", "position": 610, "name": "RID_AA03.10" ,"reverse": true, "devices":[]},
- {"type": "rid", "position": 1220, "name": "RID_AA03.15" ,"reverse": true, "devices":[]},
- {"type": "rcry", "position": 1868, "name": "RCRY_AA03.05" ,"reverse": true, "devices":[]},
- {"type": "rcry", "position": 2477, "name": "RCRY_AA03.10" ,"reverse": true, "devices":[]}
+ {"type": "rid", "position": 1220, "name": "RID_AA03.15" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": -15284, "y": -300, "z": 41452}
+ "start": {"x": -1666, "y": -300, "z": 38933}
},
{
- "start": {"x": 15299, "y": -300, "z": 30757},
+ "start": {"x": 19436, "y": -300, "z": 31718},
"components": [
{"type": "rrf", "position": 0, "name": "RRF_AA03.05" ,"reverse": true, "devices":[]},
- {"type": "rrf", "position": 1442, "name": "RRF_AB03.05" ,"reverse": true, "devices":[]}
+ {"type": "rrf", "position": 649, "name": "RRF_AA03.10" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 8226, "y": -300, "z": 16556}
+ "start": {"x": 13551, "y": -300, "z": 35766}
},
{
"start": {"x": -4557, "y": -300, "z": 33250},
@@ -2538,56 +2509,29 @@
{"type": "rd", "position": 0, "name": "RD_AA04.05", "devices":[]},
{"type": "rv", "position": 2457, "name": "RV_AA04.05", "devices":[]},
{"type": "rv", "position": 1649, "name": "RV_AA04.10", "devices":[]},
- {"type": "rc", "position": 676, "name": "RCF_AA04.05", "devices":[]}
+ {"type": "rc", "position": 828, "name": "RCF_AA04.05", "devices":[]}
]
},
{
- "start": {"x": 105, "y": -300, "z": 37577}
+ "start": {"x": 1898, "y": -300, "z": 35652}
},
{
- "start": {"x": -2873, "y": -300, "z": 33503},
+ "start": {"x": -3512, "y": -300, "z": 33415},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB04.05", "devices":[]}
]
},
{
- "start": {"x": -2883, "y": -300, "z": 33502}
+ "start": {"x": -3522, "y": -300, "z": 33414}
},
{
- "start": {"x": -10335, "y": -300, "z": 31998},
+ "start": {"x": -10939, "y": -300, "z": 31769},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB04.10", "devices":[]}
]
},
{
- "start": {"x": -10345, "y": -300, "z": 31995}
- },
- {
- "start": {"x": -15735, "y": -300, "z": 29717},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AB04.15", "devices":[]}
- ]
- },
- {
- "start": {"x": -15744, "y": -300, "z": 29712}
- },
- {
- "start": {"x": -3513, "y": -300, "z": 33416},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB04.05", "devices":[]}
- ]
- },
- {
- "start": {"x": -3523, "y": -300, "z": 33415}
- },
- {
- "start": {"x": -10940, "y": -300, "z": 31770},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB04.10", "devices":[]}
- ]
- },
- {
- "start": {"x": -10949, "y": -300, "z": 31767}
+ "start": {"x": -10948, "y": -300, "z": 31766}
},
{
"start": {"x": -2784, "y": -300, "z": 36916},
@@ -2601,14 +2545,14 @@
"start": {"x": -16116, "y": -300, "z": 35464}
},
{
- "start": {"x": -2129, "y": -300, "z": 34286},
+ "start": {"x": 973, "y": -300, "z": 37187},
"components": [
{"type": "rrf", "position": 0, "name": "RRF_AA04.05", "devices":[]},
- {"type": "rrf", "position": 1443, "name": "RRF_AB04.05", "devices":[]}
+ {"type": "rrf", "position": 650, "name": "RRF_AA04.10", "devices":[]}
]
},
{
- "start": {"x": -1161, "y": -300, "z": 18446}
+ "start": {"x": -6155, "y": -300, "z": 37748}
},
{
"start": {"x": -20653, "y": -300, "z": 26435},
@@ -2635,69 +2579,66 @@
"start": {"x": -42750, "y": -300, "z": 2064}
},
{
- "start": {"x": -24330, "y": -300, "z": 27743},
+ "start": {"x": -15763, "y": -300, "z": 27743},
"components": [
- {"type": "rd", "position": 0, "name": "RD_AA05.05", "devices":[]},
- {"type": "rv", "position": 2457, "name": "RV_AA05.05", "devices":[]},
- {"type": "rv", "position": 1650, "name": "RV_AA05.10", "devices":[]},
- {"type": "rc", "position": 676, "name": "RCF_AA05.05", "devices":[]}
+ {"type": "rd", "position": 0, "name": "RD_AA05.05", "devices":[]}
]
},
{
- "start": {"x": -18698, "y": -300, "z": 32605}
+ "start": {"x": -15772, "y": -300, "z": 27738}
},
{
- "start": {"x": -19239, "y": -300, "z": 27578},
+ "start": {"x": -24330, "y": -300, "z": 21302},
"components": [
- {"type": "rc", "position": 0, "name": "RC_AB05.05", "devices":[]}
+ {"type": "rd", "position": 0, "name": "RD_AC05.05", "devices":[]}
]
},
{
- "start": {"x": -19247, "y": -300, "z": 27572}
+ "start": {"x": -24337, "y": -300, "z": 21294}
},
{
- "start": {"x": -23735, "y": -300, "z": 23818},
+ "start": {"x": -22315, "y": -300, "z": 29149},
"components": [
- {"type": "rc", "position": 0, "name": "RC_AB05.10", "devices":[]}
+ {"type": "rv", "position": 0, "name": "RV_AA05.05", "devices":[]},
+ {"type": "rv", "position": 810, "name": "RV_AA05.10", "devices":[]},
+ {"type": "rc", "position": 1643, "name": "RCF_AA05.05", "devices":[]}
]
},
{
- "start": {"x": -23742, "y": -300, "z": 23811}
+ "start": {"x": -36340, "y": -300, "z": 17753}
},
{
- "start": {"x": -17371, "y": -300, "z": 32670},
+ "start": {"x": -19749, "y": -300, "z": 27182},
"components": [
- {"type": "rc", "position": 0, "name": "RC_AA05.05", "devices":[]},
- {"type": "rc", "position": 646, "name": "RC_AA05.10", "devices":[]}
+ {"type": "rc", "position": 0, "name": "RC_AB05.05", "devices":[]}
]
},
{
- "start": {"x": -23608, "y": -300, "z": 29271}
+ "start": {"x": -19757, "y": -300, "z": 27176}
},
{
- "start": {"x": -25934, "y": -300, "z": 26391},
+ "start": {"x": -24169, "y": -300, "z": 23340},
"components": [
- {"type": "rc", "position": 0, "name": "RC_AA05.15", "devices":[]},
- {"type": "rc", "position": 646, "name": "RC_AA05.20", "devices":[]},
- {"type": "rc", "position": 1291, "name": "RC_AA05.25", "devices":[]},
- {"type": "rc", "position": 1938, "name": "RC_AA05.30", "devices":[]},
- {"type": "rc", "position": 2905, "name": "RC_AA05.35", "devices":[]}
+ {"type": "rc", "position": 0, "name": "RC_AB05.10", "devices":[]}
]
},
{
- "start": {"x": -47835, "y": -300, "z": 3115}
+ "start": {"x": -24176, "y": -300, "z": 23333}
},
{
- "start": {"x": -30227, "y": -300, "z": 21165},
+ "start": {"x": -25986, "y": -300, "z": 25986},
"components": [
- {"type": "rc", "position": 0, "name": "RC_AA05.40", "devices":[]}
+ {"type": "rc", "position": 0, "name": "RC_AA05.10", "devices":[]},
+ {"type": "rc", "position": 769, "name": "RC_AA05.15", "devices":[]},
+ {"type": "rc", "position": 1539, "name": "RC_AA05.20", "devices":[]},
+ {"type": "rc", "position": 2758, "name": "RC_AA05.25", "devices":[]}
]
},
{
- "start": {"x": -30233, "y": -300, "z": 21157}
+ "start": {"x": -46611, "y": -300, "z": 3744}
},
{
- "start": {"x": -14123, "y": -300, "z": 22601},
+ "start": {"x": -14964, "y": -300, "z": 23718},
"components": [
{"type": "rc", "position": 0, "name": "RC_AC05.05", "devices":[]},
{"type": "rc", "position": 700, "name": "RC_AC05.10", "devices":[]},
@@ -2705,25 +2646,16 @@
]
},
{
- "start": {"x": -23385, "y": -300, "z": 34899}
- },
- {
- "start": {"x": -19750, "y": -300, "z": 27183},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB05.05", "devices":[]}
- ]
- },
- {
- "start": {"x": -19758, "y": -300, "z": 27177}
+ "start": {"x": -5702, "y": -300, "z": 11420}
},
{
- "start": {"x": -24170, "y": -300, "z": 23341},
+ "start": {"x": -21638, "y": -300, "z": 29673},
"components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB05.10", "devices":[]}
+ {"type": "rc", "position": 0, "name": "RC_AA05.05", "devices":[]}
]
},
{
- "start": {"x": -24177, "y": -300, "z": 23334}
+ "start": {"x": -21646, "y": -300, "z": 29667}
},
{
"start": {"x": -16798, "y": -300, "z": 32968},
@@ -2776,48 +2708,29 @@
{"type": "rd", "position": 0, "name": "RD_AA06.05", "devices":[]},
{"type": "rv", "position": 2456, "name": "RV_AA06.05", "devices":[]},
{"type": "rv", "position": 1649, "name": "RV_AA06.10", "devices":[]},
- {"type": "rc", "position": 676, "name": "RCF_AA06.05", "devices":[]}
+ {"type": "rc", "position": 827, "name": "RCF_AA06.05", "devices":[]}
]
},
{
- "start": {"x": -32489, "y": -300, "z": 18880}
+ "start": {"x": -29926, "y": -300, "z": 19452}
},
{
- "start": {"x": -32465, "y": -300, "z": 8760},
+ "start": {"x": -32601, "y": -300, "z": 8128},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB06.05", "devices":[]}
]
},
{
- "start": {"x": -32468, "y": -300, "z": 8750}
+ "start": {"x": -32603, "y": -300, "z": 8118}
},
{
- "start": {"x": -33492, "y": -300, "z": 2990},
+ "start": {"x": -33518, "y": -300, "z": 2343},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB06.10", "devices":[]}
]
},
{
- "start": {"x": -33493, "y": -300, "z": 2980}
- },
- {
- "start": {"x": -33736, "y": -300, "z": 14950},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AA06.05", "devices":[]},
- {"type": "rilk", "position": 644, "name": "RILK_AA06.05", "devices":[]}
- ]
- },
- {
- "start": {"x": -30810, "y": -300, "z": 21407}
- },
- {
- "start": {"x": -32602, "y": -300, "z": 8129},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB06.05", "devices":[]}
- ]
- },
- {
- "start": {"x": -32604, "y": -300, "z": 8119}
+ "start": {"x": -33519, "y": -300, "z": 2333}
},
{
"start": {"x": -35270, "y": -300, "z": 11249},
@@ -2860,56 +2773,29 @@
{"type": "rd", "position": 0, "name": "RD_AA07.05", "devices":[]},
{"type": "rv", "position": 2457, "name": "RV_AA07.05", "devices":[]},
{"type": "rv", "position": 1649, "name": "RV_AA07.10", "devices":[]},
- {"type": "rc", "position": 676, "name": "RCF_AA07.05", "devices":[]}
+ {"type": "rc", "position": 827, "name": "RCF_AA07.05", "devices":[]}
]
},
{
- "start": {"x": -37577, "y": -300, "z": 106}
+ "start": {"x": -35652, "y": -300, "z": 1888}
},
{
- "start": {"x": -33503, "y": -300, "z": -2872},
+ "start": {"x": -33415, "y": -300, "z": -3512},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB07.05", "devices":[]}
]
},
{
- "start": {"x": -33502, "y": -300, "z": -2882}
+ "start": {"x": -33414, "y": -300, "z": -3522}
},
{
- "start": {"x": -31998, "y": -300, "z": -10334},
+ "start": {"x": -31769, "y": -300, "z": -10939},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB07.10", "devices":[]}
]
},
{
- "start": {"x": -31995, "y": -300, "z": -10344}
- },
- {
- "start": {"x": -29717, "y": -300, "z": -15734},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AB07.15", "devices":[]}
- ]
- },
- {
- "start": {"x": -29712, "y": -300, "z": -15743}
- },
- {
- "start": {"x": -33416, "y": -300, "z": -3512},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB07.05", "devices":[]}
- ]
- },
- {
- "start": {"x": -33415, "y": -300, "z": -3522}
- },
- {
- "start": {"x": -31770, "y": -300, "z": -10939},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB07.10", "devices":[]}
- ]
- },
- {
- "start": {"x": -31767, "y": -300, "z": -10948}
+ "start": {"x": -31766, "y": -300, "z": -10948}
},
{
"start": {"x": -36950, "y": -300, "z": 1937},
@@ -2933,8 +2819,8 @@
{
"start": {"x": -32966, "y": -300, "z": -16579},
"components": [
- {"type": "rcry", "position": 0, "name": "RCRY_AA07.05", "devices":[]},
- {"type": "rcry", "position": 610, "name": "RCRY_AA07.10", "devices":[]}
+ {"type": "rcry", "position": 0, "name": "RCRY_AA08.05", "devices":[]},
+ {"type": "rcry", "position": 610, "name": "RCRY_AA08.10", "devices":[]}
]
},
{
@@ -2979,56 +2865,29 @@
"components": [
{"type": "rv", "position": 0, "name": "RV_AA08.05", "devices":[]},
{"type": "rv", "position": 810, "name": "RV_AA08.10", "devices":[]},
- {"type": "rc", "position": 1785, "name": "RCF_AA08.05", "devices":[]}
+ {"type": "rc", "position": 1643, "name": "RCF_AA08.05", "devices":[]}
]
},
{
- "start": {"x": -19216, "y": -300, "z": -38511}
+ "start": {"x": -18391, "y": -300, "z": -36036}
},
{
- "start": {"x": -27578, "y": -300, "z": -19238},
+ "start": {"x": -27182, "y": -300, "z": -19749},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB08.05", "devices":[]}
]
},
{
- "start": {"x": -27572, "y": -300, "z": -19246}
+ "start": {"x": -27176, "y": -300, "z": -19757}
},
{
- "start": {"x": -23818, "y": -300, "z": -23734},
+ "start": {"x": -23340, "y": -300, "z": -24169},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB08.10", "devices":[]}
]
},
{
- "start": {"x": -23811, "y": -300, "z": -23741}
- },
- {
- "start": {"x": -22718, "y": -300, "z": -29077},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AA08.05", "devices":[]}
- ]
- },
- {
- "start": {"x": -22710, "y": -300, "z": -29083}
- },
- {
- "start": {"x": -27183, "y": -300, "z": -19749},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB08.05", "devices":[]}
- ]
- },
- {
- "start": {"x": -27177, "y": -300, "z": -19757}
- },
- {
- "start": {"x": -23341, "y": -300, "z": -24169},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB08.10", "devices":[]}
- ]
- },
- {
- "start": {"x": -23334, "y": -300, "z": -24176}
+ "start": {"x": -23333, "y": -300, "z": -24176}
},
{
"start": {"x": -27333, "y": -300, "z": -24968},
@@ -3071,56 +2930,38 @@
{"type": "rd", "position": 0, "name": "RD_AA09.05", "devices":[]},
{"type": "rv", "position": 2456, "name": "RV_AA09.05", "devices":[]},
{"type": "rv", "position": 1649, "name": "RV_AA09.10", "devices":[]},
- {"type": "rc", "position": 676, "name": "RCF_AA09.05", "devices":[]}
+ {"type": "rc", "position": 827, "name": "RCF_AA09.05", "devices":[]}
]
},
{
- "start": {"x": -18880, "y": -300, "z": -32488}
+ "start": {"x": -19452, "y": -300, "z": -29936}
},
{
- "start": {"x": -14264, "y": -300, "z": -30449},
+ "start": {"x": -13666, "y": -300, "z": -30695},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB09.05", "devices":[]}
]
},
{
- "start": {"x": -14255, "y": -300, "z": -30453}
+ "start": {"x": -13657, "y": -300, "z": -30699}
},
{
- "start": {"x": -8760, "y": -300, "z": -32464},
+ "start": {"x": -8128, "y": -300, "z": -32601},
"components": [
{"type": "rc", "position": 0, "name": "RC_AB09.10", "devices":[]}
]
},
{
- "start": {"x": -8750, "y": -300, "z": -32467}
+ "start": {"x": -8118, "y": -300, "z": -32603}
},
{
- "start": {"x": -9364, "y": -300, "z": -35692},
+ "start": {"x": -14879, "y": -300, "z": -33576},
"components": [
{"type": "rc", "position": 0, "name": "RC_AA09.05", "devices":[]}
]
},
{
- "start": {"x": -9354, "y": -300, "z": -35695}
- },
- {
- "start": {"x": -13667, "y": -300, "z": -30695},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB09.05", "devices":[]}
- ]
- },
- {
- "start": {"x": -13658, "y": -300, "z": -30699}
- },
- {
- "start": {"x": -8129, "y": -300, "z": -32601},
- "components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB09.10", "devices":[]}
- ]
- },
- {
- "start": {"x": -8119, "y": -300, "z": -32603}
+ "start": {"x": -14870, "y": -300, "z": -33580}
},
{
"start": {"x": -11249, "y": -300, "z": -35269},
@@ -3134,14 +2975,14 @@
"start": {"x": 1665, "y": -300, "z": -38932}
},
{
- "start": {"x": -15300, "y": -300, "z": -30756},
+ "start": {"x": -19436, "y": -300, "z": -31718},
"components": [
{"type": "rrf", "position": 0, "name": "RRF_AA09.05", "devices":[]},
- {"type": "rrf", "position": 1442, "name": "RRF_AB09.05", "devices":[]}
+ {"type": "rrf", "position": 649, "name": "RRF_AA09.10", "devices":[]}
]
},
{
- "start": {"x": -8227, "y": -300, "z": -16555}
+ "start": {"x": -13551, "y": -300, "z": -35766}
},
{
"start": {"x": 4556, "y": -300, "z": -33249},
@@ -3173,43 +3014,16 @@
{"type": "rd", "position": 0, "name": "RD_AA10.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 2520, "name": "RV_AA10.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 1714, "name": "RV_AA10.10" ,"reverse": true, "devices":[]},
- {"type": "rc", "position": 676, "name": "RCF_AA10.05" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 890, "name": "RCF_AA10.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": -106, "y": -300, "z": -37576}
- },
- {
- "start": {"x": 2872, "y": -300, "z": -33502},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AB10.05" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 2882, "y": -300, "z": -33501}
- },
- {
- "start": {"x": 10334, "y": -300, "z": -31997},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AB10.10" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 10344, "y": -300, "z": -31994}
- },
- {
- "start": {"x": 14417, "y": -300, "z": -33966},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AA10.05" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 14426, "y": -300, "z": -33962}
+ "start": {"x": -2581, "y": -300, "z": -35783}
},
{
"start": {"x": 3512, "y": -300, "z": -33415},
"components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB10.05" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 0, "name": "RC_AB10.05" ,"reverse": true, "devices":[]}
]
},
{
@@ -3218,20 +3032,20 @@
{
"start": {"x": 10939, "y": -300, "z": -31769},
"components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB10.10" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 0, "name": "RC_AB10.10" ,"reverse": true, "devices":[]}
]
},
{
"start": {"x": 10948, "y": -300, "z": -31766}
},
{
- "start": {"x": 15008, "y": -300, "z": -33709},
+ "start": {"x": 14947, "y": -300, "z": -33572},
"components": [
- {"type": "rilk", "position": 0, "name": "RILK_AA10.05" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 0, "name": "RC_AA10.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 15017, "y": -300, "z": -33705}
+ "start": {"x": 14956, "y": -300, "z": -33568}
},
{
"start": {"x": 3260, "y": -300, "z": -36861},
@@ -3244,14 +3058,14 @@
"start": {"x": 9937, "y": -300, "z": -36157}
},
{
- "start": {"x": 2128, "y": -300, "z": -34285},
+ "start": {"x": -973, "y": -300, "z": -37187},
"components": [
{"type": "rrf", "position": 0, "name": "RRF_AA10.05" ,"reverse": true, "devices":[]},
- {"type": "rrf", "position": 1443, "name": "RRF_AB10.05" ,"reverse": true, "devices":[]}
+ {"type": "rrf", "position": 650, "name": "RRF_AA10.10" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 1160, "y": -300, "z": -18445}
+ "start": {"x": 6155, "y": -300, "z": -37748}
},
{
"start": {"x": 15748, "y": -300, "z": -29619},
@@ -3266,20 +3080,20 @@
"start": {"x": 39464, "y": -300, "z": -16562}
},
{
- "start": {"x": 24462, "y": -300, "z": -22097},
+ "start": {"x": 23355, "y": -300, "z": -20342},
"components": [
{"type": "rps", "position": 0, "name": "RPS_AB11.25" ,"reverse": true, "devices":["PSCFH_S11.04","PSCFV_S11.04","PSCH_S11.02","PSCV_S11.02","PSQK_S11.03","PSCEH_S11.13","PSCEV_S11.13","PSQK_S11.04","PSQD_S11.03","PSQF_S11.03","PSQD_S11.04","PSSH_S11.03","PSSH_S11.04","PSSD_S11.06"]},
{"type": "rps", "position": 820, "name": "RPS_AB11.30" ,"reverse": true, "devices":["PSCFH_S11.05","PSCFV_S11.05","PSCEH_S11.15","PSCEV_S11.15","PSCEH_S11.17","PSCEV_S11.17","PSCEH_S11.18","PSCEV_S11.18","PSQD_S11.04","PSQF_S11.04","PSQAB_S11.05","PSSF_S11.04","PSSD_S11.07","PSSD_S11.08"]},
{"type": "rps", "position": 1640, "name": "RPS_AB11.35" ,"reverse": true, "devices":["PSCFH_S11.06","PSCFV_S11.06","PSCEH_S11.20","PSCEV_S11.20","PSCEH_S11.21","PSCEV_S11.21","PSCEH_S11.22","PSCEV_S11.22","PSQAB_S11.06","PSQAB_S11.07","PSSF_S11.05","PSSD_S11.09","PSSD_S11.10","PSSF_S11.06"]},
{"type": "rps", "position": 2460, "name": "RPS_AB11.40" ,"reverse": true, "devices":["PSOCT_S11.03","PSOCT_S11.04","PSTRCEB_S11.03","PSTRCEB_S11.04","PSB_S11.04","PSB_S11.05","PSB_S11.06"]},
- {"type": "rbtsps", "position": 4165, "name": "RBTSPS_AB11.05" ,"reverse": true, "devices":[]},
+ {"type": "rbtsps", "position": 4303, "name": "RBTSPS_AB11.05" ,"reverse": true, "devices":[]},
{"type": "rbtsps", "position": 4764, "name": "RBTSPS_AB11.10" ,"reverse": true, "devices":[]},
- {"type": "rbtsps", "position": 5367, "name": "RBTSPS_AB11.15" ,"reverse": true, "devices":[]},
- {"type": "rbtsps", "position": 5974, "name": "RBTSPS_AB11.20" ,"reverse": true, "devices":[]}
+ {"type": "rbtsps", "position": 5259, "name": "RBTSPS_AB11.15" ,"reverse": true, "devices":[]},
+ {"type": "rbtsps", "position": 5777, "name": "RBTSPS_AB11.20" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 68671, "y": -300, "z": 26523}
+ "start": {"x": 79741, "y": -300, "z": 8973}
},
{
"start": {"x": 19197, "y": -300, "z": -31512},
@@ -3291,24 +3105,24 @@
"start": {"x": 19206, "y": -300, "z": -31507}
},
{
- "start": {"x": 21623, "y": -300, "z": -22003},
+ "start": {"x": 21203, "y": -300, "z": -21576},
"components": [
{"type": "rbtsd", "position": 0, "name": "RBTSD_AB11.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 21630, "y": -300, "z": -21996}
+ "start": {"x": 21210, "y": -300, "z": -21569}
},
{
"start": {"x": 16285, "y": -300, "z": -32898},
"components": [
{"type": "rv", "position": 0, "name": "RV_AA11.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 809, "name": "RV_AA11.10" ,"reverse": true, "devices":[]},
- {"type": "rc", "position": 1977, "name": "RCF_AA11.05" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 1642, "name": "RCF_AA11.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 36404, "y": -300, "z": -24637}
+ "start": {"x": 32246, "y": -300, "z": -24439}
},
{
"start": {"x": 28805, "y": -300, "z": -17103},
@@ -3320,23 +3134,13 @@
"start": {"x": 28810, "y": -300, "z": -17094}
},
{
- "start": {"x": 18672, "y": -300, "z": -31826},
+ "start": {"x": 21728, "y": -300, "z": -22110},
"components": [
- {"type": "rc", "position": 0, "name": "RC_AA11.05" ,"reverse": true, "devices":[]}
+ {"type": "rbtsc", "position": 0, "name": "RBTSC_AB11.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 18681, "y": -300, "z": -31821}
- },
- {
- "start": {"x": 22078, "y": -300, "z": -22467},
- "components": [
- {"type": "rbtsc", "position": 0, "name": "RBTSC_AB11.05" ,"reverse": true, "devices":[]},
- {"type": "rbtsilk", "position": 1300, "name": "RBTSILK_AB11.05" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 12057, "y": -300, "z": -12270}
+ "start": {"x": 21735, "y": -300, "z": -22103}
},
{
"start": {"x": 13022, "y": -300, "z": -27303},
@@ -3395,52 +3199,16 @@
"components": [
{"type": "rv", "position": 0, "name": "RV_AA12.05" ,"reverse": true, "devices":[]},
{"type": "rv", "position": 811, "name": "RV_AA12.10" ,"reverse": true, "devices":[]},
- {"type": "rc", "position": 1786, "name": "RCF_AA12.05" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 1643, "name": "RCF_AA12.05" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 41278, "y": -300, "z": 12223}
- },
- {
- "start": {"x": 26327, "y": -300, "z": -15200},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AB12.05" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 26332, "y": -300, "z": -15191}
- },
- {
- "start": {"x": 30449, "y": -300, "z": -14263},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AB12.10" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 30453, "y": -300, "z": -14254}
- },
- {
- "start": {"x": 32464, "y": -300, "z": -8759},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AB12.15" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 32467, "y": -300, "z": -8749}
- },
- {
- "start": {"x": 33491, "y": -300, "z": -2989},
- "components": [
- {"type": "rc", "position": 0, "name": "RC_AB12.20" ,"reverse": true, "devices":[]}
- ]
- },
- {
- "start": {"x": 33492, "y": -300, "z": -2979}
+ "start": {"x": 38902, "y": -300, "z": 11123}
},
{
"start": {"x": 30695, "y": -300, "z": -13666},
"components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB12.05" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 0, "name": "RC_AB12.05" ,"reverse": true, "devices":[]}
]
},
{
@@ -3449,27 +3217,28 @@
{
"start": {"x": 32601, "y": -300, "z": -8128},
"components": [
- {"type": "rilk", "position": 0, "name": "RILK_AB12.10" ,"reverse": true, "devices":[]}
+ {"type": "rc", "position": 0, "name": "RC_AB12.10" ,"reverse": true, "devices":[]}
]
},
{
"start": {"x": 32603, "y": -300, "z": -8118}
},
{
- "start": {"x": 32656, "y": -300, "z": -17072},
+ "start": {"x": 32414, "y": -300, "z": -17269},
"components": [
- {"type": "rd", "position": 0, "name": "RD_AA12.05" ,"reverse": true, "devices":[]}
+ {"type": "rd", "position": 0, "name": "RD_AA12.05" ,"reverse": true, "devices":[]},
+ {"type": "rd", "position": 678, "name": "RD_AA12.15" ,"reverse": true, "devices":[]}
]
},
{
- "start": {"x": 32661, "y": -300, "z": -17063}
+ "start": {"x": 26342, "y": -300, "z": -21592}
},
{
"start": {"x": 36644, "y": -300, "z": -4337},
"components": [
- {"type": "rd", "position": 0, "name": "RD_AA12.10" ,"reverse": true, "devices":[]},
- {"type": "rd", "position": 645, "name": "RD_AA12.15" ,"reverse": true, "devices":[]},
- {"type": "rd", "position": 1288, "name": "RD_AA12.20" ,"reverse": true, "devices":[]}
+ {"type": "rd", "position": 0, "name": "RD_AA12.15" ,"reverse": true, "devices":[]},
+ {"type": "rd", "position": 645, "name": "RD_AA12.20" ,"reverse": true, "devices":[]},
+ {"type": "rd", "position": 1288, "name": "RD_AA12.25" ,"reverse": true, "devices":[]}
]
},
{
--
GitLab