Merge branch 'master' into 'master'

enable S10CB03, 04, 07 LLRF and RF ILK

The configuration was changed by kalt_r

See merge request !58
This commit is contained in:
2017-08-10 10:15:33 +02:00
2 changed files with 10 additions and 10 deletions
+6 -6
View File
@@ -22,21 +22,21 @@
,{"stream": "tcp://S10CB01-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB02-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB02-CVME-LLRF2:20000"}
/*,{"stream": "tcp://S10CB03-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB03-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB03-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB04-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB04-CVME-LLRF2:20000"}*/
,{"stream": "tcp://S10CB04-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB05-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB05-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB06-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB06-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB07-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB07-CVME-LLRF2:20000"}
/*,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB08-CVME-LLRF2:20000"}
,{"stream": "tcp://S10CB09-CVME-LLRF1:20000"}
,{"stream": "tcp://S10CB09-CVME-LLRF2:20000"}
,{"stream": "tcp://S10-CVME-LLRF:20000"}*/
/*,{"stream": "tcp://S10-CVME-LLRF:20000"}*/
/*linac 2*/
/*,{"stream": "tcp://S20CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S20CB01-CVME-LLRF2:20000"}
@@ -73,8 +73,8 @@
,{"stream": "tcp://S30CB12-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB12-CVME-LLRF2:20000"}*/
,{"stream": "tcp://S30CB13-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S30CB13-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB13-CVME-LLRF2:20000"}
/*,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB14-CVME-LLRF2:20000"}
,{"stream": "tcp://S30-CVME-LLRF:20000"}*/
]
+4 -4
View File
@@ -12,13 +12,13 @@
/*linac 1*/
,{"stream": "tcp://S10CB01-CVME-ILK:9999"}
,{"stream": "tcp://S10CB02-CVME-ILK:9999"}
/*,{"stream": "tcp://S10CB03-CVME-ILK:9999"}
,{"stream": "tcp://S10CB04-CVME-ILK:9999"}*/
,{"stream": "tcp://S10CB03-CVME-ILK:9999"}
,{"stream": "tcp://S10CB04-CVME-ILK:9999"}
,{"stream": "tcp://S10CB05-CVME-ILK:9999"}
,{"stream": "tcp://S10CB06-CVME-ILK:9999"}
/*,{"stream": "tcp://S10CB07-CVME-ILK:9999"}
,{"stream": "tcp://S10CB07-CVME-ILK:9999"}
,{"stream": "tcp://S10CB08-CVME-ILK:9999"}
,{"stream": "tcp://S10CB09-CVME-ILK:9999"}*/
,{"stream": "tcp://S10CB09-CVME-ILK:9999"}
/*linac 2*/
/*,{"stream": "tcp://S20CB01-CVME-ILK:9999"}
,{"stream": "tcp://S20CB02-CVME-ILK:9999"}