diff --git a/fermi_lattice.json b/fermi_lattice.json
index 02858d8d738a521ccd0cd723081b7e1451f9b6dc..d47ffea83eba40a048af4f84b7b4ff45489740dd 100644
--- a/fermi_lattice.json
+++ b/fermi_lattice.json
@@ -23,17 +23,18 @@
"SSA": "RPS_SSA.01",
"USA": "RPS_USA.01",
"ESA": "RTF_ESA.01"
- }
+ },
+ "wallColor": "red"
},
"linac": {
"sections": [
{
- "start": {"x": -173929, "z": -5811},
+ "start": {"x": -173929, "z": -5908},
"components": [
{"type": "INJ", "position": 0, "name": "INJ_01"},
- {"type": "gun", "position": -200, "name": "GUN_INJ.01"},
+ {"type": "gun", "position": -250, "name": "GUN_INJ.01"},
+ {"type": "SOL", "position": 30, "name": "SOL_INJ.01"},
{"type": "sip", "position": 30, "name": "SIP150_INJ.01", "offset2d": [30, -40], "labelReverse": [90, -220, 150], "embedded": ["SIP75_INJ.01", "SIP75_INJ.02"]},
- {"type": "SOL", "position": -130, "name": "SOL_INJ.01"},
{"type": "vlv", "position": 200, "name": "VLV_INJ.01", "labelReverse": [90, 900, 150]},
{"type": "sip", "position": 270, "name": "SIP55_INJ.01", "offset2d": [30, -40], "labelReverse": [90, -160, 150], "embedded": ["SIP75_SPINJ.01"]},
{"type": "correctorfermi", "position": 400, "ps": ["PSCH_INJ.01","PSCV_INJ.01"], "name": "CHV_INJ.01"},
@@ -46,8 +47,7 @@
{"type": "correctorfermi", "position": 2051, "ps": ["PSCH_INJ.02","PSCV_INJ.02"], "name": "CHV_INJ.02"},
{"type": "vlv", "position": 2390, "name": "VLV_L00.01", "labelReverse": [90, 910, 130]},
{"type": "sip", "position": 2550, "name": "SIP75_L00.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L00.02", "SIP20_L00.01"]},
- {"type": "cavitylinac", "position": 2702, "length": 1700, "name": "ACCT_L00.01"},
- {"type": "SOL", "position": 4636, "name": "SOL_L0.01"},
+ {"type": "cavitylinac", "position": 2702, "length": 1700, "name": "K2 - ACCT_L00.01"},
{"type": "ACCT", "position": 4221, "name": "ACCT_L00.01"},
{"type": "blm", "position": 4221, "name": "BLM_ACCT_L00.01"},
{"type": "ACCT", "position": 4887, "name": "ACCT0_L00.01"},
@@ -58,10 +58,10 @@
{"type": "blm", "position": 5339, "name": "BLM_Q_L00.02"},
{"type": "flsc", "position": 5841, "name": "MSCR_L00.01"},
{"type": "blm", "position": 5841, "name": "BLM_MSCR_L00.01"},
+ {"type": "SOL", "position": 6100, "name": "SOL_L00.02"},
{"type": "sip", "position": 6200, "name": "SIP75_L00.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L00.02", "SIP20_L00.03", "SIP20_L00.04"]},
{"type": "ACCT0", "position": 5598, "name": "ACCT0_L00.02"},
- {"type": "SOL", "position": 5906, "name": "SOL_L00.02"},
- {"type": "cavitylinac", "position": 6402, "length": 1700, "name": "ACCT_L00.02"},
+ {"type": "cavitylinac", "position": 6402, "length": 1700, "name": "K2 - ACCT_L00.02"},
{"type": "ACCT", "position": 7491, "name": "ACCT_L00.02"},
{"type": "blm", "position": 8100, "name": "BLM_ACCT_L00.02"},
{"type": "ACCT0", "position": 9207, "name": "ACCT0_L00.02"},
@@ -83,7 +83,7 @@
{"type": "blm", "position": 11881, "name": "BLM_MSCR_LH.01"},
{"type": "correctorfermi", "position": 12281, "ps": ["PSCH_LH.02","PSCV_LH.02"], "name": "CHV_LH.02"},
{"type": "bpm", "position": 12736, "name": "BPM_LH.01", "labelReverse": [90, 1060, 130]},
- {"type": "BAM", "position": 13044, "name": "BAM_LH.01"},
+ {"type": "SOL", "position": 12980, "name": "BAM_LH.01", "labelReverse": [90, 1060, 130]},
{"type": "bpm", "position": 13200, "name": "BPM_LH.02", "labelReverse": [90, 1060, 130]},
{"type": "sip", "position": 13600, "name": "SIP55_LH.02", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
@@ -91,19 +91,19 @@
]
},
{
- "start": {"x": -159733, "z": -5811},
+ "start": {"x": -159733, "z": -5908},
"chamber": {"type": "chamber"},
"components": [
]
},
{
- "start": {"x": -173928, "z": -5811},
+ "start": {"x": -173928, "z": -5908},
"components": [
]
},
{
"bending": {"type": "bending", "label": "show", "rotateY": "-PI", "length": 200, "name": "B_SPINJ.01", "labelReverse": [63.5, 900, 0]},
- "start": {"x": -172609, "z": -5811},
+ "start": {"x": -172609, "z": -5908},
"components": [
{"type": "cbpm", "position": 350, "name": "BPM_SPINJ.01", "labelReverse": [90, -350, 100]},
{"type": "quadrupolefermi", "position": 530, "name": "Q_SPINJ.01", "labelReverse": [90, -350, 200]},
@@ -118,14 +118,14 @@
]
},
{
- "start": {"x": -159733, "z": -5809},
+ "start": {"x": -159733, "z": -5908},
"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.01", "labelReverse": [90, 780, 0]},
"components": [
{"type": "blm", "position": 100, "name": "BLM_B_LH.01"}
]
},
{
- "start": {"x": -159233, "z": -5782},
+ "start": {"x": -159233, "z": -6008},
"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.02", "labelReverse": [90, 780, 0]},
"chamber": {"type": "chamber"},
"components": [
@@ -140,7 +140,7 @@
]
},
{
- "start": {"x": -156205, "z": -5782},
+ "start": {"x": -156205, "z": -6008},
"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.03", "labelReverse": [270, 880, 100]},
"chamber": {"type": "chamber"},
"components": [
@@ -148,7 +148,7 @@
]
},
{
- "start": {"x": -155706, "z": -5809},
+ "start": {"x": -155706, "z": -5908},
"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 200, "name": "B_LH.04", "labelReverse": [270, 880, 100]},
"chamber": {"type": "chamber"},
"components": [
@@ -169,8 +169,8 @@
"components": [
{"type": "blm", "position": 100, "name": "BLM_B_SPLH.01_R"},
{"type": "blm", "position": 100, "name": "BLM_B_SPLH.01_L"},
- {"type": "cbpm", "position": 689, "name": "BPM_LH.03B"},
- {"type": "CM", "position": 1893, "name": "CM_SPLH.01"},
+ {"type": "cbpm", "position": 689, "name": "BPM_SPLH.01"},
+ {"type": "cm", "position": 1393, "name": "CM_SPLH.01"},
{"type": "flsc", "position": 2293, "name": "MSCR_SPLH.01", "labelReverse": [270, -440, -120]},
{"type": "blm", "position": 2293, "name": "BLM_MSCR_SPLH.01"},
{"type": "BD", "position": 2435, "name": "BD_SPLH.01"},
@@ -202,7 +202,7 @@
{"type": "sip", "position": 2300, "name": "SIP300_L01.01", "offset2d": [30, -40], "labelReverse": [90, -350, 150], "embedded": ["SIP75_L01.01", "SIP75_L01.02", "SIP300_L01.02", "SIP300_L01.03"]},
{"type": "LH", "position": 2011, "name": "LH_02"},
{"type": "L01", "position": 2011, "name": "L01"},
- {"type": "cavitylinac", "position": 2611, "length": 3400, "name": "ACCT_L01.01"},
+ {"type": "cavitylinac", "position": 2611, "length": 3400, "name": "K3 - ACCT_L01.01"},
{"type": "blm", "position": 2711, "name": "BLM_ACCT_L01.01"},
{"type": "ACCT", "position": 4419, "name": "ACCT_L01.01"},
{"type": "ACCT", "position": 6807, "name": "ACCT_L01.01"},
@@ -212,21 +212,20 @@
{"type": "blm", "position": 7023, "name": "BLM_Q_L01.01"},
{"type": "correctorfermi", "position": 7414, "ps": ["PSCH_L01.01","PSCV_L01.01"], "name": "CHV_L01.01"},
{"type": "sip", "position": 7755, "name": "SIP300_L01.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
- {"type": "cavitylinac", "position": 7905, "length": 3400, "name": "ACCT_L01.02"},
+ {"type": "cavitylinac", "position": 7905, "length": 3400, "name": "K3 - ACCT_L01.02"},
{"type": "blm", "position": 8005, "name": "BLM_ACCT_L01.02"},
{"type": "ACCT", "position": 10015, "name": "ACCT_L01.02"},
{"type": "ACCT", "position": 12803, "name": "ACCT_L01.02"},
- {"type": "correctorfermi", "position": 11800, "ps": ["PSCH_L01.02","PSCV_L01.02"], "name": "CHV_L01.02"},
+ {"type": "bpm", "position": 11800, "name": "BPM_L01.02", "labelReverse": [90, 1070, 130]},
{"type": "sip", "position": 12050, "name": "SIP300_L01.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
{"type": "vlv", "position": 12250, "name": "VLV_XBL01.01", "labelReverse": [90, 1040, 130]},
- {"type": "bpm", "position": 12450, "name": "BPM_L01.02", "labelReverse": [90, 1070, 130]},
- {"type": "quadrupolefermi", "position": 12609, "name": "Q_L01.02"},
+ {"type": "quadrupolefermi", "position": 12400, "name": "Q_L01.02"},
{"type": "blm", "position": 12509, "name": "BLM_Q_L01.02", "labelReverse": [90, 1070, 130]},
- {"type": "cavitylinac", "position": 12841, "length": 1000,"name": "ACCH_L01.01"},
+ {"type": "correctorfermi", "position": 12609, "ps": ["PSCH_L01.02","PSCV_L01.02"], "name": "CHV_L01.02"},{"type": "cavitylinac", "position": 12841, "length": 1000,"name": "ACCH_L01.01"},
{"type": "bpm", "position": 13737, "name": "BPM_L01.03", "labelReverse": [90, 1070, 130]},
{"type": "vlv", "position": 13930, "name": "VLV_L01.02", "labelReverse": [90, 920, 130]},
{"type": "sip", "position": 14060, "name": "SIP300_L01.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L01.05", "SIP75_L01.06", "SIP300_L01.06"]},
- {"type": "cavitylinac", "position": 14225, "length": 3400,"name": "ACCT_L01.03"},
+ {"type": "cavitylinac", "position": 14225, "length": 3400,"name": "K5 - ACCT_L01.03"},
{"type": "blm", "position": 14225, "name": "BLM_ACCT_L01.03"},
{"type": "ACCT", "position": 16511, "name": "ACCT_L01.04"},
{"type": "blm", "position": 16511, "name": "BLM_ACCT_L01.04"},
@@ -239,7 +238,7 @@
{"type": "plc", "position": 19036, "name": "SPMO_INL03.01", "offset3d": [0, -700, 0], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
{"type": "correctorfermi", "position": 19676, "ps": ["PSCH_L01.03","PSCV_L01.03"], "name": "CHV_L01.03"},
{"type": "sip", "position": 19996, "name": "SIP300_L01.07", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
- {"type": "cavitylinac", "position": 20196, "length": 3400, "name": "ACCT_L01.04"},
+ {"type": "cavitylinac", "position": 20196, "length": 3400, "name": "K5 - ACCT_L01.04"},
{"type": "ACCT", "position": 22106, "name": "ACCT_L01.04"},
{"type": "ACCT", "position": 24494, "name": "ACCT_L01.04"},
{"type": "sip", "position": 24100, "name": "SIP300_L01.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150]},
@@ -301,8 +300,8 @@
{"type": "sip", "position": 1245, "name": "SIP55_BC01.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
{"type": "correctorfermi", "position": 1545, "ps": ["PSCH_BC01.01","PSCV_BC01.01"], "name": "CHV_BC01.01", "labelReverse": [90, 1100, 200]},
{"type": "blm", "position": 1545, "name": "BLM_CHV_BC01.01"},
- {"type": "BAM", "position": 1917, "name": "BAM_BC01.01"},
- {"type": "bpm", "position": 1908, "name": "BPM_BC01.02", "labelReverse": [90, 1250, 130]},
+ {"type": "SOL", "position": 1830, "name": "BAM_BC01.01", "labelReverse": [90, 1110, 150]},
+ {"type": "bpm", "position": 1998, "name": "BPM_BC01.02", "labelReverse": [90, 1250, 130]},
{"type": "vlv", "position": 2200, "name": "VLV_BC01.02", "labelReverse": [90, 1110, 150]},
{"type": "sip", "position": 2600, "name": "SIP55_BC01.02","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
{"type": "DCAV", "position": 3022, "name": "DCAV_BC01.01"},
@@ -388,7 +387,7 @@
{"type": "sip", "position": 3910, "name": "SIP300_L02.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.01", "SIP75_L02.03", "SIP300_L02.02"]},
{"type": "BC01", "position": 3910, "name": "BC01_02"},
{"type": "L02", "position": 3910, "name": "L02"},
- {"type": "cavitylinac", "position": 4110, "length": 3400, "name": "ACCT_L02.01"},
+ {"type": "cavitylinac", "position": 4110, "length": 3400, "name": "K6 - ACCT_L02.01"},
{"type": "blm", "position": 4110, "name": "BLM_ACCT_L02.01"},
{"type": "ACCT", "position": 6320, "name": "ACCT_L02.01"},
{"type": "ACCT", "position": 8708, "name": "ACCT_L02.01"},
@@ -398,7 +397,7 @@
{"type": "blm", "position": 8953, "name": "BLM_Q_L02.01"},
{"type": "correctorfermi", "position": 8993, "ps": ["PSCH_L02.01","PSCV_L02.01"], "name": "CHV_L02.01"},
{"type": "sip", "position": 9393, "name": "SIP300_L02.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.03", "SIP75_L02.04"]},
- {"type": "cavitylinac", "position": 9606, "length": 3400, "name": "ACCT_L02.02"},
+ {"type": "cavitylinac", "position": 9606, "length": 3400, "name": "K6 - ACCT_L02.02"},
{"type": "blm", "position": 9606, "name": "BLM_ACCT_L02.02"},
{"type": "ACCT", "position": 11916, "name": "ACCT_L02.02"},
{"type": "ACCT", "position": 14304, "name": "ACCT_L02.02"},
@@ -410,7 +409,7 @@
{"type": "correctorfermi", "position": 14429, "ps": ["PSCH_L02.02","PSCV_L02.02"], "name": "CHV_L02.02"},
{"type": "vlv", "position": 14800, "name": "VLV_L02.02", "labelReverse": [90, 940, 150]},
{"type": "sip", "position": 15050, "name": "SIP300_L02.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L02.05", "SIP75_L02.06", "SIP300_L02.06"]},
- {"type": "cavitylinac", "position": 15302, "length": 3400, "name": "ACCT_L02.03"},
+ {"type": "cavitylinac", "position": 15302, "length": 3400, "name": "K7 - ACCT_L02.03"},
{"type": "blm", "position": 15102, "name": "BLM_ACCT_L02.03", "labelReverse": [90, 1080, 130]},
{"type": "ACCT", "position": 17512, "name": "ACCT_L02.03"},
{"type": "ACCT", "position": 19900, "name": "ACCT_L02.03"},
@@ -420,7 +419,7 @@
{"type": "blm", "position": 20000, "name": "BLM_Q_L02.03"},
{"type": "correctorfermi", "position": 20326, "ps": ["PSCH_L02.03","PSCV_L02.03"], "name": "CHV_L02.03"},
{"type": "sip", "position": 20626, "name": "SIP300_L02.07","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
- {"type": "cavitylinac", "position": 20826, "name": "ACCT_L02.04"},
+ {"type": "cavitylinac", "position": 20826, "name": "K7 - ACCT_L02.04"},
{"type": "ACCT", "position": 23300, "name": "ACCT_L02.04"},
{"type": "blm", "position": 23300, "name": "BLM_ACCT_L02.04"},
{"type": "sip", "position": 24540, "name": "SIP300_L02.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L03.03"]},
@@ -432,7 +431,7 @@
{"type": "sip", "position": 26100, "name": "SIP300_L03.01","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
{"type": "L02", "position": 25700, "name": "L02"},
{"type": "L03", "position": 25700, "name": "L03"},
- {"type": "cavitylinac", "position": 26300, "length": 3400, "name": "ACCBT_L03.01"},
+ {"type": "cavitylinac", "position": 26300, "length": 3400, "name": "K8 - ACCBT_L03.01"},
{"type": "ACCBT", "position": 27931, "name": "ACCBT_L03.01"},
{"type": "ACCBT", "position": 31133, "name": "ACCBT_L03.01"},
{"type": "sip", "position": 30300, "name": "SIP300_L03.02","offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L03.02", "SIP75_L03.3", "SIP75_L03.4"]},
@@ -441,7 +440,7 @@
{"type": "blm", "position": 31071, "name": "BLM_Q_L03.01"},
{"type": "correctorfermi", "position": 31595, "ps": ["PSCH_L03.01","PSCV_L03.01"], "name": "CHV_L03.01"},
{"type": "sip", "position": 31895, "name": "SIP300_L03.03","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
- {"type": "cavitylinac", "position": 32159, "length": 3400, "name": "ACCBT_L03.02"},
+ {"type": "cavitylinac", "position": 32159, "length": 3400, "name": "K9 - ACCBT_L03.02"},
{"type": "blm", "position": 31933, "name": "BLM_ACCBT_L03.02"},
{"type": "ACCBT", "position": 35164, "name": "ACCBT_L03.02"},
{"type": "ACCBT", "position": 38365, "name": "ACCBT_L03.02"},
@@ -471,19 +470,19 @@
]
},
{
- "start": {"x": -62626, "z": -5811},
+ "start": {"x": -62626, "z": -6060},
"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.02", "labelReverse": [90, 890, 50]},
"chamber": {"type": "chamber"},
"components": [
{"type": "blm", "position": 100, "name": "BLM_B_BC02.02_L"},
{"type": "blm", "position": 100, "name": "BLM_B_BC02.02_R"},
- {"type": "SCRPH", "position": 524, "name": "SCRPH_BC02.01"},
+ {"type": "SCRPH", "position": 354, "name": "SCRPH_BC02.01"},
{"type": "bpm", "position": 625, "name": "BPM_BC02.01", "labelReverse": [90, 1070, 130]},
{"type": "flsc", "position": 797, "name": "MSCR_BC02.01"}
]
},
{
- "start": {"x": -61131, "z": -5811},
+ "start": {"x": -61131, "z": -6060},
"bending": {"type": "bending", "label": "show", "rotateY": "PI", "length": 400, "name": "B_BC02.03", "labelReverse": [90, 890, 50]},
"chamber": {"type": "chamber"},
"components": [
@@ -503,7 +502,7 @@
{"type": "blm", "position": 100, "name": "BLM_B_BC02.04_R"},
{"type": "CBLM", "position": 331, "name": "CBLM_BC02.01"},
{"type": "GBLM", "position": 979, "name": "GBLM_BC02.01"},
- {"type": "BAM", "position": 1130, "name": "BAM_BC02.01"},
+ {"type": "SOL", "position": 501, "name": "BAM_BC02.01", "labelReverse": [90, 1030, 150]},
{"type": "bpm", "position": 701, "name": "BPM_BC02.02", "labelReverse": [90, 1160, 130]},
{"type": "quadrupolefermi", "position": 940, "name": "Q_BC02.03"},
{"type": "blm", "position": 940, "name": "BLM_Q_BC02.03"},
@@ -513,7 +512,7 @@
{"type": "sip", "position": 1847, "name": "SIP300_L04.01", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.02"]},
{"type": "BC02", "position": 1817, "name": "BC02"},
{"type": "L04", "position": 1817, "name": "L04"},
- {"type": "cavitylinac", "position": 1997, "length": 3400, "name": "ACCBT_L04.01"},
+ {"type": "cavitylinac", "position": 1997, "length": 3400, "name": "K10 - ACCBT_L04.01"},
{"type": "ACCBT", "position": 5048, "name": "ACCBT_L04.01"},
{"type": "ACCBT", "position": 8250, "name": "ACCBT_L04.01"},
{"type": "sip", "position": 5900, "name": "SIP300_L04.02", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.01", "SIP75_L04.02", "SIP75_L04.03", "SIP75_L04.04"]},
@@ -523,7 +522,7 @@
{"type": "flsc", "position": 8112, "name": "MSCR_L04.01"},
{"type": "correctorfermi", "position": 8612, "ps": ["PSCH_L04.01","PSCV_L04.01"], "name": "CHV_L04.01"},
{"type": "sip", "position": 9100, "name": "SIP300_L04.03", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.04"]},
- {"type": "cavitylinac", "position": 9250, "length": 3400, "name": "ACCBT_L04.02"},
+ {"type": "cavitylinac", "position": 9250, "length": 3400, "name": "K11 - ACCBT_L04.02"},
{"type": "ACCBT", "position": 12281, "name": "ACCBT_L04.02"},
{"type": "ACCBT", "position": 15482, "name": "ACCBT_L04.02"},
{"type": "sip", "position": 13062, "name": "SIP300_L04.04", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.05", "SIP75_L04.06", "SIP75_L04.07", "SIP75_L04.08"]},
@@ -533,7 +532,7 @@
{"type": "correctorfermi", "position": 15507, "ps": ["PSCH_L04.02","PSCV_L04.02"], "name": "CHV_L04.02"},
{"type": "vlv", "position": 16000, "name": "VLV_L04.02"},
{"type": "sip", "position": 16350, "name": "SIP300_L04.05", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.06"]},
- {"type": "cavitylinac", "position": 16582, "length": 3400, "name": "ACCBT_L04.03"},
+ {"type": "cavitylinac", "position": 16582, "length": 3400, "name": "K12 - ACCBT_L04.03"},
{"type": "ACCBT", "position": 19513, "name": "ACCBT_L04.03"},
{"type": "ACCBT", "position": 22715, "name": "ACCBT_L04.03"},
{"type": "sip", "position": 20400, "name": "SIP300_L04.06", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.09", "SIP75_L04.10", "SIP75_L04.11", "SIP75_L04.12"]},
@@ -542,7 +541,7 @@
{"type": "blm", "position": 21945, "name": "BLM_Q_L04.03"},
{"type": "correctorfermi", "position": 22740, "ps": ["PSCH_L04.03","PSCV_L04.03"], "name": "CHV_L04.03"},
{"type": "sip", "position": 23440, "name": "SIP300_L04.07", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP300_L04.08"]},
- {"type": "cavitylinac", "position": 23615, "length": 3400, "name": "ACCBT_L04.04"},
+ {"type": "cavitylinac", "position": 23615, "length": 3400, "name": "K13 - ACCBT_L04.04"},
{"type": "ACCBT", "position": 26746, "name": "ACCBT_L04.04"},
{"type": "ACCBT", "position": 29947, "name": "ACCBT_L04.04"},
{"type": "sip", "position": 27600, "name": "SIP300_L04.08", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.13", "SIP75_L04.14", "SIP75_L04.15", "SIP75_L04.16"]},
@@ -553,7 +552,7 @@
{"type": "correctorfermi", "position": 29812, "ps": ["PSCH_L04.04","PSCV_L04.04"], "name": "CHV_L04.04"},
{"type": "vlv", "position": 30400, "name": "VLV_L04.03"},
{"type": "sip", "position": 30800, "name": "SIP300_L04.09","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
- {"type": "cavitylinac", "position": 30947, "length": 3400, "name": "ACCBT_L04.05"},
+ {"type": "cavitylinac", "position": 30947, "length": 3400, "name": "K14 - ACCBT_L04.05"},
{"type": "ACCBT", "position": 33978, "name": "ACCBT_L04.05"},
{"type": "ACCBT", "position": 37180, "name": "ACCBT_L04.05"},
{"type": "sip", "position": 34800, "name": "SIP75_L04.17", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.18", "SIP75_L04.19", "SIP75_L04.20"]},
@@ -563,27 +562,30 @@
{"type": "correctorfermi", "position": 37305, "ps": ["PSCH_L04.05","PSCV_L04.05"], "name": "CHV_L04.05"},
{"type": "blm", "position": 37305, "name": "BLM_CHV_L04.05"},
{"type": "sip", "position": 38100, "name": "SIP75_L04.25", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.22", "SIP75_L04.23", "SIP75_L04.24", "SIP75_L04.25", "SIP55_L04.01", "SIP55_L04.02", "SIP75_L04.26", "SIP55_L04.03", "SIP55_L04.04"]},
- {"type": "cavitylinac", "position": 38290, "length": 3400, "name": "ACCBT_L04.06"},
+ {"type": "cavitylinac", "position": 39090, "length": 1700, "name": "K15 - ACCBT_L04.06"},
{"type": "ACCT", "position": 39660, "name": "ACCT_L04.06"},
- {"type": "bpm", "position": 42160, "name": "BPM_L04.06", "labelReverse": [90, 1100, 130]},
- {"type": "blm", "position": 42417, "name": "BLM_CHV_L04.06"},
- {"type": "correctorfermi", "position": 42500, "ps": ["PSCH_L04.06","PSCV_L04.06"], "name": "CHV_L04.06"},
- {"type": "blm", "position": 42677, "name": "BLM_Q_L04.06"},
- {"type": "quadrupolefermi", "position": 43200, "name": "Q_L04.06"},
- {"type": "ACCT", "position": 43297, "name": "ACCT_L04.07"},
- {"type": "sip", "position": 44850, "name": "SIP75_L04.26", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.28", "SIP75_L04.29", "SIP75_L04.30"]},
- {"type": "quadrupolefermi", "position": 45133, "name": "Q_L04.07"},
- {"type": "blm", "position": 45133, "name": "BLM_Q_L04.07"},
- {"type": "bpm", "position": 45572, "name": "BPM_L04.07", "labelReverse": [90, 1100, 130]},
- {"type": "correctorfermi", "position": 45828, "ps": ["PSCH_L04.07","PSCV_L04.07"], "name": "CHV_L04.07"},
- {"type": "blm", "position": 45828, "name": "BLM_CHV_L04.07"},
- {"type": "sip", "position": 46128, "name": "SIP75_L04.27","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
- {"type": "cavitylinac", "position": 46328, "length": 3400, "name": "ACCBT_L04.07"},
- {"type": "DCAV", "position": 47430, "name": "DCAV_L04.01"},
- {"type": "blm", "position": 47430, "name": "BLM_DCAV_L04.01"},
- {"type": "L04", "position": 49680, "name": "L04"},
+
+ {"type": "bpm", "position": 41760, "name": "BPM_L04.06", "labelReverse": [90, 1100, 130]},
+ {"type": "correctorfermi", "position": 42200, "ps": ["PSCH_L04.06","PSCV_L04.06"], "name": "CHV_L04.06"},
+ {"type": "blm", "position": 42217, "name": "BLM_CHV_L04.06"},
+ {"type": "blm", "position": 42400, "name": "BLM_Q_L04.06"},
+ {"type": "quadrupolefermi", "position": 42800, "name": "Q_L04.06"},
+ {"type": "cavitylinac", "position": 43500, "length": 1700, "name": "K15 - ACCBT_L04.07"},
+ {"type": "ACCT", "position": 43597, "name": "ACCT_L04.07"},
+
+ {"type": "sip", "position": 45550, "name": "SIP75_L04.26", "offset2d": [30, -40], "labelReverse": [90, -450, 150], "embedded": ["SIP75_L04.28", "SIP75_L04.29", "SIP75_L04.30"]},
+ {"type": "quadrupolefermi", "position": 45933, "name": "Q_L04.07"},
+ {"type": "blm", "position": 45933, "name": "BLM_Q_L04.07"},
+ {"type": "bpm", "position": 46472, "name": "BPM_L04.07", "labelReverse": [90, 1100, 130]},
+ {"type": "correctorfermi", "position": 46828, "ps": ["PSCH_L04.07","PSCV_L04.07"], "name": "CHV_L04.07"},
+ {"type": "blm", "position": 46928, "name": "BLM_CHV_L04.07"},
+ {"type": "sip", "position": 47328, "name": "SIP75_L04.27","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
+ {"type": "cavitylinac", "position": 47628, "length": 1700, "name": "HERFDY"},
+ {"type": "blm", "position": 48230, "name": "BLM_DCAV_L04.01"},
+ {"type": "L04", "position": 49980, "name": "L04"},
+
{"type": "TLS", "position": 49680, "name": "TLS_01"},
- {"type": "quadrupolefermi", "position": 50255, "name": "Q_TLS.01"},
+ {"type": "quadrupolefermi", "position": 50055, "name": "Q_TLS.01"},
{"type": "sip", "position": 50550, "name": "SIP75_L04.28","offset2d": [30, -40], "labelReverse": [90, -450, 150]},
{"type": "blm", "position": 50255, "name": "BLM_Q_TLS.01"},
{"type": "quadrupolefermi", "position": 50955, "name": "Q_TLS.02"},
@@ -592,8 +594,8 @@
{"type": "vlv", "position": 51300, "name": "VLV_TLS.01"},
{"type": "correctorfermi", "position": 51495, "ps": ["PSCH_TLS.01","PSCV_TLS.01"], "name": "CHV_TLS.01"},
{"type": "blm", "position": 51605, "name": "BLM_CHV_TLS.01"},
- {"type": "bpm", "position": 52052, "name": "BPM_TLS.01", "labelReverse": [90, 1100, 130]},
- {"type": "flsc", "position": 51810, "name": "MSCR_TLS.01"},
+ {"type": "bpm", "position": 51810, "name": "BPM_TLS.01", "labelReverse": [90, 1100, 130]},
+ {"type": "flsc", "position": 52100, "name": "MSCR_TLS.01"},
{"type": "blm", "position": 52495, "name": "BLM_MSCR_TLS.01"},
{"type": "GCOL", "position": 52315, "name": "GCOL_TLS.01"},
{"type": "sip", "position": 52315, "name": "SIP300_TLS.01","offset2d": [30, -40], "offset3d": [0, -300, 0], "labelReverse": [90, -450, 150]},
@@ -674,6 +676,7 @@
{
"start": {"x": -3112, "z": -5645},
"components": [
+ {"type": "flsc", "position": 400, "name": "MSCR_TLS.02"},
{"type": "sip", "position": 600, "name": "SIP55_TLS.02","offset2d": [30, -40], "labelReverse": [90, 1000, 130]},
{"type": "correctorfermi", "position": 800, "ps": ["PSCH_TLS.02","PSCV_TLS.02"], "name": "CHV_TLS.02"},
{"type": "bpm", "position": 1699, "name": "BPM_TLS.02", "labelReverse": [90, 1100, 150]},
@@ -685,7 +688,8 @@
{"type": "quadrupolefermi", "position": 2899, "name": "Q_TLS.05"},
{"type": "correctorfermi", "position": 3221, "ps": ["PSCH_TLS.03","PSCV_TLS.03"], "name": "CHV_TLS.03"},
{"type": "quadrupolefermi", "position": 3599, "name": "Q_TLS.06"},
- {"type": "blm", "position": 3806, "name": "BPM_TLS.03"},
+ {"type": "blm", "position": 3806, "name": "BLM_TLS.03"},
+ {"type": "bpm", "position": 3899, "name": "BPM_TLS.03", "labelReverse": [90, 1200, 150]},
{"type": "quadrupolefermi", "position": 4114, "name": "Q_TLS.07"},
{"type": "bst", "position": 4614, "name": "BST_TLS.01"},
{"type": "sip", "position": 5014, "name": "SIP75_TLS.01","offset2d": [30, -40], "labelReverse": [90, 1000, 130]},
@@ -1925,168 +1929,168 @@
]
},
{
- "start": {"x": 180000, "y": 4000, "z": -8811},
+ "start": {"x": 180000, "y": 5000, "z": -8811},
"bending": {"rotateY": "PI"},
"components": [
]
},
{
- "start": {"x": -122000, "y": 4000, "z": -8000},
+ "start": {"x": -122000, "y": 5000, "z": -8000},
"components": [
{"type": "rar3", "position": 0, "name": "RAR3_KGXS.01", "labelReverse": [-90, 2800, -500]}
]
},
{
- "start": {"x": -122000, "y": 4000, "z": -10000}
+ "start": {"x": -122000, "y": 5000, "z": -10000}
},
{
- "start": {"x": -178800, "y": 4000, "z": -8000},
+ "start": {"x": -178800, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KGSP", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -178800, "y": 4000, "z": -14000},
+ "start": {"x": -178800, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -169500, "y": 4000, "z": -8000},
+ "start": {"x": -169500, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG01", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -169500, "y": 4000, "z": -14000},
+ "start": {"x": -169500, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -152800, "y": 4000, "z": -8000},
+ "start": {"x": -152800, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG02", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -152800, "y": 4000, "z": -14000},
+ "start": {"x": -152800, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -143800, "y": 4000, "z": -8000},
+ "start": {"x": -143800, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG03", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -143800, "y": 4000, "z": -14000},
+ "start": {"x": -143800, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -136150, "y": 4000, "z": -8000},
+ "start": {"x": -136150, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG04", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -136150, "y": 4000, "z": -14000},
+ "start": {"x": -136150, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -105300, "y": 4000, "z": -8000},
+ "start": {"x": -105300, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG05", "length": -17000, "labelReverse": [-90, -17000, -1000]}
]
},
{
- "start": {"x": -105300, "y": 4000, "z": -14000},
+ "start": {"x": -105300, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -95700, "y": 4000, "z": -8000},
+ "start": {"x": -95700, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG06", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -95700, "y": 4000, "z": -14000},
+ "start": {"x": -95700, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -81200, "y": 4000, "z": -8000},
+ "start": {"x": -81200, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG07", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -81200, "y": 4000, "z": -14000},
+ "start": {"x": -81200, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -74200, "y": 4000, "z": -8000},
+ "start": {"x": -74200, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG08", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -74200, "y": 4000, "z": -14000},
+ "start": {"x": -74200, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -52600, "y": 4000, "z": -8000},
+ "start": {"x": -52600, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG09", "labelReverse": [-90, -9000, -1000]}
]
},
{
- "start": {"x": -52600, "y": 4000, "z": -14000},
+ "start": {"x": -52600, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -44900, "y": 4000, "z": -8000},
+ "start": {"x": -44900, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG10", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -44900, "y": 4000, "z": -14000},
+ "start": {"x": -44900, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -37600, "y": 4000, "z": -8000},
+ "start": {"x": -37600, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG11", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -37600, "y": 4000, "z": -14000},
+ "start": {"x": -37600, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -31400, "y": 4000, "z": -8000},
+ "start": {"x": -31400, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG12", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -31400, "y": 4000, "z": -14000},
+ "start": {"x": -31400, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -24400, "y": 4000, "z": -8000},
+ "start": {"x": -24400, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG13", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -24400, "y": 4000, "z": -14000},
+ "start": {"x": -24400, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{
- "start": {"x": -17100, "y": 4000, "z": -8000},
+ "start": {"x": -17100, "y": 5000, "z": -8000},
"components": [
{"type": "label", "position": 2000, "name": "KG14", "labelReverse": [-90, -1000, -1000]}
]
},
{
- "start": {"x": -17100, "y": 4000, "z": -14000},
+ "start": {"x": -17100, "y": 5000, "z": -14000},
"chamber": {"type": "wall"}
},
{