manually copied changes from merge request https://git.psi.ch/sf_config/sf_daq_sources/merge_requests/105 - due to it being 10 commits behind - changes requested by edwin

This commit is contained in:
2019-07-25 13:31:57 +02:00
parent b4cfd93261
commit 3ed2d285c8
3 changed files with 8 additions and 4 deletions
+3
View File
@@ -2,6 +2,9 @@
/* ESA - Responsible Edwin Divall & Scott Stubbs */
"sources": [
{"stream": "tcp://SARES11-CPCL-GES1:9999"}
,{"stream": "tcp://SARES11-CPCL-GES1:9990"}
,{"stream": "tcp://SARES11-CPCL-GES1:9980"}
,{"stream": "tcp://SARES11-CPCL-GES1:9970"}
,{"stream": "tcp://SLAAR11-CPPM-MOT6891:9999"}
,{"stream": "tcp://SLAAR11-CVME-LAS6891:9999"}
,{"stream": "tcp://SARES11-CVME-PRIME1:9999"}
+4 -3
View File
@@ -1,9 +1,10 @@
{
/* ESB - Responsible Edwin Divall */
"sources": [
{"stream": "tcp://SARES21-CPCL-GES1:9999"}
,{"stream": "tcp://SARES21-CPCL-GES1:9990"}
,{"stream": "tcp://SARES21-CPCL-GES1:9980"}
{"stream": "tcp://SARES21-CPCL-GES1:9999"}
,{"stream": "tcp://SARES21-CPCL-GES1:9990"}
,{"stream": "tcp://SARES21-CPCL-GES1:9980"}
,{"stream": "tcp://SARES21-CPCL-GES1:9970"}
,{"stream": "tcp://SLAAR21-CPPM-MOT6991:9999"}
,{"stream": "tcp://SLAAR21-CVME-LAS6991:9999"}
,{"stream": "tcp://SARES20-CVME-01:9999"}
+1 -1
View File
@@ -76,7 +76,7 @@
/* ,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:9080","split":4,"backend":"sf-imagebuffer"} */
,{"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"} */
,{"stream":"tcp://daqsf-sioc-cs-85.psi.ch:9010","split":4,"backend":"sf-imagebuffer"}
,{"stream":"tcp://daqsf-daqsync-02:8889","split":4,"backend":"sf-imagebuffer"}
]
}