diff --git a/elettra_lattice.json b/elettra_lattice.json
index 207e8bfb4b8f4029d97ce254750942543027dd82..368c2f5461e7cdaf0b2ae770d37b3dfa77d51820 100644
--- a/elettra_lattice.json
+++ b/elettra_lattice.json
@@ -6,14 +6,13 @@
"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, 1600, -70]},
+ {"type": "lens", "position": 130, "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": 480, "name": "LENS_P1.2", "labelReverse": [270, 1600, -50]},
- {"type": "lens", "position": 600, "name": "LENS_P1.3", "labelReverse": [270, 1600, -140]},
- {"type": "flsc", "position": 692, "name": "FLSC_P1.1"},
- {"type": "lens", "position": 890, "name": "LENS_P1.4", "labelReverse": [270, 1600, -50]},
- {"type": "lens", "position": 1050, "name": "LENS_P1.5", "labelReverse": [270, 1600, -100]},
+ {"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": "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": "quadrupolebooster", "position": 1366, "length": 50, "name": "Q_P1.1"},
{"type": "quadrupolebooster", "position": 1649, "length": 50, "name": "Q_P1.2"},
@@ -53,20 +52,20 @@
},
{
"start": {"x": 3560, "z": 11640},
- "bending": {"type": "dipolebooster", "length": 300, "name": "B_PTB1.1"},
+ "bending": {"type": "bending_300", "length": 300, "name": "B_PTB1.1"},
"chamber": {"type": "chamber"},
"components": [
- {"type": "blm", "position": 100, "name": "BLM_B_PTB1.1_R", "labelReverse": [270, 1600, -50]},
- {"type": "blm", "position": 100, "name": "BLM_B_PTB1.1_L", "labelReverse": [270, 1600, -50]},
- {"type": "vlv", "position": 400, "name": "VLV_PTB1.2", "labelReverse": [270, 1600, -50]},
- {"type": "flsc", "position": 627.9, "name": "FLSC_PTB1.2", "labelReverse": [270, 1800, -50]},
- {"type": "blm", "position": 698, "name": "BLM_FLSC_PTB1.2", "labelReverse": [270, 1800, -50]},
- {"type": "bpm", "position": 847.9, "name": "BPM_PTB1.3", "labelReverse": [270, 1800, -50]},
- {"type": "correctorbooster", "position": 1097.9, "name": "CH_PTB1.2", "labelReverse": [270, 1400, -50]},
- {"type": "correctorbooster", "position": 1297.9, "name": "CV_PTB1.2", "labelReverse": [270, 1400, -50]},
- {"type": "quadrupolebooster", "position": 1535.9, "length": 175, "name": "Q_PTB1.3", "labelReverse": [270, 1400, -50]},
+ {"type": "blm", "position": 100, "name": "BLM_B_PTB1.1_R", "labelReverse": [270, 900, -50]},
+ {"type": "blm", "position": 100, "name": "BLM_B_PTB1.1_L", "labelReverse": [270, 900, -50]},
+ {"type": "vlv", "position": 400, "name": "VLV_PTB1.2", "labelReverse": [270, 900, -150]},
+ {"type": "flsc", "position": 627.9, "name": "FLSC_PTB1.2", "labelReverse": [270, -300, -150]},
+ {"type": "blm", "position": 698, "name": "BLM_FLSC_PTB1.2", "labelReverse": [270, 900, -50]},
+ {"type": "bpm", "position": 847.9, "name": "BPM_PTB1.3", "labelReverse": [270, -300, -150]},
+ {"type": "correctorbooster", "position": 1097.9, "name": "CH_PTB1.2", "labelReverse": [270, -300, -100]},
+ {"type": "correctorbooster", "position": 1297.9, "name": "CV_PTB1.2", "labelReverse": [270, -300, -100]},
+ {"type": "quadrupolebooster", "position": 1535.9, "length": 175, "name": "Q_PTB1.3", "labelReverse": [270, -300, -100]},
{"type": "blm", "position": 1436, "name": "BLM_Q_PTB1.3", "labelReverse": [270, 1600, -50]},
- {"type": "quadrupolebooster", "position": 1805.9, "length": 175, "name": "Q_PTB1.4", "labelReverse": [270, 1400, -50]},
+ {"type": "quadrupolebooster", "position": 1805.9, "length": 175, "name": "Q_PTB1.4", "labelReverse": [270, -300, -100]},
{"type": "blm", "position": 1806, "name": "BLM_Q_PTB1.4"},
{"type": "bpm", "position": 2054.9, "name": "BPM_PTB1.4"},
{"type": "quadrupolebooster", "position": 2425.9, "length": 175, "name": "Q_PTB1.5"},
@@ -81,7 +80,7 @@
{"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": 4897.9, "name": "FLSC_PTB1.3"},
+ {"type": "flsc", "position": 4997.9, "name": "FLSC_PTB1.3"},
{"type": "correctorbooster", "position": 4517.9, "name": "CH_PTB1.4"},
{"type": "correctorbooster", "position": 4717.9, "name": "CV_PTB1.4"},
{"type": "blm", "position": 4918, "name": "BLM_FLSC_PTB1.3"},
@@ -108,7 +107,7 @@
"start": {"x": 1975, "z": 11391},
"chamber": {"type": "chamber"},
"components": [
- {"type": "flsc", "position": 900, "name": "FLSC_PTB1.1", "labelReverse": [90, -500, 100]}
+ {"type": "flsc", "position": 1030, "name": "FLSC_PTB1.1", "labelReverse": [90, -500, 100]}
]
}
],
@@ -174,7 +173,7 @@
"components": [
{"type": "blm", "position": 1000, "name": "BLM_B_B3.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B3.1_L"},
- {"type": "correctorbooster", "position": 1300, "name": "CH_B3.1"},
+ {"type": "correctorbooster", "position": 1200, "name": "CH_B3.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B3.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B3.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SF_B3.1"}
@@ -187,7 +186,7 @@
"components": [
{"type": "blm", "position": 1000, "name": "BLM_B_B4.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B4.1_L"},
- {"type": "correctorbooster", "position": 1300, "name": "CV_B4.1"},
+ {"type": "correctorbooster", "position": 1200, "name": "CV_B4.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B4.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B4.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SD_B4.1"}
@@ -200,7 +199,7 @@
"components": [
{"type": "blm", "position": 1000, "name": "BLM_B_B5.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B5.1_L"},
- {"type": "correctorbooster", "position": 1300, "name": "CH_B5.1"},
+ {"type": "correctorbooster", "position": 1200, "name": "CH_B5.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B5.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B5.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SF_B5.1"}
@@ -213,7 +212,7 @@
"components": [
{"type": "blm", "position": 1000, "name": "BLM_B_B6.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B6.1_L"},
- {"type": "correctorbooster", "position": 1300, "name": "CV_B6.1"},
+ {"type": "correctorbooster", "position": 1200, "name": "CV_B6.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B6.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B6.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SD_B6.1"}
@@ -239,7 +238,7 @@
"components": [
{"type": "blm", "position": 1000, "name": "BLM_B_B8.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B8.1_L"},
- {"type": "correctorbooster", "position": 1300, "name": "CV_B8.1"},
+ {"type": "correctorbooster", "position": 1200, "name": "CV_B8.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B8.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B8.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SD_B8.1"}
@@ -252,7 +251,7 @@
"components": [
{"type": "blm", "position": 1000, "name": "BLM_B_B9.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B9.1_L"},
- {"type": "correctorbooster", "position": 1300, "name": "CH_B9.1"},
+ {"type": "correctorbooster", "position": 1200, "name": "CH_B9.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B9.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B9.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SF_B9.1"}
@@ -265,7 +264,7 @@
"components": [
{"type": "blm", "position": 1000, "name": "BLM_B_B10.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B10.1_L"},
- {"type": "correctorbooster", "position": 1300, "name": "CV_B10.1"},
+ {"type": "correctorbooster", "position": 1200, "name": "CV_B10.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 175, "name": "QD_B10.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B10.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SD_B10.1"}
@@ -278,7 +277,7 @@
"components": [
{"type": "blm", "position": 1000, "name": "BLM_B_B11.1_R"},
{"type": "blm", "position": 1000, "name": "BLM_B_B11.1_L"},
- {"type": "correctorbooster", "position": 1300, "name": "CH_B11.1"},
+ {"type": "correctorbooster", "position": 1200, "name": "CH_B11.1"},
{"type": "quadrupolebooster", "position": 1480, "length": 280, "name": "QF_B11.1"},
{"type": "bpm", "position": 1720, "name": "BPM_B11.1"},
{"type": "sextupolebooster", "position": 2080, "name": "SF_B11.1"}
@@ -519,8 +518,8 @@
"components": [
{"type": "blm", "position": 1400, "name": "BLM_B_B28.1_R"},
{"type": "blm", "position": 1400, "name": "BLM_B_B28.1_L"},
- {"type": "quadrupolebooster", "position": 1650, "length": 280, "name": "QF_B28.1", "labelReverse": [90, -500, 300]},
- {"type": "flsc", "position": 2365, "name": "FLSC_B28.1", "labelReverse": [90, -500, 300]},
+ {"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": "blm", "position": 2665, "name": "BLM_FLSC_B27.1_R", "labelReverse": true},
{"type": "blm", "position": 2665, "name": "BLM_FLSC_B27.1_L", "labelReverse": true},
@@ -532,6 +531,7 @@
{"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": "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"},
@@ -670,7 +670,7 @@
},
{
"start": {"x": 35040, "z": -20380},
- "bending": {"type": "dipole", "rotateY": "PI", "length": 2000, "name": "B_BTS2.3", "labelReverse": [90, -500, 0]},
+ "bending": {"type": "bending_2400", "rotateY": "PI", "length": 2000, "name": "B_BTS2.3", "labelReverse": [90, -500, 0]},
"chamber": {"type": "chamber"},
"components": [
{"type": "blm", "position": 1217, "name": "BLM_B_BTS2.3_R"},
@@ -723,6 +723,110 @@
},
"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": [
@@ -738,14 +842,14 @@
]},
{"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": 1700, "name": "RSEPTB_BSA1.1", "labelReverse":[270, 2700, -150], "embedded":[
""
]},
- {"type": "zero", "position": 2300, "name": "XXXXXX", "labelReverse": [270, 2700, -150], "embedded":[
+ {"type": "zero", "position": 2300, "name": "RKICKB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
""
]},
{"type": "rps", "position": 2900, "name": "RPSCB_BSA.01", "labelReverse": [270, 2700, -150], "embedded":[
- "PSCV_B22.1","PSCH_B23.1","PSCV_B24.1","PSCH_B25.1","PSCV_B26.1","PSCV_B2.1","PSCH_B3.1","PSCV_B4.1"
+ "PSCV_B22.1","PSCH_B23.1","PSCV_B24.1","PSCH_B25.1","PSCV_B26.1","PSCV_B2.1","PSCH_B3.1","PSCV_B4.1","PSCV_B28.1"
]},
{"type": "rc", "position": 3500, "name": "RCB_BSA1.1", "labelReverse":[270, 2700, -150], "embedded":[
"ECINJBSA1","ECPSBSA1"
@@ -771,14 +875,10 @@
{"type": "rd", "position": 5500, "name": "RDB_BSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
"EC TIMING"
]}
-
]
},
{
- "start": {"x": -12500, "z": 1000},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
+ "start": {"x": -12500, "z": 1000}
},
{
"start": {"x": -15000, "z": -10000},
@@ -791,15 +891,11 @@
]},
{"type": "rpsq", "position": 4000, "name": "CAQB_BTS2.1", "labelReverse": [270, 3000, -500], "embedded":[
""
- ]}
-
+ ]}
]
},
{
- "start": {"x": -2500, "z": -18000},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
+ "start": {"x": -2500, "z": -18000}
},
{
"start": {"x": -4000, "z": -13500},
@@ -824,10 +920,7 @@
]
},
{
- "start": {"x": -16500, "z": -13450},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
+ "start": {"x": -16500, "z": -13450}
},
{
"start": {"x": 1000, "z": -13500},
@@ -841,17 +934,14 @@
]
},
{
- "start": {"x": -16500, "z": -13450},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
- },
+ "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"
]},
@@ -877,120 +967,14 @@
"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},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
- }
-
- ]
- },
- "psa": {
- "sections": [
- {
- "start": {"x": 9000, "z": 21000},
- "components": [
- {"type": "rd", "position": -1500, "name": "RGUNC_PSA1.1", "labelReverse": [270, 2700, -150], "embedded":[
- "ECRFBSA1"
- ]},
- {"type": "rd", "position": 0, "name": "RPSCHV_PSA1.1", "labelReverse": [270, 3000, -150], "embedded":[
- ]},
- {"type": "rar1", "position": 800, "name": "RAR1_PSA1.1", "labelReverse": [270, 2700, -300], "offset2d": [180, 30], "embedded":[
- ]},
- {"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": [50, 10],"embedded":[
- ]},
- {"type": "rd", "position": 10100, "name": "RPSCHV_PSA1.2", "labelReverse": [270, 3000, -150], "offset2d": [-180, -40],"embedded":[
- ]}
-
- ]
- },
- {
- "start": {"x": -12500, "z": 16500},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
- },
- {
- "start": {"x": 1000, "z": 26500},
- "components": [
- {"type": "rv", "position": 0, "name": "RV_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
- ]},
- {"type": "rv", "position": 800, "name": "RV_PSA1.2", "labelReverse": [270, -200, -210],"offset2d": [0, 0], "embedded":[
- ]},
- {"type": "rc", "position": 1400, "name": "RC_PSA1.2", "labelReverse": [270, -200, -210], "offset2d": [50, -200],"embedded":[
- ]}
- ]
- },
- {
- "start": {"x": 7500, "z": 0},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
- },
- {
- "start": {"x": -1700, "z": 25700},
- "components": [
- {"type": "rps", "position": 0, "name": "RPSP_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
- ]},
- {"type": "rps", "position": 600, "name": "RPSCP_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
- ]},
- {"type": "rc", "position": 1200, "name": "RC_PSA1.1", "labelReverse": [270, -200, -210], "embedded":[
- ]}
- ]
- },
- {
- "start": {"x": 5000, "z": 0},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
- },
- {
- "start": {"x": -4000, "z": 19300},
- "components": [
- {"type": "klystron", "position": 0, "name": "Rack Triplo", "labelReverse": [90, 1500, 510], "reverse": true, "embedded":[
- ]},
- {"type": "rd", "position": 2000, "name": "KLY_FOC_PSA1.1", "labelReverse": [90, 1900, 400], "reverse": true, "embedded":[
- ]},
- {"type": "rd", "position": 2600, "name": "RD_PSA1.1", "labelReverse": [90, 1270, 400], "reverse": true, "embedded":[
- ]},
- {"type": "rps", "position": 3200, "name": "RWW_PSA1.1", "labelReverse": [90, 1500, 400], "reverse": true, "embedded":[
- ]},
- {"type": "rps", "position": 3800, "name": "RPSB_PSA1.1", "labelReverse": [90, 1550, 400], "reverse": true, "embedded":[
- ]},
- {"type": "rps", "position": 4400, "name": "RPSQ_PSA1.1", "labelReverse": [90, 1550, 400], "reverse": true, "embedded":[
- ]},
- {"type": "rps", "position": 5000, "name": "RPSC_PSA1.1", "labelReverse": [90, 1550, 400], "reverse": true, "embedded":[
]}
]
},
{
- "start": {"x": -9000, "z":39000},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
- }
-
-
+ "start": {"x": 6000, "z": -10000}
+ }
]
- },
+ },
"sr": {
"sections": [
{