Merge branch 'master' into 'master'

enabled next RF stations

See merge request sf_config/sf_daq_sources!71
This commit is contained in:
maerki_f
2018-01-18 14:04:35 +01:00
2 changed files with 8 additions and 8 deletions
+4 -4
View File
@@ -42,9 +42,9 @@
,{"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-LLRF1:20000"}
,{"stream": "tcp://S20CB04-CVME-LLRF2:20000"}
,{"stream": "tcp://S20-CVME-LLRF:20000"}*/
/*linac 3*/
@@ -56,7 +56,7 @@
,{"stream": "tcp://S30CB03-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB04-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB04-CVME-LLRF2:20000"}
/*,{"stream": "tcp://S30CB05-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB05-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB05-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB06-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB06-CVME-LLRF2:20000"}
@@ -64,7 +64,7 @@
,{"stream": "tcp://S30CB07-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB08-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB08-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB09-CVME-LLRF1:20000"}
/*,{"stream": "tcp://S30CB09-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB09-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB10-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB10-CVME-LLRF2:20000"}
+4 -4
View File
@@ -22,8 +22,8 @@
/*linac 2*/
,{"stream": "tcp://S20CB01-CVME-ILK:9999"}
,{"stream": "tcp://S20CB02-CVME-ILK:9999"}
/*,{"stream": "tcp://S20CB03-CVME-ILK:9999"}
,{"stream": "tcp://S20CB04-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://S30CB02-CVME-ILK:9999"}
@@ -31,9 +31,9 @@
,{"stream": "tcp://S30CB04-CVME-ILK:9999"}
,{"stream": "tcp://S30CB05-CVME-ILK:9999"}
,{"stream": "tcp://S30CB06-CVME-ILK:9999"}
/*,{"stream": "tcp://S30CB07-CVME-ILK:9999"}
,{"stream": "tcp://S30CB07-CVME-ILK:9999"}
,{"stream": "tcp://S30CB08-CVME-ILK:9999"}
,{"stream": "tcp://S30CB09-CVME-ILK:9999"}
/*,{"stream": "tcp://S30CB09-CVME-ILK:9999"}
,{"stream": "tcp://S30CB10-CVME-ILK:9999"}
,{"stream": "tcp://S30CB11-CVME-ILK:9999"}
,{"stream": "tcp://S30CB12-CVME-ILK:9999"}*/