Merge branch 'master' into 'master'

changing the name of the daqsync-03 host to use sf- instead of daqsf-

See merge request sf_config/sf_daq_sources!23
This commit is contained in:
2020-11-03 08:48:29 +01:00

View File

@@ -115,7 +115,7 @@
/* SARES11-SPEC125-M1 */
/* ,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} */
,{"stream":"tcp://daqsf-daqsync-03-v346.psi.ch:9003","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://sf-daqsync-03-v346.psi.ch:9003","split":4,"backend":"sf-imagebuffer"}
/* SARES11-SPEC125-M2 */
,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
@@ -132,7 +132,7 @@
/* SATES21-CAMS154-M1 */
/* ,{"stream":"tcp://daqsf-daqsync-04.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}*/
,{"stream":"tcp://daqsf-daqsync-03-v346.psi.ch:9001","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://sf-daqsync-03-v346.psi.ch:9001","split":4,"backend":"sf-imagebuffer"}
/* SATES21-CAMS161-M1 */
,{"stream":"tcp://daqsf-daqsync-04.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}