Merge branch 'master' into 'master'

Update ESA source port, add areas for ESC + ESF and bit of cleanup

See merge request archiver_config/sf_databuffer!42
This commit is contained in:
2021-04-23 15:06:32 +02:00

View File

@@ -86,7 +86,7 @@
,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
/* ,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:9020","split":4,"backend":"sf-imagebuffer"} */
,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:9030","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:8080","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:8075","split":4,"backend":"sf-imagebuffer"}
/* ,{"stream":"tcp://daqsf-sioc-cs-82.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} */
/* ,{"stream":"tcp://daqsf-sioc-cs-82.psi.ch:9010","split":4,"backend":"sf-imagebuffer"} */
/* ,{"stream":"tcp://daqsf-sioc-cs-82.psi.ch:9020","split":4,"backend":"sf-imagebuffer"} */
@@ -105,6 +105,8 @@
,{"stream":"tcp://daqsf-sioc-cs-84.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
/* ,{"stream":"tcp://daqsf-sioc-cs-85.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} */
/* ,{"stream":"tcp://daqsf-sioc-cs-85.psi.ch:9010","split":4,"backend":"sf-imagebuffer"} */
/* Aramis ESC-Cristallina (none yet) */
/* Athos Photonics */
/* ,{"stream":"tcp://daqsf-sioc-cs-a1.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} */
@@ -126,36 +128,33 @@
,{"stream":"tcp://daqsf-sioc-cs-c2.psi.ch:9060","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-sioc-cs-c2.psi.ch:9070","split":4,"backend":"sf-imagebuffer"}
/* Athos ESF-Furka (none yet) */
/* PSSS SARFE10-PSSS059 */
,{"stream":"tcp://daqsf-daqsync-02.psi.ch:8890","split":4,"backend":"sf-imagebuffer", "labels": ["SARFE10-PSSS059"]}
,{"stream":"tcp://sf-daqsync-02:8889", "labels": ["SARFE10-PSSS059"]}
/* PSSS SARFE10-PSSS059 */
,{"stream":"tcp://daqsf-daqsync-02.psi.ch:8890","split":4,"backend":"sf-imagebuffer", "labels": ["SARFE10-PSSS059"]}
,{"stream":"tcp://sf-daqsync-02:8889", "labels": ["SARFE10-PSSS059"]}
/* SATES21-CAMS154-M1 */
,{"stream":"tcp://daqsf-daqsync-04.psi.ch:9000","split":4,"backend":"sf-imagebuffer", "labels": ["SATES21-CAMS154-M1"]}
,{"stream":"tcp://daqsf-daqsync-04.psi.ch:9000","split":4,"backend":"sf-imagebuffer", "labels": ["SATES21-CAMS154-M1"]}
,{"stream": "tcp://sf-daqsync-04.psi.ch:9001", "labels": ["SATES21-CAMS154-M1"]}
/* SATES24-CAMS161-M1 */
,{"stream":"tcp://daqsf-daqsync-04.psi.ch:9010","split":4,"backend":"sf-imagebuffer", "labels": ["SATES24-CAMS161-M1"]}
,{"stream":"tcp://daqsf-daqsync-04.psi.ch:9010","split":4,"backend":"sf-imagebuffer", "labels": ["SATES24-CAMS161-M1"]}
,{"stream": "tcp://sf-daqsync-04.psi.ch:9011", "labels": ["SATES24-CAMS161-M1"]}
/* PSEN SARES11-SPEC125-M1 */
,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9000","split":4,"backend":"sf-imagebuffer", "labels": ["SARES11-SPEC125-M1"]}
,{"stream": "tcp://sf-daqsync-05:9001", "labels": ["SARES11-SPEC125-M1"]}
,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9000","split":4,"backend":"sf-imagebuffer", "labels": ["SARES11-SPEC125-M1"]}
,{"stream": "tcp://sf-daqsync-05:9001", "labels": ["SARES11-SPEC125-M1"]}
/* SARES11-SPEC125-M2 */
,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9010","split":4,"backend":"sf-imagebuffer", "labels": ["SARES11-SPEC125-M2"]}
,{"stream": "tcp://sf-daqsync-05:9011", "labels": ["SARES11-SPEC125-M2"]}
,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9010","split":4,"backend":"sf-imagebuffer", "labels": ["SARES11-SPEC125-M2"]}
,{"stream": "tcp://sf-daqsync-05:9011", "labels": ["SARES11-SPEC125-M2"]}
/* FLEX SARES12-CAMS128-M1 */
,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9002","split":4,"backend":"sf-imagebuffer", "labels": ["SARES12-CAMS128-M1"]}
,{"stream": "tcp://sf-daqsync-05:9003", "labels": ["SARES12-CAMS128-M1"]}
,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9002","split":4,"backend":"sf-imagebuffer", "labels": ["SARES12-CAMS128-M1"]}
,{"stream": "tcp://sf-daqsync-05:9003", "labels": ["SARES12-CAMS128-M1"]}
/* PSEN SARES20-CAMS142-M1 */
@@ -163,24 +162,24 @@
,{"stream": "tcp://sf-daqsync-06:9003", "labels": ["SARES20-CAMS142-M1"]}
/* PSEN SARES20-CAMS142-M4 */
,{"stream":"tcp://daqsf-daqsync-06.psi.ch:9000","split":4,"backend":"sf-imagebuffer", "labels": ["SARES20-CAMS142-M4"]}
,{"stream":"tcp://daqsf-daqsync-06.psi.ch:9000","split":4,"backend":"sf-imagebuffer", "labels": ["SARES20-CAMS142-M4"]}
,{"stream": "tcp://sf-daqsync-06:9001", "labels": ["SARES20-CAMS142-M4"]}
/* PSEN SARES20-CAMS142-M5 */
,{"stream":"tcp://daqsf-daqsync-06.psi.ch:9010","split":4,"backend":"sf-imagebuffer", "labels": ["SARES20-CAMS142-M5"]}
,{"stream": "tcp://sf-daqsync-06:9011", "labels": ["SARES20-CAMS142-M5"]}
,{"stream":"tcp://daqsf-daqsync-06.psi.ch:9010","split":4,"backend":"sf-imagebuffer", "labels": ["SARES20-CAMS142-M5"]}
,{"stream": "tcp://sf-daqsync-06:9011", "labels": ["SARES20-CAMS142-M5"]}
/* SARES20-PROF142-M1 */
,{ "stream": "tcp://daqsf-daqsync-06.psi.ch:9005", "split": 4, "backend": "sf-imagebuffer", "labels": ["SARES20-PROF142-M1"]}
, {"stream": "tcp://sf-daqsync-06.psi.ch:9017", "labels": ["SARES20-PROF142-M1"]}
/* SARES20-PROF142-M1 */
,{"stream": "tcp://daqsf-daqsync-06.psi.ch:9005","split":4,"backend":"sf-imagebuffer", "labels": ["SARES20-PROF142-M1"]}
,{"stream": "tcp://sf-daqsync-06.psi.ch:9017", "labels": ["SARES20-PROF142-M1"]}
/* SAROP21-PPRM138 pipeline */
, {"stream": "tcp://sf-daqsync-06.psi.ch:9015", "labels": ["SAROP21-PPRM138"]}
,{"stream": "tcp://sf-daqsync-06.psi.ch:9015", "labels": ["SAROP21-PPRM138"]}
/* SARES20-PROF141-M1 pipeline */
, {"stream": "tcp://sf-daqsync-06.psi.ch:9016", "labels": ["SARES20-PROF141-M1"]}
,{"stream": "tcp://sf-daqsync-06.psi.ch:9016", "labels": ["SARES20-PROF141-M1"]}
/* SARES20-PROF146-M1 pipeline */
, {"stream": "tcp://sf-daqsync-06.psi.ch:9018", "labels": ["SARES20-PROF146-M1"]}
,{"stream": "tcp://sf-daqsync-06.psi.ch:9018", "labels": ["SARES20-PROF146-M1"]}
]
}