From f59fbe226d268d9b0aadd7c5380f8f40006cf4bf Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Thu, 22 Mar 2018 16:32:24 +0100 Subject: [PATCH 1/3] enable S20CB04 and S30CB09-11 LLRF / RF interlock --- sources/llrf.sources | 8 ++++---- sources/rf_interlock.sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/llrf.sources b/sources/llrf.sources index dc8e0bd..fa2a76e 100644 --- a/sources/llrf.sources +++ b/sources/llrf.sources @@ -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,13 +64,13 @@ ,{"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-LLRF1:20000"} ,{"stream": "tcp://S30CB12-CVME-LLRF2:20000"}*/ ,{"stream": "tcp://S30CB13-CVME-LLRF1:20000"} ,{"stream": "tcp://S30CB13-CVME-LLRF2:20000"} diff --git a/sources/rf_interlock.sources b/sources/rf_interlock.sources index 1ec6f2d..270a879 100644 --- a/sources/rf_interlock.sources +++ b/sources/rf_interlock.sources @@ -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"} From e92bf12d87df1be02962e05b70df8ad231cbaceb Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Tue, 27 Mar 2018 14:55:04 +0200 Subject: [PATCH 2/3] enable L3 but not S30CB04 (OFF, klystron problem) and S30CB12 (not ready - commissioning) --- sources/rf_modulator.sources | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/rf_modulator.sources b/sources/rf_modulator.sources index 2621b8f..ed17048 100644 --- a/sources/rf_modulator.sources +++ b/sources/rf_modulator.sources @@ -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"} ] } From 6a107eae876a65c61eed572fc413a3734c6c6c17 Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Fri, 6 Apr 2018 14:54:29 +0200 Subject: [PATCH 3/3] enable S30CB12 LLRF --- sources/llrf.sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/llrf.sources b/sources/llrf.sources index fa2a76e..dd9c40d 100644 --- a/sources/llrf.sources +++ b/sources/llrf.sources @@ -70,8 +70,8 @@ ,{"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-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"}