Merge branch 'master' into 'master'

enabled SINSB04 & SINXB01 RF stations for the databuffer configuration

The configuration was changed by gaertner

See merge request !19
This commit is contained in:
maerki_f
2016-09-15 10:00:05 +02:00
+2 -2
View File
@@ -9,11 +9,11 @@
,{"stream": "tcp://SINSB02-CVME-LLRF1:20000"}
,{"stream": "tcp://SINSB02-CVME-LLRF2:20000"}
/*,{"stream": "tcp://SINSB03-CVME-LLRF1:20000"}
,{"stream": "tcp://SINSB03-CVME-LLRF2:20000"}
,{"stream": "tcp://SINSB03-CVME-LLRF2:20000"}*/
,{"stream": "tcp://SINSB04-CVME-LLRF1:20000"}
,{"stream": "tcp://SINSB04-CVME-LLRF2:20000"}
,{"stream": "tcp://SINXB01-CVME-LLRF1:20000"}
,{"stream": "tcp://SINXB01-CVME-LLRF2:20000"}*/
,{"stream": "tcp://SINXB01-CVME-LLRF2:20000"}
,{"stream": "tcp://SINDI01-CVME-LLRF1:20000"}
,{"stream": "tcp://SINDI01-CVME-LLRF2:20000"}
/*linac 1*/