From dde851bf55ffd07d10d689fec99d7a12bd1ddd23 Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Wed, 21 Jun 2017 11:38:18 +0200 Subject: [PATCH 1/2] enable S10CB03, 04, 07 LLRF and RF ILK --- sources/llrf.sources | 8 ++++---- sources/rf_interlock.sources | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sources/llrf.sources b/sources/llrf.sources index a54b950..b16111b 100644 --- a/sources/llrf.sources +++ b/sources/llrf.sources @@ -22,17 +22,17 @@ ,{"stream": "tcp://S10CB01-CVME-LLRF2:20000"} ,{"stream": "tcp://S10CB02-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB02-CVME-LLRF2:20000"} - /*,{"stream": "tcp://S10CB03-CVME-LLRF1:20000"} + ,{"stream": "tcp://S10CB03-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB03-CVME-LLRF2:20000"} ,{"stream": "tcp://S10CB04-CVME-LLRF1:20000"} - ,{"stream": "tcp://S10CB04-CVME-LLRF2:20000"}*/ + ,{"stream": "tcp://S10CB04-CVME-LLRF2:20000"} ,{"stream": "tcp://S10CB05-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB05-CVME-LLRF2:20000"} ,{"stream": "tcp://S10CB06-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB06-CVME-LLRF2:20000"} - /*,{"stream": "tcp://S10CB07-CVME-LLRF1:20000"} + ,{"stream": "tcp://S10CB07-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB07-CVME-LLRF2:20000"} - ,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"} + /*,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB08-CVME-LLRF2:20000"} ,{"stream": "tcp://S10CB09-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB09-CVME-LLRF2:20000"} diff --git a/sources/rf_interlock.sources b/sources/rf_interlock.sources index f11156a..8e010d7 100644 --- a/sources/rf_interlock.sources +++ b/sources/rf_interlock.sources @@ -12,12 +12,12 @@ /*linac 1*/ ,{"stream": "tcp://S10CB01-CVME-ILK:9999"} ,{"stream": "tcp://S10CB02-CVME-ILK:9999"} - /*,{"stream": "tcp://S10CB03-CVME-ILK:9999"} - ,{"stream": "tcp://S10CB04-CVME-ILK:9999"}*/ + ,{"stream": "tcp://S10CB03-CVME-ILK:9999"} + ,{"stream": "tcp://S10CB04-CVME-ILK:9999"} ,{"stream": "tcp://S10CB05-CVME-ILK:9999"} ,{"stream": "tcp://S10CB06-CVME-ILK:9999"} - /*,{"stream": "tcp://S10CB07-CVME-ILK:9999"} - ,{"stream": "tcp://S10CB08-CVME-ILK:9999"} + ,{"stream": "tcp://S10CB07-CVME-ILK:9999"} + /*,{"stream": "tcp://S10CB08-CVME-ILK:9999"} ,{"stream": "tcp://S10CB09-CVME-ILK:9999"}*/ /*linac 2*/ /*,{"stream": "tcp://S20CB01-CVME-ILK:9999"} From 8411e64168788e3ef9a6921547209bf36af88967 Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Thu, 3 Aug 2017 14:34:42 +0200 Subject: [PATCH 2/2] enable S10CB08, 09 and wrongly disabled S30CB13-CVME-LLRF2 --- sources/llrf.sources | 8 ++++---- sources/rf_interlock.sources | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources/llrf.sources b/sources/llrf.sources index 66b113b..10ca131 100644 --- a/sources/llrf.sources +++ b/sources/llrf.sources @@ -32,11 +32,11 @@ ,{"stream": "tcp://S10CB06-CVME-LLRF2:20000"} ,{"stream": "tcp://S10CB07-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB07-CVME-LLRF2:20000"} - /*,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"} + ,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB08-CVME-LLRF2:20000"} ,{"stream": "tcp://S10CB09-CVME-LLRF1:20000"} ,{"stream": "tcp://S10CB09-CVME-LLRF2:20000"} - ,{"stream": "tcp://S10-CVME-LLRF:20000"}*/ + /*,{"stream": "tcp://S10-CVME-LLRF:20000"}*/ /*linac 2*/ /*,{"stream": "tcp://S20CB01-CVME-LLRF1:20000"} ,{"stream": "tcp://S20CB01-CVME-LLRF2:20000"} @@ -73,8 +73,8 @@ ,{"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"} + ,{"stream": "tcp://S30CB13-CVME-LLRF2:20000"} + /*,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"} ,{"stream": "tcp://S30CB14-CVME-LLRF2:20000"} ,{"stream": "tcp://S30-CVME-LLRF:20000"}*/ ] diff --git a/sources/rf_interlock.sources b/sources/rf_interlock.sources index 8e010d7..b6a3a48 100644 --- a/sources/rf_interlock.sources +++ b/sources/rf_interlock.sources @@ -17,8 +17,8 @@ ,{"stream": "tcp://S10CB05-CVME-ILK:9999"} ,{"stream": "tcp://S10CB06-CVME-ILK:9999"} ,{"stream": "tcp://S10CB07-CVME-ILK:9999"} - /*,{"stream": "tcp://S10CB08-CVME-ILK:9999"} - ,{"stream": "tcp://S10CB09-CVME-ILK:9999"}*/ + ,{"stream": "tcp://S10CB08-CVME-ILK:9999"} + ,{"stream": "tcp://S10CB09-CVME-ILK:9999"} /*linac 2*/ /*,{"stream": "tcp://S20CB01-CVME-ILK:9999"} ,{"stream": "tcp://S20CB02-CVME-ILK:9999"}