Merge branch 'master' into 'master'

enable S20CB04 beam synchronous modulator data

See merge request sf_config/sf_daq_sources!84
This commit is contained in:
2018-07-25 07:39:17 +02:00

View File

@@ -14,8 +14,8 @@
/*linac 2*/
/*,{"stream": "tcp://S20CB01-CVME-ILK:9000"}
,{"stream": "tcp://S20CB02-CVME-ILK:9000"}
,{"stream": "tcp://S20CB03-CVME-ILK:9000"}
,{"stream": "tcp://S20CB04-CVME-ILK:9000"}*/
,{"stream": "tcp://S20CB03-CVME-ILK:9000"}*/
,{"stream": "tcp://S20CB04-CVME-ILK:9000"}
/*linac 3*/
{"stream": "tcp://S30CB01-CVME-ILK:9000"}
,{"stream": "tcp://S30CB02-CVME-ILK:9000"}