Merge branch 'master' into 'master'

add first furka sources, mostly commented for now

See merge request archiver_config/sf_databuffer!53
This commit is contained in:
2021-07-06 14:46:31 +02:00
2 changed files with 12 additions and 2 deletions

View File

@@ -1,6 +1,15 @@
{
/* ESF Furka - Responsible T. Zamofing & E. Divall */
"sources": [
/* none yet */
/* to be uncommented as added */
/* IFC SATES30-CVME */
/* {"stream": "tcp://sates30-cvme-furka1:9999"} */
/* KEYSIGHT RAW DATA */
/* ,{"stream": "tcp://sates31-cpcl-ges1:9999"} */
/* KEYSIGHT ANALYSIS 1 */
/* ,{"stream": "tcp://sates31-cpcl-ges1:9989"} */
]
}

View File

@@ -127,7 +127,8 @@
,{"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) */
/* Athos ESF-Furka */
,{"stream":"tcp://daqsf-sioc-cs-c6.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
/* PSSS SARFE10-PSSS059 */
,{"stream":"tcp://daqsf-daqsync-02.psi.ch:8890","split":4,"backend":"sf-imagebuffer", "labels": ["SARFE10-PSSS059"]}