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 
enabled RF interlock streaming for all stations ready, move HV modualtor streaming to new file rf_modulator.sources  and enable only L3 / Scandinova

See merge request sf_config/sf_daq_sources!74
This commit is contained in:
maerki_f
2018-02-15 13:44:21 +01:00
parent 5330dddd13 08a9085e13
commit 86a5a013b5
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/rf_interlock.sources
+2 -3
View File
@@ -30,14 +30,13 @@
,{"stream": "tcp://S30CB03-CVME-ILK:9999"}
,{"stream": "tcp://S30CB04-CVME-ILK:9999"}
,{"stream": "tcp://S30CB05-CVME-ILK:9999"}
,{"stream": "tcp://S30CB05-CVME-ILK:9000"}
,{"stream": "tcp://S30CB06-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"}*/
/*,{"stream": "tcp://S30CB12-CVME-ILK:9999"}*/
,{"stream": "tcp://S30CB13-CVME-ILK:9999"}
,{"stream": "tcp://S30CB14-CVME-ILK:9999"}
]
sources/rf_modulator.sources
+34
View File
@@ -0,0 +1,34 @@
{
/*LLRF's RF Interlock IOC's with bsread streaming from HV modulator over EtherCAT bridge (=port:9000)*/
"sources": [
/*linac 1*/
*/ {"stream": "tcp://S10CB01-CVME-ILK:9000"}
,{"stream": "tcp://S10CB02-CVME-ILK:9000"}
,{"stream": "tcp://S10CB03-CVME-ILK:9000"}
,{"stream": "tcp://S10CB04-CVME-ILK:9000"}
,{"stream": "tcp://S10CB05-CVME-ILK:9000"}
,{"stream": "tcp://S10CB06-CVME-ILK:9000"}
,{"stream": "tcp://S10CB07-CVME-ILK:9000"}
,{"stream": "tcp://S10CB08-CVME-ILK:9000"}
,{"stream": "tcp://S10CB09-CVME-ILK:9000"}*/
/*linac 2*/
/*,{"stream": "tcp://S20CB01-CVME-ILK:9000"}
,{"stream": "tcp://S20CB02-CVME-ILK:9000"}
,{"stream": "tcp://S20CB03-CVME-ILK:9000"}
,{"stream": "tcp://S20CB04-CVME-ILK:9000"}*/
/*linac 3*/
{"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://S30CB05-CVME-ILK:9000"}
,{"stream": "tcp://S30CB06-CVME-ILK:9000"}
,{"stream": "tcp://S30CB07-CVME-ILK:9000"}
,{"stream": "tcp://S30CB08-CVME-ILK:9000"}
/*,{"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"}
]
}