diff --git a/elettra_lattice.json b/elettra_lattice.json
index 368c2f5461e7cdaf0b2ae770d37b3dfa77d51820..43a7ee8b5cd48d4380b222e6398b4f23dd7d5057 100644
--- a/elettra_lattice.json
+++ b/elettra_lattice.json
@@ -6,14 +6,17 @@
"start": {"x": 19415, "z": 14125},
"components": [
{"type": "gun", "position": -300, "name": "Gun", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary"},
- {"type": "lens", "position": 130, "name": "LENS_P1.1", "labelReverse": [270, 900, -70]},
+ {"type": "sip", "position": 0, "name": "SIP40_P1.1", "offset2d": [0, 40]},
+ {"type": "lens", "position": 110, "name": "LENS_P1.1", "labelReverse": [270, 900, -70]},
{"type": "vlv", "position": 190, "name": "VLV_P1.1"},
{"type": "cm", "position": 360, "name": "CM_P1.1"},
- {"type": "lens", "position": 500, "name": "LENS_P1.2", "labelReverse": [270, 900, -50]},
- {"type": "lens", "position": 700, "name": "LENS_P1.3", "labelReverse": [270, 900, -60]},
+ {"type": "sip", "position": 500, "name": "SIP40_P1.2", "offset2d": [0, 40]},
+ {"type": "lens", "position": 600, "name": "LENS_P1.2", "labelReverse": [270, 900, -50]},
+ {"type": "lens", "position": 750, "name": "LENS_P1.3", "labelReverse": [270, 900, -60]},
{"type": "lens", "position": 890, "name": "LENS_P1.4", "labelReverse": [270, 900, -50]},
- {"type": "lens", "position": 1050, "name": "LENS_P1.5", "labelReverse": [270, 900, -100]},
- {"type": "cm", "position": 1150, "name": "CM_P1.2"},
+ {"type": "sip", "position": 1000, "name": "SIP40_P1.3", "offset2d": [0, 40]},
+ {"type": "lens", "position": 1100, "name": "LENS_P1.5", "labelReverse": [270, 900, -100]},
+ {"type": "cm", "position": 1190, "name": "CM_P1.2"},
{"type": "quadrupolebooster", "position": 1366, "length": 50, "name": "Q_P1.1"},
{"type": "quadrupolebooster", "position": 1649, "length": 50, "name": "Q_P1.2"},
{"type": "quadrupolebooster", "position": 1932, "length": 50, "name": "Q_P1.3"},
@@ -24,9 +27,11 @@
{"type": "correctorbooster", "position": 2621.5, "name": "CH_P1.1"},
{"type": "correctorbooster", "position": 2881.5, "name": "CV_P1.1"},
{"type": "vlv", "position": 3100, "name": "VLV_P1.2"},
+ {"type": "sip", "position": 3400, "name": "SIP300_P1.1", "offset2d": [0, 40], "labelReverse": [270, 930, -100]},
{"type": "cavitylinac", "position": 4804, "length": 3300, "rotateY": "PI/2", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary", "offset2d": [1100, 100], "name": "ACCT_P1.1"},
- {"type": "vlv", "position": 6700, "name": "VLV_P1.3"},
- {"type": "cm", "position": 7000, "name": "CM_P1.3"},
+ {"type": "sip", "position": 6800, "name": "SIP300_P1.2", "offset2d": [0, 40], "labelReverse": [270, 930, -100]},
+ {"type": "vlv", "position": 6900, "name": "VLV_P1.3"},
+ {"type": "cm", "position": 7100, "name": "CM_P1.3"},
{"type": "correctorbooster", "position": 7256.5, "name": "CH_P1.2"},
{"type": "correctorbooster", "position": 7486.5, "name": "CV_P1.2"},
{"type": "quadrupolebooster", "position": 7772, "length": 50, "name": "Q_P1.4"},
@@ -36,7 +41,9 @@
{"type": "blm", "position": 8783, "name": "BPM_P1.2_R"},
{"type": "blm", "position": 8783, "name": "BPM_P1.2_L"},
{"type": "flsc", "position": 9198, "name": "FLSC_P1.3"},
+ {"type": "sip", "position": 9398, "name": "SIP300_P1.3", "offset2d": [0, 40], "labelReverse": [270, 900, -100]},
{"type": "cavitylinac", "position": 11281, "length": 3300, "rotateY": "PI/2", "href": "https://puma-01.elettra.eu/spa/index.html?s=preinj_summary","offset2d": [1500, 170], "name": "ACCT_P1.2"},
+ {"type": "sip", "position": 12850, "name": "SIP300_P1.4", "offset2d": [0, 40], "labelReverse": [270, 900, -100]},
{"type": "vlv", "position": 13000, "name": "VLV_PTB1.1"},
{"type": "cm", "position": 13316, "name": "CM_PTB1.1"},
{"type": "correctorbooster", "position": 13663.5, "name": "CV_PTB1.1"},
@@ -46,8 +53,9 @@
{"type": "blm", "position": 14609, "name": "BPM_PTB1.1_L"},
{"type": "quadrupolebooster", "position": 14751.9, "length": 175, "name": "Q_PTB1.1"},
{"type": "blm", "position": 14952, "name": "BLM_Q_PTB1.1"},
- {"type": "quadrupolebooster", "position": 15121.9, "length": 175, "name": "Q_PTB1.2"},
- {"type": "blm", "position": 15322, "name": "BLM_Q_PTB1.2"}
+ {"type": "sip", "position": 15072, "name": "SIP55_PTB1.1", "offset2d": [0, 40], "labelReverse": [270, 950, -100]},
+ {"type": "quadrupolebooster", "position": 15321.9, "length": 175, "name": "Q_PTB1.2"},
+ {"type": "blm", "position": 15422, "name": "BLM_Q_PTB1.2"}
]
},
{
@@ -72,17 +80,19 @@
{"type": "blm", "position": 2326, "name": "BLM_Q_PTB1.5"},
{"type": "correctorbooster", "position": 2744.9, "name": "CH_PTB1.3"},
{"type": "correctorbooster", "position": 2930.9, "name": "CV_PTB1.3"},
- {"type": "quadrupolebooster", "position": 3183.9, "length": 175, "name": "Q_PTB1.6"},
- {"type": "blm", "position": 3484, "name": "BLM_Q_PTB1.6"},
- {"type": "quadrupolebooster", "position": 3553.9, "length": 175, "name": "Q_PTB1.7"},
+ {"type": "sip", "position": 3183, "name": "SIP55_PTB1.4", "offset2d": [0, 40], "labelReverse": [270, -210, -100]},
+ {"type": "quadrupolebooster", "position": 3383.9, "length": 175, "name": "Q_PTB1.6"},
+ {"type": "blm", "position": 3684, "name": "BLM_Q_PTB1.6"},
+ {"type": "quadrupolebooster", "position": 3753.9, "length": 175, "name": "Q_PTB1.7"},
{"type": "blm", "position": 3854, "name": "BLM_Q_PTB1.7"},
- {"type": "scraper", "position": 4077.9, "name": "SCRH_PTB1.1"},
- {"type": "scraper", "position": 4272.9, "name": "SCRV_PTB1.1"},
- {"type": "blm", "position": 4273, "name": "BLM_SCRV_PTB1.1_R"},
- {"type": "blm", "position": 4273, "name": "BLM_SCRV_PTB1.1_L"},
- {"type": "flsc", "position": 4997.9, "name": "FLSC_PTB1.3"},
+ {"type": "scraper", "position": 3977.9, "name": "SCRH_PTB1.1"},
+ {"type": "scraper", "position": 4172.9, "name": "SCRV_PTB1.1"},
+ {"type": "blm", "position": 4173, "name": "BLM_SCRV_PTB1.1_R"},
+ {"type": "blm", "position": 4173, "name": "BLM_SCRV_PTB1.1_L"},
+ {"type": "sip", "position": 4373, "name": "SIP55_PTB1.5", "offset2d": [0, 40], "labelReverse": [270, -210, -100]},
{"type": "correctorbooster", "position": 4517.9, "name": "CH_PTB1.4"},
{"type": "correctorbooster", "position": 4717.9, "name": "CV_PTB1.4"},
+ {"type": "flsc", "position": 4997.9, "name": "FLSC_PTB1.3"},
{"type": "blm", "position": 4918, "name": "BLM_FLSC_PTB1.3"},
{"type": "quadrupolebooster", "position": 5183.9, "length": 175, "name": "Q_PTB1.8"},
{"type": "blm", "position": 5184, "name": "BLM_Q_PTB1.8"},
@@ -107,7 +117,9 @@
"start": {"x": 1975, "z": 11391},
"chamber": {"type": "chamber"},
"components": [
- {"type": "flsc", "position": 1030, "name": "FLSC_PTB1.1", "labelReverse": [90, -500, 100]}
+ {"type": "flsc", "position": 1030, "name": "FLSC_PTB1.1", "labelReverse": [90, -500, 100]},
+ {"type": "sip", "position": 820, "name": "SIP55_PTB1.5", "offset2d": [0, -40], "labelReverse": [90, -250, 150]}
+
]
}
],
@@ -141,17 +153,20 @@
"bending": {"type": "dipolebooster", "name": "B_B1.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B1.1", "offset2d": [0, 40], "labelReverse": [270, -210, -100]},
{"type": "blm", "position": 1000, "name": "BLM_B_B1.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B1.1_L"},
{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B1.1"},
{"type": "flsc", "position": 2267, "name": "FLSC_B1.1"},
{"type": "blm", "position": 2267, "name": "BLM_FLSC_B1.1_R"},
{"type": "blm", "position": 2267, "name": "BLM_FLSC_B1.1_L"},
- {"type": "dcct", "position": 3300, "name": "DCCT_B1.1"},
- {"type": "bpm", "position": 3810, "name": "BPMT_B1.1"},
- {"type": "quadrupolebooster", "position": 4750, "length": 280, "name": "QF_B1.2"},
- {"type": "bpm", "position": 5080, "name": "BPM_B1.1"},
- {"type": "sextupolebooster", "position": 5310, "name": "SF_B1.1"}
+ {"type": "dcct", "position": 3100, "name": "DCCT_B1.1", "offset2d": [0, 20], "labelReverse": [270, -220, -250]},
+ {"type": "sip", "position": 3700, "name": "SIP55_B1.1", "offset2d": [0, 40], "labelReverse": [270, -210, -90]},
+ {"type": "vlv", "position": 3990, "name": "VLVP_B1.1"},
+ {"type": "bpm", "position": 4310, "name": "BPMT_B1.1", "labelReverse": [270, -240, -150]},
+ {"type": "quadrupolebooster", "position": 4750, "length": 280, "name": "QF_B1.1"},
+ {"type": "bpm", "position": 5000, "name": "BPM_B1.1"},
+ {"type": "sextupolebooster", "position": 5410, "name": "SF_B1.1"}
]
},
{
@@ -159,9 +174,10 @@
"bending": {"type": "dipolebooster", "name": "B_B2.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B2.1", "offset2d": [0, 40], "labelReverse": [270, -210, -90]},
{"type": "blm", "position": 1000, "name": "BLM_B_B2.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B2.1_L"},
- {"type": "correctorbooster", "position": 1400, "name": "CV_B2.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B2.1"},
{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B2.1"},
{"type": "sextupolebooster", "position": 2010, "name": "SD_B2.1"}
]
@@ -171,9 +187,10 @@
"bending": {"type": "dipolebooster", "name": "B_B3.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B3.1", "offset2d": [0, 50], "labelReverse": [270, -210, -90]},
{"type": "blm", "position": 1000, "name": "BLM_B_B3.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B3.1_L"},
- {"type": "correctorbooster", "position": 1200, "name": "CH_B3.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B3.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B3.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B3.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SF_B3.1"}
@@ -184,9 +201,10 @@
"bending": {"type": "dipolebooster", "name": "B_B4.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B4.1", "offset2d": [0, 50], "labelReverse": [270, -210, -90]},
{"type": "blm", "position": 1000, "name": "BLM_B_B4.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B4.1_L"},
- {"type": "correctorbooster", "position": 1200, "name": "CV_B4.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B4.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B4.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B4.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SD_B4.1"}
@@ -197,9 +215,11 @@
"bending": {"type": "dipolebooster", "name": "B_B5.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 600, "name": "SIP55_B5.1", "offset2d": [-10, 80], "labelReverse": [270, -210, -90]},
+ {"type": "vlv", "position": 800, "name": "VLVP_B5.1"},
{"type": "blm", "position": 1000, "name": "BLM_B_B5.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B5.1_L"},
- {"type": "correctorbooster", "position": 1200, "name": "CH_B5.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B5.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B5.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B5.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SF_B5.1"}
@@ -210,9 +230,10 @@
"bending": {"type": "dipolebooster", "name": "B_B6.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B6.1", "offset2d": [-20, 90], "labelReverse": [270, -210, -90]},
{"type": "blm", "position": 1000, "name": "BLM_B_B6.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B6.1_L"},
- {"type": "correctorbooster", "position": 1200, "name": "CV_B6.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B6.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B6.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B6.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SD_B6.1"}
@@ -223,10 +244,11 @@
"bending": {"type": "dipolebooster", "name": "B_B7.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B7.1", "offset2d": [-40, 40], "labelReverse": [270, -210, -90]},
{"type": "plc", "position": 0, "name": "SPAC_B7", "offset3d": [0, -700, 0], "offset2d": [400, 200], "labelReverse": [270, 1100, -150]},
{"type": "blm", "position": 1000, "name": "BLM_B_B7.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B7.1_L"},
- {"type": "correctorbooster", "position": 1360, "name": "CH_B7.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B7.1"},
{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B7.1"},
{"type": "vlv", "position": 1967, "name": "VLV_B7.1"}
]
@@ -236,9 +258,10 @@
"bending": {"type": "dipolebooster", "name": "B_B8.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B8.1", "offset2d": [-50, 40], "labelReverse": [270, -210, -90]},
{"type": "blm", "position": 1000, "name": "BLM_B_B8.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B8.1_L"},
- {"type": "correctorbooster", "position": 1200, "name": "CV_B8.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B8.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B8.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B8.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SD_B8.1"}
@@ -249,9 +272,11 @@
"bending": {"type": "dipolebooster", "rotateY": "-PI", "name": "B_B9.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 700, "name": "SIP55_B9.1", "offset2d": [-70, 40], "labelReverse": [270, -210, -90]},
+ {"type": "vlv", "position": 800, "name": "VLVP_B9.1"},
{"type": "blm", "position": 1000, "name": "BLM_B_B9.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B9.1_L"},
- {"type": "correctorbooster", "position": 1200, "name": "CH_B9.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B9.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B9.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B9.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SF_B9.1"}
@@ -262,9 +287,10 @@
"bending": {"type": "dipolebooster", "rotateY": "-PI", "name": "B_B10.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B10.1", "offset2d": [-90, 40], "labelReverse": [270, -210, -90]},
{"type": "blm", "position": 1000, "name": "BLM_B_B10.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B10.1_L"},
- {"type": "correctorbooster", "position": 1200, "name": "CV_B10.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B10.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B10.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B10.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SD_B10.1"}
@@ -275,9 +301,11 @@
"bending": {"type": "dipolebooster", "rotateY": "-PI", "name": "B_B11.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 600, "name": "SIP55_B11.1", "offset2d": [0, -50], "labelReverse": [270, -210, -90]},
+ {"type": "vlv", "position": 800, "name": "VLVP_B11.1"},
{"type": "blm", "position": 1000, "name": "BLM_B_B11.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B11.1_L"},
- {"type": "correctorbooster", "position": 1200, "name": "CH_B11.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B11.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B11.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B11.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SF_B11.1"}
@@ -288,9 +316,10 @@
"bending": {"type": "dipolebooster", "rotateY": "-PI", "name": "B_B12.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B12.1", "offset2d": [0, -50], "labelReverse": [270, -210, -90]},
{"type": "blm", "position": 1000, "name": "BLM_B_B12.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B12.1_L"},
- {"type": "correctorbooster", "position": 1400, "name": "CV_B12.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B12.1"},
{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B12.1"},
{"type": "sextupolebooster", "position": 2010, "name": "SD_B12.1"}
]
@@ -300,17 +329,22 @@
"bending": {"type": "dipolebooster", "rotateY": "-PI", "name": "B_B13.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B13.1", "offset2d": [0, -47], "labelReverse": [270, -210, -90]},
{"type": "plc", "position": 0, "name": "SPAC_B13", "offset3d": [0, -700, 0], "offset2d": [-200, 500], "labelReverse": [270, 1200, -150]},
{"type": "blm", "position": 1000, "name": "BLM_B_B13.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B13.1_L"},
+ {"type": "vlv", "position": 1010, "name": "VLVKE_B13.1"},
{"type": "quadrupolebooster", "position": 1350, "length": 280, "name": "QF_B13.1"},
{"type": "bpm", "position": 1650, "name": "BPM_B13.1"},
{"type": "sextupolebooster", "position": 2010, "name": "SF_B13.1"},
- {"type": "vlv", "position": 2250, "name": "VLVKE_B13.1"},
{"type": "kicker", "position": 2710, "name": "KEB_B2.1", "name2": "KE_B13.1"},
{"type": "vlv", "position": 3250, "name": "VLVKE_B13.2"},
{"type": "correctorbooster", "position": 3560, "name": "BUMPER_B13.1"},
- {"type": "quadrupolebooster", "position": 4950, "length": 175, "name": "QD_B13.2"}
+ {"type": "quadrupolebooster", "position": 4950, "length": 175, "name": "QD_B13.1"},
+ {"type": "vlv", "position": 5350, "name": "VLVP_B13.1"},
+ {"type": "sip", "position": 5650, "name": "SIP55_B13.2", "offset2d": [0, -40], "labelReverse": [270, -210, -90]}
+
+
]
},
{
@@ -318,24 +352,30 @@
"bending": {"type": "dipolebooster", "rotateY": "-PI/2", "name": "B_B14.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 700, "name": "SIP55_B14.2", "offset2d": [0, -40], "labelReverse": [90, 950, 170]},
{"type": "blm", "position": 1000, "name": "BLM_B_B14.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B14.1_L"},
- {"type": "quadrupolebooster", "position": 1250, "length": 280, "name": "QF_B14.1"},
+ {"type": "vlv", "position": 1050, "name": "VLVE_B14.1"},
+ {"type": "quadrupolebooster", "position": 1450, "length": 280, "name": "QF_B14.1"},
{"type": "blm", "position": 1350, "name": "BLM_QF_B14.1_R"},
{"type": "blm", "position": 1350, "name": "BLM_QF_B14.1_L"},
- {"type": "vlv", "position": 1990, "name": "VLVVE_B14.1"},
- {"type": "spte", "position": 2450, "offset2d": [0, -50], "offset3d": [0, 0, 200], "ps": ["SEB_B2.1","SEB_B2.2"], "name": "SEB_B2.1 - 2.2", "name2": "SEB_B14.1 - SEB_B14.2"},
+ {"type": "spte", "position": 2450, "offset2d": [0, -50], "offset3d": [400, 0, 0], "ps": ["SEB_B2.1","SEB_B2.2"], "name": "SEB_B2.1 - 2.2", "name2": "SEB_B14.1 - SEB_B14.2", "labelReverse": [90, 1200, 400]},
+ {"type": "sip", "position": 2690, "name": "SIP500_B14.1", "offset2d": [0, -40], "labelReverse": [90, -400, 150]},
+ {"type": "sip", "position": 2990, "name": "SIP500_B14.2", "offset2d": [0, -40], "labelReverse": [90, -400, 150]},
{"type": "blm", "position": 3300, "name": "BLM_SPTE_B14.1_R"},
{"type": "blm", "position": 3300, "name": "BLM_SPTE_B14.1_L"},
- {"type": "correctorbooster", "position": 4262.5, "name": "CH_B14.1", "labelReverse": true},
- {"type": "correctorbooster", "position": 4562.5, "name": "BUMPER_B14.2", "labelReverse": true},
- {"type": "quadrupolebooster", "position": 4850, "length": 175, "name": "QD_B14.2", "labelReverse": true},
- {"type": "bpm", "position": 5130, "name": "BPM_B14.1", "labelReverse": true},
- {"type": "vlv", "position": 5700, "name": "VLVVE_B14.2", "labelReverse": [90, -500, 300]},
- {"type": "flsc", "position": 6600, "name": "FLSC_B14.1", "labelReverse": [90, -500, 300]},
- {"type": "correctorbooster", "position": 7250, "name": "BUMPER_B14.3", "labelReverse": true},
- {"type": "bst", "position": 7600, "name": "BST_B14.1", "labelReverse": true},
- {"type": "quadrupolebooster", "position": 8250, "length": 280, "name": "QF_B14.3", "labelReverse": true}
+ {"type": "correctorbooster", "position": 4262.5, "name": "BUMPER_B14.1", "labelReverse": [90, -330, 200]},
+ {"type": "correctorbooster", "position": 4562.5, "name": "BUMPER_B14.2", "labelReverse": [90, -330, 200]},
+ {"type": "quadrupolebooster", "position": 4850, "length": 175, "name": "QD_B14.1", "labelReverse": [90, -330, 200]},
+ {"type": "bpm", "position": 5130, "name": "BPM_B14.1", "labelReverse": [90, -330, 200]},
+ {"type": "vlv", "position": 5700, "name": "VLVE_B14.2", "labelReverse": [90, -330, 200]},
+ {"type": "sip", "position": 5990, "name": "SIP55_B14.2", "offset2d": [0, -40], "labelReverse": [90, -330, 200]},
+ {"type": "flsc", "position": 6600, "name": "FLSC_B14.1", "labelReverse": [90, -500, 180]},
+ {"type": "correctorbooster", "position": 7250, "name": "BUMPER_B14.3", "labelReverse": [90, -330, 200]},
+ {"type": "bst", "position": 7600, "name": "BST_B14.1", "labelReverse": [90, -330, 200]},
+ {"type": "quadrupolebooster", "position": 8250, "length": 280, "name": "QF_B14.2", "labelReverse": [90, -330, 200]},
+ {"type": "sip", "position": 8550, "name": "SIP55_B14.3", "offset2d": [0, -40], "labelReverse": [90, -370, 200]}
+
]
},
{
@@ -347,8 +387,11 @@
{"type": "blm", "position": 1000, "name": "BLM_B_B15.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B15.1_L"},
{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B15.1"},
+ {"type": "sip", "position": 1950, "name": "SIP55_B15.1", "offset2d": [0, -40], "labelReverse": [90, 900, 170]},
{"type": "strp", "position": 4202, "name": "STRP_B15.1"},
- {"type": "quadrupolebooster", "position": 4650, "length": 280, "name": "QF_B15.2"},
+ {"type": "sip", "position": 4050, "name": "SIP55_B15.2", "offset2d": [0, -40], "labelReverse": [90, 900, 170]},
+ {"type": "vlv", "position": 4300, "name": "VLVP_B15.1", "labelReverse": [90, 900, 200]},
+ {"type": "quadrupolebooster", "position": 4650, "length": 280, "name": "QF_B15.1"},
{"type": "bpm", "position": 4930, "name": "BPM_B15.1"},
{"type": "sextupolebooster", "position": 5310, "name": "SF_B15.1"}
]
@@ -358,9 +401,10 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B16.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B16.1", "offset2d": [0, -40], "labelReverse": [90, 900, 170]},
{"type": "blm", "position": 1000, "name": "BLM_B_B16.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B16.1_L"},
- {"type": "correctorbooster", "position": 1400, "name": "CV_B16.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B16.1"},
{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B16.1"},
{"type": "sextupolebooster", "position": 2010, "name": "SD_B16.1"}
]
@@ -370,9 +414,10 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B17.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B17.1", "offset2d": [0, -50], "labelReverse": [90, 900, 170]},
{"type": "blm", "position": 1000, "name": "BLM_B_B17.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B17.1_L"},
- {"type": "correctorbooster", "position": 1260, "name": "CH_B17.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B17.1"},
{"type": "quadrupolebooster", "position": 1500, "length": 280, "name": "QF_B17.1"},
{"type": "bpm", "position": 1780, "name": "BPM_B17.1"},
{"type": "sextupolebooster", "position": 2150, "name": "SF_B17.1"}
@@ -383,9 +428,10 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B18.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B18.1", "offset2d": [0, -55], "labelReverse": [90, 970, 170]},
{"type": "blm", "position": 1000, "name": "BLM_B_B18.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B18.1_L"},
- {"type": "correctorbooster", "position": 1260, "name": "CV_B18.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B18.1"},
{"type": "quadrupolebooster", "position": 1500, "length": 175, "name": "QD_B18.1"},
{"type": "bpm", "position": 1780, "name": "BPM_B18.1"},
{"type": "sextupolebooster", "position": 2150, "name": "SD_B18.1"}
@@ -396,9 +442,11 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B19.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B19.1", "offset2d": [15, -60], "labelReverse": [90, 900, 170]},
+ {"type": "vlv", "position": 900, "name": "VLVP_B19.1", "labelReverse": [90, 900, 200]},
{"type": "blm", "position": 1000, "name": "BLM_B_B19.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B19.1_L"},
- {"type": "correctorbooster", "position": 1260, "name": "CH_B19.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B19.1"},
{"type": "quadrupolebooster", "position": 1500, "length": 280, "name": "QF_B19.1"},
{"type": "bpm", "position": 1780, "name": "BPM_B19.1"},
{"type": "sextupolebooster", "position": 2150, "name": "SF_B19.1"}
@@ -409,10 +457,11 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B20.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B20.1", "offset2d": [20, -80], "labelReverse": [90, 900, 170]},
{"type": "plc", "position": 0, "name": "SPAC_B20", "offset3d": [0, -700, 0], "offset2d": [-500, -100], "labelReverse": [90, -250, 250]},
{"type": "blm", "position": 1000, "name": "BLM_B_B20.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B20.1_L"},
- {"type": "correctorbooster", "position": 1260, "name": "CV_B20.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B20.1"},
{"type": "quadrupolebooster", "position": 1500, "length": 175, "name": "QD_B20.1"},
{"type": "bpm", "position": 1780, "name": "BPM_B20.1"},
{"type": "sextupolebooster", "position": 2150, "name": "SD_B20.1"}
@@ -423,9 +472,10 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B21.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B21.1", "offset2d": [50, -70], "labelReverse": [90, 900, 170]},
{"type": "blm", "position": 1000, "name": "BLM_B_B21.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B21.1_L"},
- {"type": "correctorbooster", "position": 1360, "name": "CH_B21.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B21.1"},
{"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B21.1"},
{"type": "vlv", "position": 2050, "name": "VLV_B21.1"}
]
@@ -435,9 +485,10 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B22.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B22.1", "offset2d": [50, -20], "labelReverse": [90, 900, 170]},
{"type": "blm", "position": 1000, "name": "BLM_B_B22.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B22.1_L"},
- {"type": "correctorbooster", "position": 1260, "name": "CV_B22.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B22.1"},
{"type": "quadrupolebooster", "position": 1500, "length": 175, "name": "QD_B22.1"},
{"type": "bpm", "position": 1780, "name": "BPM_B22.1"},
{"type": "sextupolebooster", "position": 2150, "name": "SD_B22.1"}
@@ -448,9 +499,11 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B23.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B23.1", "offset2d": [60, -20], "labelReverse": [90, 900, 170]},
+ {"type": "vlv", "position": 900, "name": "VLVP_B23.1", "labelReverse": [90, 900, 200]},
{"type": "blm", "position": 1000, "name": "BLM_B_B23.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B23.1_L"},
- {"type": "correctorbooster", "position": 1260, "name": "CH_B23.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B23.1"},
{"type": "quadrupolebooster", "position": 1500, "length": 280, "name": "QF_B23.1"},
{"type": "bpm", "position": 1780, "name": "BPM_B23.1"},
{"type": "sextupolebooster", "position": 2150, "name": "SF_B23.1"}
@@ -461,9 +514,10 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B24.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B24.1", "offset2d": [20, 40], "labelReverse": [90, 900, 170]},
{"type": "blm", "position": 1000, "name": "BLM_B_B24.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B24.1_L"},
- {"type": "correctorbooster", "position": 1260, "name": "CV_B24.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B24.1"},
{"type": "quadrupolebooster", "position": 1500, "length": 175, "name": "QD_B24.1"},
{"type": "bpm", "position": 1780, "name": "BPM_B24.1"},
{"type": "sextupolebooster", "position": 2150, "name": "SD_B24.1"}
@@ -474,10 +528,11 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B25.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B25.1", "offset2d": [0, 40], "labelReverse": [90, 900, 170]},
{"type": "plc", "position": 0, "name": "SPAC_B25", "offset3d": [0, -700, 0], "offset2d": [-100, -500], "labelReverse": [90, -200, 250]},
{"type": "blm", "position": 1000, "name": "BLM_B_B25.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B25.1_L"},
- {"type": "correctorbooster", "position": 1260, "name": "CH_B25.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CH_B25.1"},
{"type": "quadrupolebooster", "position": 1500, "length": 280, "name": "QF_B25.1"},
{"type": "bpm", "position": 1780, "name": "BPM_B25.1"},
{"type": "sextupolebooster", "position": 2150, "name": "SF_B25.1"}
@@ -488,11 +543,12 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B26.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B26.1", "offset2d": [0, 40], "labelReverse": [90, 900, 170]},
{"type": "blm", "position": 1000, "name": "BLM_B_B26.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B26.1_L"},
- {"type": "correctorbooster", "position": 1400, "name": "CV_B26.1"},
+ {"type": "correctorbooster", "position": 1100, "name": "CV_B26.1"},
{"type": "quadrupolebooster", "position": 1650, "length": 175, "name": "QD_B26.1"},
- {"type": "sextupolebooster", "position": 2010, "name": "SD_B26.1"}
+ {"type": "sextupolebooster", "position": 2110, "name": "SD_B26.1"}
]
},
{
@@ -500,15 +556,18 @@
"bending": {"type": "dipolebooster", "rotateY": "PI", "name": "B_B27.1"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 800, "name": "SIP55_B27.1", "offset2d": [0, 40], "labelReverse": [90, 900, 170]},
+ {"type": "vlv", "position": 900, "name": "VLVRF_B27.1", "labelReverse": [90, 1000, 200]},
{"type": "blm", "position": 1000, "name": "BLM_B_B27.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B27.1_L"},
- {"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B27.1"},
- {"type": "bpm", "position": 1900, "name": "BPM_B27.1"},
- {"type": "sextupolebooster", "position": 2230, "name": "SF_B27.1"},
- {"type": "vlv", "position": 3000, "name": "VLVRF_B27.1", "labelReverse": [90, -250, 250]},
+ {"type": "quadrupolebooster", "position": 1200, "length": 280, "name": "QF_B27.1"},
+ {"type": "bpm", "position": 1500, "name": "BPM_B27.1"},
+ {"type": "sextupolebooster", "position": 2030, "name": "SF_B27.1"},
{"type": "cavity", "position": 3300.2, "name": "RF_B27.1", "labelReverse": [90, -250, 250]},
{"type": "vlv", "position": 3700, "name": "VLVRF_B27.2", "labelReverse": [90, -250, 250]},
- {"type": "quadrupolebooster", "position": 4950, "length": 175, "name": "QD_B27.2", "labelReverse": [90, -250, 250]}
+ {"type": "quadrupolebooster", "position": 4950, "length": 175, "name": "QD_B27.1", "labelReverse": [90, -250, 250]},
+ {"type": "sip", "position": 5350, "name": "SIP55_B27.2", "offset2d": [0, 40], "labelReverse": [90, -300, 200]}
+
]
},
{
@@ -516,28 +575,34 @@
"bending": {"type": "dipolebooster", "rotateY": "PI/2", "name": "B_B28.1", "labelReverse": [90, -500, 0]},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 850, "name": "SIP55_B28.1", "offset2d": [0, 40], "labelReverse": [90, -350, 150]},
{"type": "blm", "position": 1400, "name": "BLM_B_B28.1_R"},
{"type": "blm", "position": 1400, "name": "BLM_B_B28.1_L"},
- {"type": "flsc", "position": 1500, "name": "FLSC_B28.1", "labelReverse": [90, -500, 300]},
- {"type": "quadrupolebooster", "position": 2100, "length": 280, "name": "QF_B28.1", "labelReverse": [90, -500, 300]},
- {"type": "vlv", "position": 2800, "name": "VLVI_B28.1", "labelReverse": [90, -500, 300]},
+ {"type": "quadrupolebooster", "position": 1100, "length": 280, "name": "QF_B28.1", "labelReverse": [90, -300, 150]},
+ {"type": "flsc", "position": 1700, "name": "FLSC_B28.1", "labelReverse": [90, -500, 150]},
+ {"type": "vlv", "position": 2100, "name": "VLVI_B28.1", "labelReverse": [90, -300, 150]},
{"type": "blm", "position": 2665, "name": "BLM_FLSC_B27.1_R", "labelReverse": true},
{"type": "blm", "position": 2665, "name": "BLM_FLSC_B27.1_L", "labelReverse": true},
{"type": "strp", "position": 2915, "name": "STRP_B28.1", "labelReverse": true},
{"type": "spte", "position": 3418.91, "offset2d": [-50, 50], "name": "SIB_B1.1", "name2": "SI_B28.1", "labelReverse": true},
+ {"type": "sip", "position": 3733, "name": "SIP500_B28.1", "offset2d": [0, 40], "labelReverse": [90, -400, 150]},
{"type": "blm", "position": 4137, "name": "BLM_SIB_B28.1_R"},
{"type": "blm", "position": 4137, "name": "BLM_SIB_B28.1_L"},
{"type": "vlv", "position": 4300, "name": "VLVI_B28.2"},
{"type": "flsc", "position": 4574, "name": "FLSC_B28.2"},
{"type": "quadrupolebooster", "position": 4887.5, "length": 175, "name": "QD_B28.2"},
{"type": "bpm", "position": 5167.5, "name": "BPM_B28.1"},
- {"type": "correctorbooster", "position": 5697, "name": "CV_B28.1", "labelReverse": [270, -400, -150]},
+ {"type": "correctorbooster", "position": 5497, "name": "CV_B28.1", "labelReverse": [270, -280, -150]},
+ {"type": "vlv", "position": 5797, "name": "VLVP_B28.2"},
+ {"type": "sip", "position": 6097, "name": "SIP55_B28.2", "offset2d": [0, 40], "labelReverse": [270, -210, -100]},
{"type": "vlv", "position": 6367, "name": "VLVKI_B28.1"},
{"type": "kicker", "position": 6937.5, "name": "KIB_B28.1", "name2": "KIB_B1.1"},
{"type": "blm", "position": 7437, "name": "BLM_KIB_B28.1_R"},
{"type": "blm", "position": 7437, "name": "BLM_KIB_B28.1_L"},
{"type": "vlv", "position": 7567, "name": "VLVKI_B28.2"},
- {"type": "quadrupolebooster", "position": 8187.5, "length": 280, "name": "QF_B28.2"}
+ {"type": "quadrupolebooster", "position": 8187.5, "length": 280, "name": "QF_B28.2"},
+ {"type": "sip", "position": 8587, "name": "SIP55_B28.3", "offset2d": [0, 40], "labelReverse": [270, -210, -100]}
+
]
} ],
@@ -554,7 +619,7 @@
{"type": "BTS_SEB1", "position": 0, "name": "BTS_SEB1"},
{"type": "BTS_SEB2", "position": 62.2, "name": "BTS_SEB2"},
{"type": "vlv", "position": 1450, "name": "VLV_BTS1.1"},
- {"type": "sip", "position": 1650, "name": "SIP55_BTS1.1"},
+ {"type": "sip", "position": 1650, "name": "SIP55_BTS1.1", "offset2d": [0, -40]},
{"type": "cm", "position": 2142.4, "name": "CM_BTS1.1"},
{"type": "flsc", "position": 2442.4, "name": "FLSC_BTS1.1"},
{"type": "blm", "position": 2392.4, "name": "BLM_FLSC_BTS1.1_R"},
@@ -570,38 +635,38 @@
{"type": "corrector", "position": 4997.4, "name": "CV_BTS1.2"},
{"type": "bst", "position": 5400, "name": "BST_BTS1.1"},
{"type": "bst", "position": 6200, "name": "BST_BTS1.2"},
- {"type": "sip", "position": 6300, "name": "SIP55_BTS1.2"}
+ {"type": "sip", "position": 7200, "name": "SIP55_BTS1.2", "offset2d": [0, -40]}
]
},
{
"start": {"x": 5035, "z": -21920},
- "bending": {"type": "dipolebooster", "length": 1200, "name": "B_BTS1.1", "labelReverse": 180},
+ "bending": {"type": "dipolebooster", "length": 1200, "name": "B_BTS1.1", "labelReverse": [90, -610, 50]},
"chamber": {"type": "chamber"},
"components": [
{"type": "blm", "position": 737, "name": "BLM_B_BTS1.1_R"},
{"type": "blm", "position": 737, "name": "BLM_B_BTS1.1_L"},
- {"type": "quadrupolebooster", "position": 2492, "name": "Q_BTS1.3"},
+ {"type": "quadrupolebooster", "position": 2392, "name": "Q_BTS1.3"},
{"type": "blm", "position": 2492, "name": "BLM_Q_BTS1.3"},
{"type": "bpm", "position": 2744.5, "name": "BPM_BTS1.2"},
{"type": "vlv_notfound", "position": 2950, "name": "VLVP_BTS1.2"},
- {"type": "sip", "position": 3150, "name": "SIP55_BTS1.3"},
+ {"type": "sip", "position": 3150, "name": "SIP55_BTS1.3", "offset2d": [0, -40]},
{"type": "quadrupolebooster", "position": 3607, "name": "Q_BTS1.4"},
{"type": "blm", "position": 3607, "name": "BLM_Q_BTS1.4"},
{"type": "corrector", "position": 4059.5, "name": "CH_BTS1.3"},
{"type": "corrector", "position": 4339.5, "name": "CV_BTS1.3"},
- {"type": "sip", "position": 7650, "name": "SIP55_BTS1.4"},
+ {"type": "sip", "position": 7650, "name": "SIP55_BTS1.4", "offset2d": [0, -40]},
{"type": "bpm", "position": 7836, "name": "BPM_BTS1.3"},
{"type": "blm", "position": 7836, "name": "BLM_BPM_BTS1.3_R"},
{"type": "blm", "position": 7836, "name": "BLM_BPM_BTS1.3_L"},
{"type": "vlv", "position": 8050, "name": "VLV_BTS1.2"},
- {"type": "plc", "position": 8400, "name": "SPAC_BTS1", "offset3d": [0, 100, -700], "offset2d": [0, 300], "labelReverse": [90, -250, 250]},
+ {"type": "plc", "position": 9000, "name": "SPAC_BTS1", "offset3d": [0, 100, -700], "offset2d": [0, -300], "labelReverse": [270, -250, -180]},
{"type": "bpm", "position": 10570.35, "name": "BPM_BTS1.4"},
{"type": "flsc", "position": 10864.35, "name": "FLSC_BTS1.2"},
{"type": "corrector", "position": 11264.35, "name": "CH_BTS1.4"},
{"type": "corrector", "position": 11544.35, "name": "CV_BTS1.4"},
{"type": "quadrupolebooster", "position": 12296.85, "name": "Q_BTS1.5"},
{"type": "blm", "position": 12297, "name": "BLM_Q_BTS1.5"},
- {"type": "sip", "position": 12700, "name": "SIP55_BTS1.5"},
+ {"type": "sip", "position": 12700, "name": "SIP55_BTS1.5", "offset2d": [0, -40]},
{"type": "quadrupolebooster", "position": 13011.85, "name": "Q_BTS1.6"},
{"type": "blm", "position": 13012, "name": "BLM_Q_BTS1.6"},
{"type": "bpm", "position": 13292.31, "name": "BPM_BTS1.5"}
@@ -612,6 +677,7 @@
"bending": {"type": "dipolebooster", "length": 1200, "name": "B_BTS1.2"},
"chamber": {"type": "chamber"},
"components": [
+ {"type": "sip", "position": 700, "name": "SIP55_BTS1.6", "offset2d": [0, -40]},
{"type": "blm", "position": 737, "name": "BLM_B_BTS1.2_R"},
{"type": "blm", "position": 737, "name": "BLM_B_BTS1.2_L"}
]
@@ -623,7 +689,9 @@
"components": [
{"type": "blm", "position": 737, "name": "BLM_B_BTS1.3_R"},
{"type": "blm", "position": 737, "name": "BLM_B_BTS1.3_L"},
- {"type": "bst", "position": 950, "name": "BST_BTS1.3"},
+ {"type": "sip", "position": 800, "name": "SIP55_BTS1.7", "offset2d": [0, -40]},
+ {"type": "bpm", "position": 1000, "name": "BPM_BTS1.6"},
+ {"type": "bst", "position": 1300, "name": "BST_BTS1.3"},
{"type": "vlv", "position": 2950, "name": "VLV_BTS2.1"},
{"type": "corrector", "position": 3516.42, "name": "CH_BTS2.1"},
{"type": "corrector", "position": 3796.42, "name": "CV_BTS2.1"},
@@ -640,7 +708,7 @@
"components": [
{"type": "blm", "position": 737, "name": "BLM_B_BTS2.1_R"},
{"type": "blm", "position": 737, "name": "BLM_B_BTS2.1_L"},
- {"type": "sip", "position": 1270, "name": "SIP55_BTS2.1"},
+ {"type": "sip", "position": 1270, "name": "SIP55_BTS2.1", "offset2d": [0, -40]},
{"type": "vgpe", "position": 1470, "name": "VGPE_BTS2.1"},
{"type": "vlv", "position": 1570, "name": "VLV_BTS2.2"},
{"type": "flsc", "position": 1849.77, "name": "FLSC_BTS2.1"},
@@ -651,7 +719,7 @@
{"type": "bpm", "position": 2857, "name": "BPM_BTS2.1"},
{"type": "corrector", "position": 3182, "name": "CH_BTS2.2"},
{"type": "corrector", "position": 3462, "name": "CV_BTS2.2"},
- {"type": "sip", "position": 3700, "name": "SIP55_BTS2.2"},
+ {"type": "sip", "position": 3700, "name": "SIP55_BTS2.2", "offset2d": [0, -40]},
{"type": "vgpi", "position": 3900, "name": "VGPI_BTS2.1"},
{"type": "quadrupolebooster", "position": 4144.5, "name": "Q_BTS2.4"},
{"type": "blm", "position": 4145, "name": "BLM_Q_BTS2.4_R"},
@@ -665,7 +733,7 @@
"components": [
{"type": "blm", "position": 737, "name": "BLM_B_BTS2.2_R"},
{"type": "blm", "position": 737, "name": "BLM_B_BTS2.2_L"},
- {"type": "sip", "position": 1270, "name": "SIP55_BTS2.3"}
+ {"type": "sip", "position": 970, "name": "SIP55_BTS2.3", "offset2d": [0, -40], "labelReverse": [90, -300, 180]}
]
},
{
@@ -682,8 +750,8 @@
{"type": "corrector", "position": 2032, "name": "CH_BTS2.3", "labelReverse": true},
{"type": "corrector", "position": 2312, "name": "CV_BTS2.3", "labelReverse": true},
{"type": "bpm", "position": 2588.5, "name": "BPM_BTS2.2", "labelReverse": true},
- {"type": "sip", "position": 2870, "name": "SIP55_BTS2.4", "labelReverse": true},
- {"type": "flsc", "position": 3150, "name": "FLSC_BTS2.2", "labelReverse": [90, -500, 300]},
+ {"type": "sip", "position": 2870, "name": "SIP55_BTS2.4", "offset2d": [0, -40], "labelReverse": true},
+ {"type": "flsc", "position": 3150, "name": "FLSC_BTS2.2", "labelReverse": [90, -500, 200]},
{"type": "blm", "position": 3150, "name": "BLM_FLSC_BTS2.2", "labelReverse": true},
{"type": "cm", "position": 3481.2, "name": "CM_BTS2.1", "labelReverse": true},
{"type": "bpm", "position": 3673.2, "name": "BPM_BTS2.3", "labelReverse": true},
@@ -692,9 +760,9 @@
{"type": "blm", "position": 4466, "name": "BLM_Q_BTS2.7", "labelReverse": true},
{"type": "corrector", "position": 4689.3, "name": "CH_BTS2.4", "labelReverse": true},
{"type": "corrector", "position": 4969.3, "name": "CV_BTS2.4", "labelReverse": true},
- {"type": "sip", "position": 5170, "name": "SIP55_BTS2.5", "labelReverse": true},
+ {"type": "sip", "position": 5270, "name": "SIP55_BTS2.5", "offset2d": [0, -40], "labelReverse": true},
{"type": "vgpe", "position": 5370, "name": "VGPE_BTS2.2", "labelReverse": true},
- {"type": "bpm", "position": 5189.7, "name": "BPM_BTS2.4", "labelReverse": true}
+ {"type": "bpm", "position": 5309.7, "name": "BPM_BTS2.4", "labelReverse": [90, -300, 250]}
]