Merge branch 'master' into 'master'

enable RF stations S20CB01, 02 and S30CB01, 02

The configuration was changed by kalt_r

See merge request !62
This commit is contained in:
maerki_f
2017-10-10 16:54:06 +02:00
2 changed files with 8 additions and 8 deletions
+4 -4
View File
@@ -38,21 +38,21 @@
,{"stream": "tcp://S10CB09-CVME-LLRF2:20000"}
/*,{"stream": "tcp://S10-CVME-LLRF:20000"}*/
/*linac 2*/
/*,{"stream": "tcp://S20CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB01-CVME-LLRF2:20000"}
,{"stream": "tcp://S20CB02-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB02-CVME-LLRF2:20000"}
,{"stream": "tcp://S20CB03-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S20CB03-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB03-CVME-LLRF2:20000"}
,{"stream": "tcp://S20CB04-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB04-CVME-LLRF2:20000"}
,{"stream": "tcp://S20-CVME-LLRF:20000"}*/
/*linac 3*/
/*,{"stream": "tcp://S30CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB01-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB02-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB02-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB03-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S30CB03-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB03-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB04-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB04-CVME-LLRF2:20000"}
+4 -4
View File
@@ -20,14 +20,14 @@
,{"stream": "tcp://S10CB08-CVME-ILK:9999"}
,{"stream": "tcp://S10CB09-CVME-ILK:9999"}
/*linac 2*/
/*,{"stream": "tcp://S20CB01-CVME-ILK:9999"}
,{"stream": "tcp://S20CB01-CVME-ILK:9999"}
,{"stream": "tcp://S20CB02-CVME-ILK:9999"}
,{"stream": "tcp://S20CB03-CVME-ILK:9999"}
/*,{"stream": "tcp://S20CB03-CVME-ILK:9999"}
,{"stream": "tcp://S20CB04-CVME-ILK:9999"}*/
/*linac 3*/
/*,{"stream": "tcp://S30CB01-CVME-ILK:9999"}
,{"stream": "tcp://S30CB01-CVME-ILK:9999"}
,{"stream": "tcp://S30CB02-CVME-ILK:9999"}
,{"stream": "tcp://S30CB03-CVME-ILK:9999"}
/*,{"stream": "tcp://S30CB03-CVME-ILK:9999"}
,{"stream": "tcp://S30CB04-CVME-ILK:9999"}
,{"stream": "tcp://S30CB05-CVME-ILK:9999"}
,{"stream": "tcp://S30CB06-CVME-ILK:9999"}