From 5ff0a1123396b5af05ace1a7b4f3330d62da3a55 Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Wed, 14 Feb 2018 09:58:48 +0100 Subject: [PATCH 1/2] enabled RF stations where ILK system is ready for streaming, remove port 9000 HV modulator test because moved to separate sources file --- sources/rf_interlock.sources | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sources/rf_interlock.sources b/sources/rf_interlock.sources index 3d47679..1ec6f2d 100644 --- a/sources/rf_interlock.sources +++ b/sources/rf_interlock.sources @@ -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"} ] From 08a9085e1307d78bc4a98f0cf9e1b02591d0e53e Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Wed, 14 Feb 2018 10:00:40 +0100 Subject: [PATCH 2/2] add RF HV modulator sources which is streamed over RF interlock IOCs over EtherCAT bridge. Currently only L3 / Scandinova modulators enabled --- sources/rf_modulator.sources | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 sources/rf_modulator.sources diff --git a/sources/rf_modulator.sources b/sources/rf_modulator.sources new file mode 100644 index 0000000..797c5ca --- /dev/null +++ b/sources/rf_modulator.sources @@ -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"} + ] +}