Merge branch 'master' into 'master'

My Changes

See merge request sf_config/sf_daq_sources!31
This commit is contained in:
2020-12-08 11:54:48 +01:00

View File

@@ -8,6 +8,7 @@
,{"stream": "tcp://SLAAR11-CPPM-MOT6891:9999"}
,{"stream": "tcp://SLAAR11-CVME-LAS6891:9999"}
,{"stream": "tcp://SARES11-CVME-PRIME1:9999"}
,{"stream": "tcp://SARES12-CPCL-GES1:9999"}
,{"stream": "tcp://SARES12-CVME-FLEX1:9999"}
/* Prime sample stage bsread */
,{"stream": "tcp://SARES11-CPPM-MOT6912:9999"}