augustin_s/sf_databuffer
0
0
Fork 0
forked from archiver_config/sf_databuffer
Code Pull Requests Activity

Merge branch 'master' into 'master'

Browse Source 
enable S20CB04 and S30CB09-11 LLRF / RF interlock

See merge request sf_config/sf_daq_sources!76
This commit is contained in:
maerki_f
2018-04-13 09:06:09 +02:00
parent e3df757cd2 6a107eae87
commit b437ac560f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/llrf.sources
+4 -4
View File
@@ -44,9 +44,9 @@
,{"stream": "tcp://S20CB02-CVME-LLRF2: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"}*/
/*,{"stream": "tcp://S20-CVME-LLRF:20000"}*/
/*linac 3*/
,{"stream": "tcp://S30CB01-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB01-CVME-LLRF2:20000"}
@@ -64,14 +64,14 @@
,{"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"}
,{"stream": "tcp://S30CB11-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB11-CVME-LLRF2:20000"}
,{"stream": "tcp://S30CB12-CVME-LLRF1:20000"}
,{"stream": "tcp://S30CB12-CVME-LLRF2: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"}
sources/rf_interlock.sources
+1 -1
View File
@@ -23,7 +23,7 @@
,{"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://S20CB04-CVME-ILK:9999"}
/*linac 3*/
,{"stream": "tcp://S30CB01-CVME-ILK:9999"}
,{"stream": "tcp://S30CB02-CVME-ILK:9999"}
sources/rf_modulator.sources
+3 -3
View File
@@ -20,7 +20,7 @@
{"stream": "tcp://S30CB01-CVME-ILK:9000"}
,{"stream": "tcp://S30CB02-CVME-ILK:9000"}
,{"stream": "tcp://S30CB03-CVME-ILK:9000"}
/*,{"stream": "tcp://S30CB04-CVME-ILK:9000"}
/*,{"stream": "tcp://S30CB04-CVME-ILK:9000"}*/
,{"stream": "tcp://S30CB05-CVME-ILK:9000"}
,{"stream": "tcp://S30CB06-CVME-ILK:9000"}
,{"stream": "tcp://S30CB07-CVME-ILK:9000"}
@@ -28,7 +28,7 @@
,{"stream": "tcp://S30CB09-CVME-ILK:9000"}
,{"stream": "tcp://S30CB10-CVME-ILK:9000"}
,{"stream": "tcp://S30CB11-CVME-ILK:9000"}
,{"stream": "tcp://S30CB12-CVME-ILK:9000"}
,{"stream": "tcp://S30CB13-CVME-ILK:9000"}*/
/*,{"stream": "tcp://S30CB12-CVME-ILK:9000"}*/
,{"stream": "tcp://S30CB13-CVME-ILK:9000"}
]
}