From 2236fa3d4f67a12ab537e5780a1fb1888e0c359b Mon Sep 17 00:00:00 2001 From: stubbs_s Date: Fri, 6 Sep 2019 15:48:45 +0200 Subject: [PATCH 1/3] Add cs-81 with ESA Basler sources --- sources/image.sources | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/image.sources b/sources/image.sources index f50caac..ab4995d 100644 --- a/sources/image.sources +++ b/sources/image.sources @@ -62,6 +62,8 @@ ,{"stream":"tcp://daqsf-sioc-cs-74.psi.ch:9140","split":4,"backend":"sf-imagebuffer"} ,{"stream":"tcp://daqsf-sioc-cs-74.psi.ch:9150","split":4,"backend":"sf-imagebuffer"} ,{"stream":"tcp://daqsf-sioc-cs-74.psi.ch:9160","split":4,"backend":"sf-imagebuffer"} + ,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} +/* ,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:9010","split":4,"backend":"sf-imagebuffer"} */ ,{"stream":"tcp://daqsf-sioc-cs-82.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} /* ,{"stream":"tcp://daqsf-sioc-cs-82.psi.ch:9010","split":4,"backend":"sf-imagebuffer"} */ ,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:8060","split":4,"backend":"sf-imagebuffer"} From 5f29a20c322f36b76e6f91cbfb91599bb82abcd8 Mon Sep 17 00:00:00 2001 From: Roger Kalt Date: Mon, 9 Sep 2019 10:48:18 +0200 Subject: [PATCH 2/3] add athos, enable SATCB01 LLRF/ILK but keep data only 1 day - this station is not in operation yet, commissioning on-going --- policies/llrf_measurements.policies | 14 ++++++++++++++ sources/llrf.sources | 5 +++++ sources/rf_interlock.sources | 3 +++ 3 files changed, 22 insertions(+) diff --git a/policies/llrf_measurements.policies b/policies/llrf_measurements.policies index 18e0ba0..11c6b8b 100644 --- a/policies/llrf_measurements.policies +++ b/policies/llrf_measurements.policies @@ -138,6 +138,20 @@ Examples for ttl settings: +{ + "pattern":"^SATCB01-", + "data_reduction":{ + "default":[ + { + "ttl":"P1D", + "modulo":1 + } + ] + } +} + + + /* --- end of config --- */ ] diff --git a/sources/llrf.sources b/sources/llrf.sources index 026646a..bad11ab 100644 --- a/sources/llrf.sources +++ b/sources/llrf.sources @@ -77,6 +77,11 @@ ,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"} ,{"stream": "tcp://S30CB14-CVME-LLRF2:20000"} /*,{"stream": "tcp://S30-CVME-LLRF:20000"}*/ +/*athos*/ + ,{"stream": "tcp://SATCB01-CVME-LLRF1:20000"} + ,{"stream": "tcp://SATCB01-CVME-LLRF2:20000"} + /* ,{"stream": "tcp://SATMA02-CVME-LLRF1:20000"} + ,{"stream": "tcp://SATMA02-CVME-LLRF2:20000"}*/ /*lab system OSFA Physiklabor in machine network*/ ,{"stream": "tcp://SINEGTS-CVME-LLRF1:20000"} ,{"stream": "tcp://SINEGTS-CVME-LLRF2:20000"} diff --git a/sources/rf_interlock.sources b/sources/rf_interlock.sources index e86595a..3833bc3 100644 --- a/sources/rf_interlock.sources +++ b/sources/rf_interlock.sources @@ -39,6 +39,9 @@ ,{"stream": "tcp://S30CB12-CVME-ILK:9999"} ,{"stream": "tcp://S30CB13-CVME-ILK:9999"} ,{"stream": "tcp://S30CB14-CVME-ILK:9999"} +/*athos*/ + ,{"stream": "tcp://SATCB01-CVME-ILK:9999"} + /*,{"stream": "tcp://SATMA02-CVME-ILK:9999"}*/ /*lab system OSFA Physiklabor in machine network*/ ,{"stream": "tcp://SINEGTS-CVME-ILK:9999"} /*,{"stream": "tcp://SINSBTS-CVME-ILK:9999"} From 2502fe0af5a9cb07f54fca81d3657c74ef3e404e Mon Sep 17 00:00:00 2001 From: stubbs_s Date: Mon, 9 Sep 2019 11:34:27 +0200 Subject: [PATCH 3/3] 9000 + 9010 are ESA Prime cameras, 9020 laser --- sources/image.sources | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/image.sources b/sources/image.sources index ab4995d..5e114c9 100644 --- a/sources/image.sources +++ b/sources/image.sources @@ -63,7 +63,8 @@ ,{"stream":"tcp://daqsf-sioc-cs-74.psi.ch:9150","split":4,"backend":"sf-imagebuffer"} ,{"stream":"tcp://daqsf-sioc-cs-74.psi.ch:9160","split":4,"backend":"sf-imagebuffer"} ,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} -/* ,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:9010","split":4,"backend":"sf-imagebuffer"} */ + ,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:9010","split":4,"backend":"sf-imagebuffer"} +/* ,{"stream":"tcp://daqsf-sioc-cs-81.psi.ch:9020","split":4,"backend":"sf-imagebuffer"} */ ,{"stream":"tcp://daqsf-sioc-cs-82.psi.ch:9000","split":4,"backend":"sf-imagebuffer"} /* ,{"stream":"tcp://daqsf-sioc-cs-82.psi.ch:9010","split":4,"backend":"sf-imagebuffer"} */ ,{"stream":"tcp://daqsf-sioc-cs-83.psi.ch:8060","split":4,"backend":"sf-imagebuffer"}