From c522956254ed54c8a7c159626a3e07b2dbd4c8cd Mon Sep 17 00:00:00 2001 From: ebner Date: Thu, 29 Jun 2017 16:22:24 +0200 Subject: [PATCH 1/9] Add policy for beam ok channel - basically we should keep it forever --- policies/timing.policies | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 policies/timing.policies diff --git a/policies/timing.policies b/policies/timing.policies new file mode 100644 index 0000000..71093f4 --- /dev/null +++ b/policies/timing.policies @@ -0,0 +1,52 @@ +/* Timing data policy */ +/* ======================================== */ + + +/* ------------------------------------------------------------ */ +/* - override settings - */ +/* - - */ +/* - Each default setting will be overridden, when a better - */ +/* - match (exacter match) is made. It is independant of the - */ +/* - sequence in this configuration file. - */ +/* ------------------------------------------------------------ */ + + +/* +Examples for modulo settings: + "modulo":1 1 point every 10 ms (100 Hz) + "modulo":100 1 point every 1 second + "modulo":60000 1 point every 10 minutes + "modulo":3600000 1 point every 1 hour + +Examples for ttl settings: + PT1M 1 minute + PT2H 2 hours + P1D 1 day + P2W 2 weeks + P1M 1 month +*/ + + + + + +{ + "policies": [ +{ + "pattern":":BEAMOK", + "data_reduction":{ + "default":[ + { + "ttl":"P10Y", + "modulo":1 + /* 1 point every 1 hour */ + } + ] + } +} + + + + + ] +} From ce21811039fc105914189df2a177268513ec4f4b Mon Sep 17 00:00:00 2001 From: ebner Date: Thu, 29 Jun 2017 16:27:11 +0200 Subject: [PATCH 2/9] reduced to 20 weeks --- policies/timing.policies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policies/timing.policies b/policies/timing.policies index 71093f4..21bd67c 100644 --- a/policies/timing.policies +++ b/policies/timing.policies @@ -37,7 +37,7 @@ Examples for ttl settings: "data_reduction":{ "default":[ { - "ttl":"P10Y", + "ttl":"P20W", "modulo":1 /* 1 point every 1 hour */ } From 8364f74d1042ac8d68e6366776aa726b44ef603f Mon Sep 17 00:00:00 2001 From: ebner Date: Thu, 29 Jun 2017 16:41:39 +0200 Subject: [PATCH 3/9] remove nonsense =) --- policies/timing.policies | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/policies/timing.policies b/policies/timing.policies index 21bd67c..f33b636 100644 --- a/policies/timing.policies +++ b/policies/timing.policies @@ -1,35 +1,3 @@ -/* Timing data policy */ -/* ======================================== */ - - -/* ------------------------------------------------------------ */ -/* - override settings - */ -/* - - */ -/* - Each default setting will be overridden, when a better - */ -/* - match (exacter match) is made. It is independant of the - */ -/* - sequence in this configuration file. - */ -/* ------------------------------------------------------------ */ - - -/* -Examples for modulo settings: - "modulo":1 1 point every 10 ms (100 Hz) - "modulo":100 1 point every 1 second - "modulo":60000 1 point every 10 minutes - "modulo":3600000 1 point every 1 hour - -Examples for ttl settings: - PT1M 1 minute - PT2H 2 hours - P1D 1 day - P2W 2 weeks - P1M 1 month -*/ - - - - - { "policies": [ { From 594f97864b2fc9921fe80ca564c5990fd83699eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Fri, 30 Jun 2017 13:14:21 +0200 Subject: [PATCH 4/9] Specify BEAMOK and disable images. --- policies/timing.policies | 27 +++++++++++---------------- sources/image.sources | 2 ++ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/policies/timing.policies b/policies/timing.policies index f33b636..46cf497 100644 --- a/policies/timing.policies +++ b/policies/timing.policies @@ -1,20 +1,15 @@ { "policies": [ -{ - "pattern":":BEAMOK", - "data_reduction":{ - "default":[ - { - "ttl":"P20W", - "modulo":1 - /* 1 point every 1 hour */ - } - ] - } -} - - - - + { + "pattern":"^SIN-CVME-TIFGUN-EVR0:BEAMOK$", + "data_reduction":{ + "default":[ + { + "ttl":"P20W", + "modulo":1 + } + ] + } + } ] } diff --git a/sources/image.sources b/sources/image.sources index 1806021..938a01b 100644 --- a/sources/image.sources +++ b/sources/image.sources @@ -1,5 +1,6 @@ { "sources": [ + /* {"stream":"tcp://daqsf-sioc-cs-11.psi.ch:8020","split":4,"backend":"sf-imagebuffer"} ,{"stream":"tcp://daqsf-sioc-cs-11.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} ,{"stream":"tcp://daqsf-sioc-cs-12.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} @@ -16,5 +17,6 @@ ,{"stream":"tcp://daqsf-sioc-cs-62.psi.ch:9010","split":4,"backend":"sf-imagebuffer"} ,{"stream":"tcp://daqsf-sioc-cs-63.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} ,{"stream":"tcp://daqsf-sioc-cs-63.psi.ch:9010","split":4,"backend":"sf-imagebuffer"} + */ ] } From d73c710dd340ea355b4585390f0eb7fa324a280f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Wed, 5 Jul 2017 11:55:12 +0200 Subject: [PATCH 5/9] Disable and wait until Dragutin enables new firmware. --- sources/mps.sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/mps.sources b/sources/mps.sources index 0f4ab52..bfb5211 100644 --- a/sources/mps.sources +++ b/sources/mps.sources @@ -1,5 +1,5 @@ { "sources": [ - { "stream": "tcp://SIN-CVME-MPS0151:9999" } + /*{ "stream": "tcp://SIN-CVME-MPS0151:9999" }*/ ] } From 79b9b35a3388b32e7e8e0526f98a842774de0a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Wed, 5 Jul 2017 11:55:35 +0200 Subject: [PATCH 6/9] Disable sources without EVR. --- sources/dwsc.sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/dwsc.sources b/sources/dwsc.sources index de0ba4d..f7c1493 100644 --- a/sources/dwsc.sources +++ b/sources/dwsc.sources @@ -5,9 +5,9 @@ {"stream": "tcp://S10-CPPM-MOT0991:9999"}, {"stream": "tcp://S10-CPPM-MOT1531:9999"}, {"stream": "tcp://S10-CPPM-MOT2161:9999"}, - {"stream": "tcp://S20-CPPM-MOT2551:9999"}, + /*{"stream": "tcp://S20-CPPM-MOT2551:9999"},*/ {"stream": "tcp://S30-CPPM-MOT3101:9999"}, - {"stream": "tcp://SAT-CPPM-MOT4001:9999"}, + /*{"stream": "tcp://SAT-CPPM-MOT4001:9999"},*/ {"stream": "tcp://SAR-CPPM-MOT4693:9999"} ] } From 6cc94d4b6366144805e924f5272e6de3c1aeb7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Thu, 20 Jul 2017 09:58:33 +0200 Subject: [PATCH 7/9] Reactivate MPS --- sources/mps.sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/mps.sources b/sources/mps.sources index bfb5211..0f4ab52 100644 --- a/sources/mps.sources +++ b/sources/mps.sources @@ -1,5 +1,5 @@ { "sources": [ - /*{ "stream": "tcp://SIN-CVME-MPS0151:9999" }*/ + { "stream": "tcp://SIN-CVME-MPS0151:9999" } ] } From abb83bbe6272f43d8477b29d7253bf18fdd5b223 Mon Sep 17 00:00:00 2001 From: Patrick Pollet Date: Mon, 24 Jul 2017 10:52:34 +0200 Subject: [PATCH 8/9] S10CB07 enabled --- sources/llrf.sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/llrf.sources b/sources/llrf.sources index a54b950..bc61bd8 100644 --- a/sources/llrf.sources +++ b/sources/llrf.sources @@ -30,9 +30,9 @@ ,{"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"} From 61247cb35e840aaed395ef3b93da82bdbc15f8ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Wed, 26 Jul 2017 09:03:20 +0200 Subject: [PATCH 9/9] Disable tcp://S30CB13-CVME-LLRF2:20000 (pulse-id 0, random time) --- sources/llrf.sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/llrf.sources b/sources/llrf.sources index bc61bd8..9ed7265 100644 --- a/sources/llrf.sources +++ b/sources/llrf.sources @@ -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"}*/ ]