diff --git a/elettra2_lattice.json b/elettra2_lattice.json
index 564f6fda621dbdcae2566b6961a8df00a9f1dd53..cc7c7fe637d96ea45ef58747267669674eaae33d 100644
--- a/elettra2_lattice.json
+++ b/elettra2_lattice.json
@@ -1641,12 +1641,109 @@
"servicearea": {
"sections": [
{
- "start": {"x": 38740, "z": -13180},
- "bending": {"rotateY": "PI"},
- "chamber": {"type": "chamber"},
+ "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": [
@@ -1695,14 +1792,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},
@@ -1715,15 +1808,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},
@@ -1748,10 +1837,7 @@
]
},
{
- "start": {"x": -16500, "z": -13450},
- "bending": {"rotateY": "PI"},
- "components": [
- ]
+ "start": {"x": -16500, "z": -13450}
},
{
"start": {"x": 1000, "z": -13500},
@@ -1765,17 +1851,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"
]},
@@ -1801,15 +1884,12 @@
"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": [
- ]
- },
+ "start": {"x": 6000, "z": -10000}
+ },
{
"start": {"x": 33249, "y": -300, "z": 4557},
"components": [