augustin_s/sf_databuffer
0
0
Fork 0
forked from archiver_config/sf_databuffer
Code Pull Requests Activity

Merge branch 'master' into 'master'

Browse Source 
changed SATES21 and SARES11 M1 cameras to use daqsync-03 test cam_server

See merge request sf_config/sf_daq_sources!28
This commit is contained in:
celcer_t
2020-11-24 17:52:39 +01:00
parent 92b6d95c13 1508187294
commit 2c50eba216
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/SARES10.sources
+2 -2
View File
@@ -15,8 +15,8 @@
,{"stream": "tcp://SARES12-CPPM-MOT6952:9999"}
/* PSEN SARES11-SPEC125-M1 */
,{"stream": "tcp://sf-daqsync-05:9001"}
/*,{"stream": "tcp://sf-daqsync-03.psi.ch:9002"}*/
/* ,{"stream": "tcp://sf-daqsync-05:9001"} */
,{"stream": "tcp://sf-daqsync-03.psi.ch:9002"}
/* PSEN SARES11-SPEC125-M2 */
,{"stream": "tcp://sf-daqsync-05:9011"}
sources/SATES20.sources
+2 -2
View File
@@ -13,8 +13,8 @@
,{"stream": "tcp://sates21-cpcl-ges1:9989"}
/* SATES21-SPEC154-M1 analysis*/
,{"stream": "tcp://sf-daqsync-04.psi.ch:9001"}
/* ,{"stream": "tcp://sf-daqsync-03.psi.ch:9000"} */
/* ,{"stream": "tcp://sf-daqsync-04.psi.ch:9001"}*/
,{"stream": "tcp://sf-daqsync-03.psi.ch:9000"}
/* SATES24-CAMS161-M1 analysis*/
,{"stream": "tcp://sf-daqsync-04.psi.ch:9011"}
sources/image.sources
+4 -4
View File
@@ -114,8 +114,8 @@
,{"stream":"tcp://daqsf-sioc-cs-c2.psi.ch:9070","split":4,"backend":"sf-imagebuffer"}
/* SARES11-SPEC125-M1 */
,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
/* ,{"stream":"tcp://sf-daqsync-03-v346.psi.ch:9003","split":4,"backend":"sf-imagebuffer"} */
/* ,{"stream":"tcp://daqsf-daqsync-05.psi.ch:9000","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"}
@@ -131,8 +131,8 @@
,{"stream":"tcp://daqsf-daqsync-06.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
/* SATES21-CAMS154-M1 */
,{"stream":"tcp://daqsf-daqsync-04.psi.ch:9000","split":4,"backend":"sf-imagebuffer"}
/* ,{"stream":"tcp://sf-daqsync-03-v346.psi.ch:9001","split":4,"backend":"sf-imagebuffer"} */
/* ,{"stream":"tcp://daqsf-daqsync-04.psi.ch:9000","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"}