diff --git a/elettra_lattice.json b/elettra_lattice.json
index 0a13ce8a0d9ec139ac2da023d88b1b300523f7d2..61b491c23e13b5697a7273ec285e4f2b7500b66c 100644
--- a/elettra_lattice.json
+++ b/elettra_lattice.json
@@ -1412,7 +1412,7 @@
{"type": "vlv", "position": 4235, "name": "VLVINJ_S12.1"},
{"type": "kicker", "position": 4696, "name": "KICKER_S12.2"},
{"type": "flsc", "position": 5236, "name": "FLSC_S12.1"},
- {"type": "spte", "position": 6100, "length": 1600, "offset3d": [0, 0, 150], "ps": ["SISR_BTS2.1","SISR_BTS2.2"],"name": "SISR_BTS2.1 - 2.2", "name2": "SE_S12.1 - 12.2"},
+ {"type": "spte", "position": 6100, "length": 1600, "offset3d": [0, 0, 150], "ps": ["SEPTUM_BTS2.1","SEPTUM_BTS2.2"],"name": "SISR_BTS2.1", "alias": ["SISR_BTS2.2", "SE_S12.1", "SE_S12.2"]},
{"type": "flsc", "position": 7221, "name": "FLSC_S12.2"},
{"type": "kicker", "position": 7786, "name": "KICKER_S12.3"},
{"type": "vlv", "position": 8268, "name": "VLVINJ_S12.2"},
@@ -1491,7 +1491,7 @@
{
"start": {"x": 41320, "z": 1880},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "TWINMIC"}
+ {"type": "beamlineUp", "position": 1000, "name": "TWINMIC"}
]
},
{
@@ -1501,8 +1501,8 @@
{
"start": {"x": 38860, "z": 14100},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "Nanospectroscopy"},
- {"type": "beamlineUp", "position": 1000, "name": "NanoESCA"}
+ {"type": "beamlineUp", "position": 1000, "name": "Nanospectroscopy"},
+ {"type": "beamlineDown", "position": 1000, "name": "NanoESCA"}
]
},
{
@@ -1520,8 +1520,8 @@
{
"start": {"x": 26600, "z": 31660},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "ESCA Microscopy"},
- {"type": "beamlineUp", "position": 1000, "name": "SuperESCA"}
+ {"type": "beamlineUp", "position": 1000, "name": "ESCA Microscopy"},
+ {"type": "beamlineDown", "position": 1000, "name": "SuperESCA"}
]
},
{
@@ -1540,8 +1540,8 @@
{
"start": {"x": 7160, "z": 40700},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "Spectro Microscopy"},
- {"type": "beamlineUp", "position": 1000, "name": "VUV Photoemission"}
+ {"type": "beamlineUp", "position": 1000, "name": "Spectro Microscopy"},
+ {"type": "beamlineDown", "position": 1000, "name": "VUV Photoemission"}
]
},
{
@@ -1560,7 +1560,7 @@
{
"start": {"x": -14240, "z": 38840},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "CiPo", "labelReverse": true}
+ {"type": "beamlineUp", "position": 1000, "name": "CiPo", "labelReverse": true}
]
},
{
@@ -1590,8 +1590,8 @@
{
"start": {"x": -36740, "z": 18900},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "Material Science", "labelReverse": true},
- {"type": "beamlineUp", "position": 1000, "name": "SYRMEP", "labelReverse": true}
+ {"type": "beamlineUp", "position": 1000, "name": "Material Science", "labelReverse": true},
+ {"type": "beamlineDown", "position": 1000, "name": "SYRMEP", "labelReverse": true}
]
},
{
@@ -1631,8 +1631,8 @@
{
"start": {"x": -34720, "z": -22480},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "BEAR", "labelReverse": true},
- {"type": "beamlineUp", "position": 1000, "name": "LILIT", "labelReverse": true}
+ {"type": "beamlineUp", "position": 1000, "name": "BEAR", "labelReverse": true},
+ {"type": "beamlineDown", "position": 1000, "name": "LILIT", "labelReverse": true}
]
},
{
@@ -1642,7 +1642,7 @@
{
"start": {"x": -26460, "z": -31820},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "BACH", "labelReverse": true}
+ {"type": "beamlineUp", "position": 1000, "name": "BACH", "labelReverse": true}
]
},
{
@@ -1652,7 +1652,7 @@
{
"start": {"x": -18940, "z": -36840},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "SISSI", "labelReverse": true}
+ {"type": "beamlineUp", "position": 1000, "name": "SISSI", "labelReverse": true}
]
},
{
@@ -1662,7 +1662,7 @@
{
"start": {"x": -7120, "z": -40800},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "APE", "labelReverse": true}
+ {"type": "beamlineUp", "position": 1000, "name": "APE", "labelReverse": true}
]
},
{
@@ -1672,8 +1672,8 @@
{
"start": {"x": 1960, "z": -41400},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "Microfluorescence", "labelReverse": true},
- {"type": "beamlineUp", "position": 1000, "name": "DXRL", "labelReverse": true}
+ {"type": "beamlineUp", "position": 1000, "name": "Microfluorescence", "labelReverse": true},
+ {"type": "beamlineDown", "position": 1000, "name": "DXRL", "labelReverse": true}
]
},
{
@@ -1683,8 +1683,8 @@
{
"start": {"x": 14160, "z": -38960},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "IUVS"},
- {"type": "beamlineUp", "position": 1000, "name": "BaDElPh"}
+ {"type": "beamlineUp", "position": 1000, "name": "IUVS"},
+ {"type": "beamlineDown", "position": 1000, "name": "BaDElPh"}
]
},
{
@@ -1694,8 +1694,8 @@
{
"start": {"x": 22360, "z": -34900},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "XAFS"},
- {"type": "beamlineUp", "position": 1000, "name": "WhITE"}
+ {"type": "beamlineUp", "position": 1000, "name": "XAFS"},
+ {"type": "beamlineDown", "position": 1000, "name": "WhITE"}
]
},
{
@@ -1706,14 +1706,190 @@
"start": {"x": 22360, "z": -34900},
"start": {"x": 31720, "z": -26640},
"components": [
- {"type": "beamlineDown", "position": 1000, "name": "XDR2"},
- {"type": "beamlineUp", "position": 1000, "name": "XPRESS"}
+ {"type": "beamlineUp", "position": 1000, "name": "XDR2"},
+ {"type": "beamlineDown", "position": 1000, "name": "XPRESS"}
]
},
{
"start": {"x": 50440, "z": -10120},
"chamber": {"type": "chamberbl"}
- }
+ },
+ {
+ "start": {"x": -6000, "z": 1500},
+ "components": [
+ {"type": "rrf", "position": 0, "name": "RRFB_BSA1.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "ECRFBSA1"
+ ]},
+ {"type": "rrf", "position": 500, "name": "RRFB_BSA1.2", "labelReverse": [90, -1200, 300], "embedded":[
+ ]},
+ {"type": "rrf", "position": 1000, "name": "RRFB_BSA1.3", "labelReverse": [90, -1200, 300], "embedded":[
+ ]},
+ {"type": "INT", "position": 1500, "name": "INTB_BSA1.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "SPAC_BSA1.1","XXXXXXXXX"
+ ]},
+ {"type": "XXXXX", "position": 2000, "name": "XXXXX", "labelReverse": [90, -1200, 300], "embedded":[
+ "XXXXXXXX","XXXXXXXXX"
+ ]},
+ {"type": "XXXXX", "position": 2500, "name": "XXXXXX", "labelReverse": [90, -1200, 300], "embedded":[
+ "XXXXXXXX","XXXXXXXXX"
+ ]},
+ {"type": "rps", "position": 2900, "name": "RPSCB_BSA.01", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSCV_B22.1","PSCH_B23.1","PSCV_B24.1","PSCH_B25.1","PSCV_B26.1","PSCV_B2.1","PSCH_B3.1","PSCV_B4.1"
+ ]},
+ {"type": "rc", "position": 3500, "name": "RCB_BSA1.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "ECINJBSA1","ECPSBSA1"
+ ]},
+ {"type": "rv", "position": 4300, "name": "RV_BSA1.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSSIP_BSA1.1","PSSIP300RF_B27.1","PSSIP300RF_B27.2",
+ "PSSIP_BSA1.2","PSSIP500I_B28.1",
+ "PSSIP_BSA1.3","PSSIP500KI_B28.1",
+ "PSSIP_BSA1.4","PSSIP55_B27.1","PSSIP55_B1.2","PSSIP55_B6.1","PSSIP55_B11.1",
+ "PSSIP_BSA1.5","PSSIP55_B28.1","PSSIP55_B2.1","PSSIP55_B7.1","PSSIP55_B12.1",
+ "PSSIP_BSA1.6","PSSIP55_B28.2","PSSIP55_B3.1","PSSIP55_B8.1","PSSIP55_B13.1",
+ "PSSIP_BSA1.7","PSSIP55_B28.3","PSSIP55_B4.1","PSSIP55_B9.1",
+ "PSSIP_BSA1.8","PSSIP55_B1.1","PSSIP55_B5.1","PSSIP55_B10.1"
+ ]},
+ {"type": "rv", "position": 5000, "name": "RVB_BSA1.2", "labelReverse": [90, -1200, 300], "embedded":[
+ "TPG_BSA1.1","VGPERF_B27.1","VGPIRF_B27.1","VGPERF_B27.2",
+ "TPG_BSA1.2","VGPE_B27.1","VGPI_B27.1","VGPE_B28.1","VGPI_B28.1",
+ "TPG_BSA1.3","VGPEI_B28.1","VGPII_B28.1","VGPEI_B28.2",
+ "TPG_BSA1.4","VGPEKI_B28.1","VGPIKI_B28.1","VGPEKI_B28.2",
+ "TPG_BSA1.5","VGPE_B2.1","VGPI_B3.1","VGPE_B6.1",
+ "TPG_BSA1.6","VGPE_B8.1","VGPI_B10.1","VGPE_B12.1"
+ ]},
+ {"type": "rd", "position": 5500, "name": "RDB_BSA1.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "EC TIMING"
+ ]}
+
+ ]
+ },
+ {
+ "start": {"x": -12500, "z": 1000},
+ "bending": {"rotateY": "PI"},
+ "components": [
+ ]
+ },
+ {
+ "start": {"x": -15000, "z": -10000},
+ "components": [
+ {"type": "rpsb", "position": 0, "name": "CABB_BTS2.1", "labelReverse": [90, -1200, 300], "embedded":[
+ ""
+ ]},
+ {"type": "rpsb", "position": 2000, "name": "CABB_BTS2.2", "labelReverse": [90, -1200, 300], "embedded":[
+ ""
+ ]},
+ {"type": "rpsq", "position": 4000, "name": "CAQB_BTS2.1", "labelReverse": [90, -1200, 300], "embedded":[
+ ""
+ ]}
+
+ ]
+ },
+ {
+ "start": {"x": -2500, "z": -18000},
+ "bending": {"rotateY": "PI"},
+ "components": [
+ ]
+ },
+ {
+ "start": {"x": -4000, "z": -13500},
+ "components": [
+ {"type": "rps", "position": 0, "name": "RPSQBTS_BSA2.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSQ_BTS1.1","PSQ_BTS1.2","PSQ_BTS1.3","PSQ_BTS1.4","PSQ_BTS1.5","PSQ_BTS1.6"
+ ]},
+ {"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSCH_BTS1.1","PSCV_BTS1.1","PSCH_BTS1.2","PSCV_BTS1.2","PSCH_BTS1.3","PSCV_BTS1.3","PSCH_BTS1.4","PSCV_BTS1.4"
+ ]},
+ {"type": "rd", "position": 1200, "name": "RDB_BSA2.2", "labelReverse": [90, -1200, 300], "embedded":[
+ ]},
+ {"type": "rps", "position": 1800, "name": "RPSCB_BSA2.2", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSCH_B5.1","PSCV_B6.1","PSCH_B7.1","PSCV_B8.1","PSCH_B9.1","PSCV_B10.1","PSCH_B11.1","PSCV_B12.1"
+ ]},
+ {"type": "rps", "position": 2400, "name": "RBUMP_BSA2.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSBUMP_B13.1","PSBUMP_B14.1","PSBUMP_B14.2","PSBUMP_B14.3"
+ ]},
+ {"type": "rc", "position": 3000, "name": "RCBBSA2.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "ECEXTBSA2","ECPSBSA2.1","ECPSBSA2.2"
+ ]}
+ ]
+ },
+ {
+ "start": {"x": -16500, "z": -13450},
+ "bending": {"rotateY": "PI"},
+ "components": [
+ ]
+ },
+ {
+ "start": {"x": 1000, "z": -13500},
+ "components": [
+ {"type": "rps", "position": 0, "name": "RPSBBTS_BSA2.2", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSB_BTS1.3","PDUBTS_BSA2.3"
+ ]},
+ {"type": "rps", "position": 600, "name": "RPSCBTS_BSA2.2", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSB_BTS1.1","PDUBTS_BSA2.1","PSB_BTS1.2","PDUBTS_BSA2.2"
+ ]}
+ ]
+ },
+ {
+ "start": {"x": -16500, "z": -13450},
+ "bending": {"rotateY": "PI"},
+ "components": [
+ ]
+ },
+ {
+ "start": {"x": 9000, "z": -6000},
+ "components": [
+ {"type": "rd", "position": 0, "name": "RDB_BSA3.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "ECSCRBSA3"
+ ]},
+ {"type": "rps", "position": 600, "name": "RPSCB_BSA3.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSCV_B16.1","PSCH_B17.1","PSCV_B18.1","PSCH_B19.1","PSCV_B20.1","PSCH_B21.1","PSSF_B1","PSSD_B1"
+ ]},
+ {"type": "rc", "position": 1200, "name": "RCB_BSA3.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "ECPSBSA3"
+ ]},
+ {"type": "rv", "position": 2000, "name": "RVB_BSA3.2", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSSIP_BSA3.8","PSSIP55_BTS1.1","PSSIP55_BTS1.3","PSSIP55_BTS1.5","PSSIP55_BTS1.7",
+ "PSSIP_BSA3.9","PSSIP55_BTS1.2","PSSIP55_BTS1.4","PSSIP55_BTS1.6",
+ "TPG_BSA3.1","VGPEKE_B13.1","VGPIKE_B13.1","VGPEKE_B13.2",
+ "TPG_BSA3.2","VGPE_B14.1","VGPI_B14.1","VGPE_B15.1","VGPI_B17.1",
+ "TPG_BSA3.3","VGPEE_B14.1","VGPIE_B14.1","VGPEE_B14.2",
+ "TPG_BSA3.4","VGPE_B18.1","VGPE_B22.1",
+ "TPG_BSA3.5","VGPE_B26.1","VGPI_B24.1",
+ "TPG_BSA3.6","VGPE_BTS1.1","VGPI_BTS1.1","VGPE_BTS1.2","VGPI_BTS1.2",
+ "TPG_BSA3.7","VGPE_BTS1.3"
+ ]},
+ {"type": "rv", "position": 2800, "name": "RVB_BSA3.1", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSSIP_BSA3.1","PSSIP500KE_B13.1","PSSIP500KE_B14.1",
+ "PSSIP_BSA3.2","PSSIP500E_B14.2",
+ "PSSIP_BSA3.3","PSSIP55_B13.1","PSSIP55_B15.1","PSSIP55_B20.1","PSSIP55_B25.1",
+ "PSSIP_BSA3.4","PSSIP55_B14.1","PSSIP55_B16.1","PSSIP55_B21.1","PSSIP55_B26.1",
+ "PSSIP_BSA3.5","PSSIP55_B14.2","PSSIP55_B17.1","PSSIP55_B22.1","PSSIP55_B27.1",
+ "PSSIP_BSA3.6","PSSIP55_B14.3","PSSIP55_B18.1","PSSIP55_B23.1",
+ "PSSIP_BSA3.7","PSSIP55_B15.1","PSSIP55_B19.1","PSSIP55_B24.1"
+ ]}
+ ]
+ },
+ {
+ "start": {"x": 6000, "z": -10000},
+ "bending": {"rotateY": "PI"},
+ "components": [
+ ]
+ },
+ {
+ "start": {"x": 0, "z": 0},
+ "components": [
+ {"type": "rps", "position": 0, "name": "RPSBBTS_BSA2.2", "labelReverse": [90, -1200, 300], "embedded":[
+ "PSB_BTS1.3","PDUBTS_BSA2.3"
+ ]}
+ ]
+ },
+ {
+ "start": {"x": 7500, "z": -13450},
+ "bending": {"rotateY": "PI"},
+ "components": [
+ ]
+ }
+
]
}
}