From a751c6e90691e7ecb1d019f4c8327b01b4ddc261 Mon Sep 17 00:00:00 2001 From: Tadej Humar Date: Wed, 13 Dec 2023 15:39:11 +0100 Subject: [PATCH 01/20] Re-enable some BLMs --- sources/blm.sources | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/blm.sources b/sources/blm.sources index 01ebb95..dfa24f4 100644 --- a/sources/blm.sources +++ b/sources/blm.sources @@ -7,15 +7,15 @@ {"stream": "tcp://S10DI01-CVME-DBLM113:9999"}, {"stream": "tcp://S10CB04-CVME-DBLM130:9999"}, {"stream": "tcp://S10CB06-CVME-DBLM153:9999"}, - /* {"stream": "tcp://S10CB08-CVME-DBLM170:9999"}, */ + {"stream": "tcp://S10CB08-CVME-DBLM170:9999"}, {"stream": "tcp://S10BC01-CVME-DBLM184:9999"}, {"stream": "tcp://S20CB02-CVME-DBLM234:9999"}, /* {"stream": "tcp://S20CB04-CVME-DBLM255:9999"}, {"stream": "tcp://S20SY03-CVME-DBLM269:9999"}, */ {"stream": "tcp://S20SY03-CVME-DBLM292:9999"}, {"stream": "tcp://S30CB02-CVME-DBLM310:9999"}, - /* {"stream": "tcp://SATCL01-CVME-DBLM328:9999"}, - {"stream": "tcp://SATDI01-CVME-DBLM344:9999"}, + {"stream": "tcp://SATCL01-CVME-DBLM328:9999"}, + /* {"stream": "tcp://SATDI01-CVME-DBLM344:9999"}, {"stream": "tcp://SATCB01-CVME-DBLM355:9999"}, {"stream": "tcp://S30CB10-CVME-DBLM381:9999"}, {"stream": "tcp://S30CB14-CVME-DBLM417:9999"}, */ From fa9bea3cf044f840b25c643cc1ebdca9bc5784cd Mon Sep 17 00:00:00 2001 From: Tadej Humar Date: Wed, 20 Dec 2023 08:42:13 +0100 Subject: [PATCH 02/20] Added BLMs back --- sources/blm.sources | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sources/blm.sources b/sources/blm.sources index dfa24f4..e5ceba6 100644 --- a/sources/blm.sources +++ b/sources/blm.sources @@ -1,33 +1,33 @@ { /*DBLMs IOC's - Responsible D. Llorente */ "sources": [ - /* {"stream": "tcp://SINEG01-CVME-DBLM009:9999"}, */ + {"stream": "tcp://SINEG01-CVME-DBLM009:9999"}, {"stream": "tcp://SINLH02-CVME-DBLM018:9999"}, - /* {"stream": "tcp://SINDI02-CVME-DBLM084:9999"}, */ + {"stream": "tcp://SINDI02-CVME-DBLM084:9999"}, {"stream": "tcp://S10DI01-CVME-DBLM113:9999"}, {"stream": "tcp://S10CB04-CVME-DBLM130:9999"}, {"stream": "tcp://S10CB06-CVME-DBLM153:9999"}, {"stream": "tcp://S10CB08-CVME-DBLM170:9999"}, {"stream": "tcp://S10BC01-CVME-DBLM184:9999"}, {"stream": "tcp://S20CB02-CVME-DBLM234:9999"}, - /* {"stream": "tcp://S20CB04-CVME-DBLM255:9999"}, - {"stream": "tcp://S20SY03-CVME-DBLM269:9999"}, */ + {"stream": "tcp://S20CB04-CVME-DBLM255:9999"}, + {"stream": "tcp://S20SY03-CVME-DBLM269:9999"}, {"stream": "tcp://S20SY03-CVME-DBLM292:9999"}, {"stream": "tcp://S30CB02-CVME-DBLM310:9999"}, {"stream": "tcp://SATCL01-CVME-DBLM328:9999"}, - /* {"stream": "tcp://SATDI01-CVME-DBLM344:9999"}, + {"stream": "tcp://SATDI01-CVME-DBLM344:9999"}, {"stream": "tcp://SATCB01-CVME-DBLM355:9999"}, {"stream": "tcp://S30CB10-CVME-DBLM381:9999"}, - {"stream": "tcp://S30CB14-CVME-DBLM417:9999"}, */ + {"stream": "tcp://S30CB14-CVME-DBLM417:9999"}, {"stream": "tcp://SARCL02-CVME-DBLM457:9999"}, - /* {"stream": "tcp://SARCL02-CVME-DBLM469:9999"}, + {"stream": "tcp://SARCL02-CVME-DBLM469:9999"}, {"stream": "tcp://SARMA01-CVME-DBLM482:9999"}, {"stream": "tcp://SARUN01-CVME-DBLM499:9999"}, {"stream": "tcp://SARUN04-CVME-DBLM516:9999"}, - {"stream": "tcp://SARUN08-CVME-DBLM537:9999"}, */ + {"stream": "tcp://SARUN08-CVME-DBLM537:9999"}, {"stream": "tcp://SARUN11-CVME-DBLM546:9999"}, {"stream": "tcp://SARUN13-CVME-DBLM555:9999"}, - /* {"stream": "tcp://SARUN15-CVME-DBLM567:9999"}, */ + {"stream": "tcp://SARUN15-CVME-DBLM567:9999"}, {"stream": "tcp://SARUN20-CVME-DBLM599:9999"} ] } From 3140afbb50686c760b76d2e4c55ffde9a740a1d1 Mon Sep 17 00:00:00 2001 From: Tadej Humar Date: Wed, 20 Dec 2023 11:11:26 +0100 Subject: [PATCH 03/20] New modular ansibles --- operation-tools/Readme.md | 2 +- operation-tools/restart-all.yml | 3 ++ .../{restart.yml => restart-api.yml} | 6 +--- operation-tools/restart-retrieval.yml | 3 ++ operation-tools/start-all.yml | 5 ++++ operation-tools/start-db.yml | 19 ++++++++++++ operation-tools/start-retrieval.yml | 14 +++++++++ operation-tools/start.yml | 29 ------------------- operation-tools/stop-all.yml | 3 ++ operation-tools/{stop.yml => stop-db.yml} | 10 ------- operation-tools/stop-retrieval.yml | 14 +++++++++ 11 files changed, 63 insertions(+), 45 deletions(-) create mode 100644 operation-tools/restart-all.yml rename operation-tools/{restart.yml => restart-api.yml} (79%) create mode 100644 operation-tools/restart-retrieval.yml create mode 100644 operation-tools/start-all.yml create mode 100644 operation-tools/start-db.yml create mode 100644 operation-tools/start-retrieval.yml delete mode 100644 operation-tools/start.yml create mode 100644 operation-tools/stop-all.yml rename operation-tools/{stop.yml => stop-db.yml} (72%) create mode 100644 operation-tools/stop-retrieval.yml diff --git a/operation-tools/Readme.md b/operation-tools/Readme.md index 94497c3..1e8551f 100644 --- a/operation-tools/Readme.md +++ b/operation-tools/Readme.md @@ -123,7 +123,7 @@ git pull - call the restart script ```bash -ansible-playbook restart.yml +ansible-playbook restart-all.yml ``` - After waiting ~5min restart the recording again: diff --git a/operation-tools/restart-all.yml b/operation-tools/restart-all.yml new file mode 100644 index 0000000..4f85922 --- /dev/null +++ b/operation-tools/restart-all.yml @@ -0,0 +1,3 @@ + +- import_playbook: stop-all.yml +- import_playbook: start-all.yml \ No newline at end of file diff --git a/operation-tools/restart.yml b/operation-tools/restart-api.yml similarity index 79% rename from operation-tools/restart.yml rename to operation-tools/restart-api.yml index a2605d9..8efa290 100644 --- a/operation-tools/restart.yml +++ b/operation-tools/restart-api.yml @@ -1,8 +1,4 @@ -- import_playbook: stop.yml -- import_playbook: start.yml - - - name: restart data api hosts: sf_data_api_databuffer become: true @@ -20,4 +16,4 @@ - name: restart dispatcher-api-databuffer systemd: state: restarted - name: dispatcher-api-databuffer \ No newline at end of file + name: dispatcher-api-databuffer diff --git a/operation-tools/restart-retrieval.yml b/operation-tools/restart-retrieval.yml new file mode 100644 index 0000000..695a41e --- /dev/null +++ b/operation-tools/restart-retrieval.yml @@ -0,0 +1,3 @@ +- import_playbook: stop-retrieval.yml +- import_playbook: start-retrieval.yml +- import_playbook: restart-api.yml \ No newline at end of file diff --git a/operation-tools/start-all.yml b/operation-tools/start-all.yml new file mode 100644 index 0000000..f38d34f --- /dev/null +++ b/operation-tools/start-all.yml @@ -0,0 +1,5 @@ + +- import_playbook: start-db.yml +- import_playbook: start-retrieval.yml +- import_playbook: restart-api.yml + diff --git a/operation-tools/start-db.yml b/operation-tools/start-db.yml new file mode 100644 index 0000000..e03e495 --- /dev/null +++ b/operation-tools/start-db.yml @@ -0,0 +1,19 @@ + +- name: Start nodes + hosts: databuffer + become: true + tasks: + + - name: start daq-dispatcher-node + systemd: + state: started + name: daq-dispatcher-node + + - name: sleep for 60 seconds and continue with play + wait_for: + timeout: 60 + + - name: start daq-query-node + systemd: + state: started + name: daq-query-node \ No newline at end of file diff --git a/operation-tools/start-retrieval.yml b/operation-tools/start-retrieval.yml new file mode 100644 index 0000000..4826968 --- /dev/null +++ b/operation-tools/start-retrieval.yml @@ -0,0 +1,14 @@ + +- name: Start all retrieval + hosts: databuffer + become: true + tasks: + - name: start java retrieval + systemd: + state: started + name: retrieval + + - name: start retrieval + systemd: + state: started + name: retrieval-00 \ No newline at end of file diff --git a/operation-tools/start.yml b/operation-tools/start.yml deleted file mode 100644 index 8d23bca..0000000 --- a/operation-tools/start.yml +++ /dev/null @@ -1,29 +0,0 @@ -- name: Start nodes - hosts: databuffer - become: true - tasks: - - - name: start daq-dispatcher-node - systemd: - state: started - name: daq-dispatcher-node - - - name: sleep for 30 seconds and continue with play - wait_for: - timeout: 30 - - - name: start daq-query-node - systemd: - state: started - name: daq-query-node - - - name: start java retrieval - systemd: - state: started - name: retrieval - - - name: start retrieval - systemd: - state: started - name: retrieval-00 - diff --git a/operation-tools/stop-all.yml b/operation-tools/stop-all.yml new file mode 100644 index 0000000..0a37542 --- /dev/null +++ b/operation-tools/stop-all.yml @@ -0,0 +1,3 @@ + +- import_playbook: stop-retrieval.yml +- import_playbook: stop-db.yml diff --git a/operation-tools/stop.yml b/operation-tools/stop-db.yml similarity index 72% rename from operation-tools/stop.yml rename to operation-tools/stop-db.yml index dc31b01..97cd6e0 100644 --- a/operation-tools/stop.yml +++ b/operation-tools/stop-db.yml @@ -3,16 +3,6 @@ become: true tasks: - - name: stop retrieval - systemd: - state: stopped - name: retrieval-00 - - - name: stop java retrieval - systemd: - state: stopped - name: retrieval - - name: stop daq-dispatcher-node systemd: state: stopped diff --git a/operation-tools/stop-retrieval.yml b/operation-tools/stop-retrieval.yml new file mode 100644 index 0000000..721be99 --- /dev/null +++ b/operation-tools/stop-retrieval.yml @@ -0,0 +1,14 @@ + +- name: Stop all retrieval + hosts: databuffer + become: true + tasks: + - name: stop retrieval + systemd: + state: stopped + name: retrieval-00 + + - name: stop java retrieval + systemd: + state: stopped + name: retrieval \ No newline at end of file From e7e3b30d114ff831a2e93e29e653acdcca80c29b Mon Sep 17 00:00:00 2001 From: Tadej Humar Date: Wed, 20 Dec 2023 11:38:33 +0100 Subject: [PATCH 04/20] Typos --- operation-tools/restart-retrieval.yml | 1 + operation-tools/start-db.yml | 1 - operation-tools/stop-db.yml | 1 + operation-tools/stop-retrieval.yml | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/operation-tools/restart-retrieval.yml b/operation-tools/restart-retrieval.yml index 695a41e..daa31e5 100644 --- a/operation-tools/restart-retrieval.yml +++ b/operation-tools/restart-retrieval.yml @@ -1,3 +1,4 @@ + - import_playbook: stop-retrieval.yml - import_playbook: start-retrieval.yml - import_playbook: restart-api.yml \ No newline at end of file diff --git a/operation-tools/start-db.yml b/operation-tools/start-db.yml index e03e495..de21d54 100644 --- a/operation-tools/start-db.yml +++ b/operation-tools/start-db.yml @@ -3,7 +3,6 @@ hosts: databuffer become: true tasks: - - name: start daq-dispatcher-node systemd: state: started diff --git a/operation-tools/stop-db.yml b/operation-tools/stop-db.yml index 97cd6e0..a60f768 100644 --- a/operation-tools/stop-db.yml +++ b/operation-tools/stop-db.yml @@ -1,3 +1,4 @@ + - name: Stop nodes hosts: databuffer become: true diff --git a/operation-tools/stop-retrieval.yml b/operation-tools/stop-retrieval.yml index 721be99..400dc2d 100644 --- a/operation-tools/stop-retrieval.yml +++ b/operation-tools/stop-retrieval.yml @@ -4,11 +4,11 @@ become: true tasks: - name: stop retrieval - systemd: + systemd: state: stopped name: retrieval-00 - name: stop java retrieval - systemd: + systemd: state: stopped name: retrieval \ No newline at end of file From 767dffb7d94014f06e5c16ae5ca320eb9271a42a Mon Sep 17 00:00:00 2001 From: Gobbo Alexandre Date: Tue, 7 Nov 2023 10:45:31 +0100 Subject: [PATCH 05/20] Added SARFE10-PSSS059-LB pipeline --- sources/camserver.sources | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sources/camserver.sources b/sources/camserver.sources index 439ab1d..d38fe69 100644 --- a/sources/camserver.sources +++ b/sources/camserver.sources @@ -8,9 +8,9 @@ { "sources": [ {"stream": "tcp://sf-daqsync-11:8889", "labels": ["SARFE10-PSSS059"]} - - /*,{"stream": "tcp://sf-daqsync-03:9012", "labels": ["SARFE10-PSSS059"]} */ + ,{"stream": "tcp://sf-daqsync-11:9004", "labels": ["SARFE10-PSSS059-LB"]} + /* PMOS SATOP31-PMOS132-2D */ ,{"stream": "tcp://sf-daqsync-03.psi.ch:9001", "labels": ["SATOP31-PMOS132-2D"]} @@ -43,7 +43,6 @@ /* SARES20-PROF142-M1 */ ,{"stream": "tcp://sf-daqsync-14.psi.ch:9016", "labels": ["SARES20-PROF142-M1"]} - /*,{"stream": "tcp://sf-daqsync-11:9004", "labels": ["SARES20-PROF142-M1"]}*/ /* SAROP21-PPRM138 pipeline */ ,{"stream": "tcp://sf-daqsync-14.psi.ch:9015", "labels": ["SAROP21-PPRM138"]} From 6f98426cdbba76851546a716bf40b72528ff4e17 Mon Sep 17 00:00:00 2001 From: divall_e Date: Wed, 15 Nov 2023 10:48:47 +0100 Subject: [PATCH 06/20] Update sources/pumplaser.sources --- sources/pumplaser.sources | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sources/pumplaser.sources b/sources/pumplaser.sources index 2feae45..b659d7f 100644 --- a/sources/pumplaser.sources +++ b/sources/pumplaser.sources @@ -10,6 +10,9 @@ ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10215", "labels": ["WIESER_10215"]} ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10225", "labels": ["WIESER_10225"]} ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10235", "labels": ["WIESER_10235"]} + /* Spectrometer - SLAAT01-LSPC-SPEC1 */ + ,{"stream": "tcp://sf-sioc-cs-b2:9105", "labels": ["BS_SPEC_B2"]} + ] } From b234d53472231696cb1726247d5c9a61faf16728 Mon Sep 17 00:00:00 2001 From: divall_e Date: Wed, 15 Nov 2023 11:24:04 +0100 Subject: [PATCH 07/20] Update sources/gunlaser.sources --- sources/gunlaser.sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/gunlaser.sources b/sources/gunlaser.sources index cc590cc..d211a4e 100644 --- a/sources/gunlaser.sources +++ b/sources/gunlaser.sources @@ -9,5 +9,6 @@ ,{"stream": "tcp://SIN-CVME-LAS0201:9999"} /* Wieser sources */ ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10009"} + ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10045", "labels": ["WIESER_10045"]} ] } From 29c80809fa7acb19bf430591d0f4e1d619559b4f Mon Sep 17 00:00:00 2001 From: divall_e Date: Thu, 23 Nov 2023 10:39:06 +0100 Subject: [PATCH 08/20] Update sources/gunlaser.sources --- sources/gunlaser.sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/gunlaser.sources b/sources/gunlaser.sources index d211a4e..ccf4e3d 100644 --- a/sources/gunlaser.sources +++ b/sources/gunlaser.sources @@ -10,5 +10,6 @@ /* Wieser sources */ ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10009"} ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10045", "labels": ["WIESER_10045"]} + ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10075", "labels": ["WIESER_10075"]} ] } From 3135a12821a82292869c311af640192cfdcc8e29 Mon Sep 17 00:00:00 2001 From: humar_t Date: Fri, 1 Dec 2023 11:41:56 +0100 Subject: [PATCH 09/20] Removed 50Y policies. --- policies/llrf.policies | 48 ------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/policies/llrf.policies b/policies/llrf.policies index 4221ca4..bc47b3a 100644 --- a/policies/llrf.policies +++ b/policies/llrf.policies @@ -75,12 +75,6 @@ Examples for ttl settings: "modulo":100 /* 1 point every 1 second */ } - , - { - "ttl":"P50Y", - "modulo":60000 - /* 1 point every 10 minutes */ - } ] } } @@ -142,12 +136,6 @@ Examples for ttl settings: "modulo":100 /* 1 point every 1 second */ } - , - { - "ttl":"P50Y", - "modulo":60000 - /* 1 point every 10 minutes */ - } ] } } @@ -172,12 +160,6 @@ Examples for ttl settings: "modulo":100 /* 1 point every 1 second */ } - , - { - "ttl":"P50Y", - "modulo":60000 - /* 1 point every 10 minutes */ - } ] } } @@ -196,12 +178,6 @@ Examples for ttl settings: "modulo":100 /* 1 point every 1 second */ } - , - { - "ttl":"P50Y", - "modulo":60000 - /* 1 point every 10 minutes */ - } ] } } @@ -220,12 +196,6 @@ Examples for ttl settings: "modulo":100 /* 1 point every 1 second */ } - , - { - "ttl":"P50Y", - "modulo":60000 - /* 1 point every 10 minutes */ - } ] } } @@ -262,12 +232,6 @@ Examples for ttl settings: "modulo":100 /* 1 point every 1 second */ } - , - { - "ttl":"P50Y", - "modulo":60000 - /* 1 point every 10 minutes */ - } ] } } @@ -286,12 +250,6 @@ Examples for ttl settings: "modulo":100 /* 1 point every 1 second */ } - , - { - "ttl":"P50Y", - "modulo":60000 - /* 1 point every 10 minutes */ - } ] } } @@ -310,12 +268,6 @@ Examples for ttl settings: "modulo":100 /* 1 point every 1 second */ } - , - { - "ttl":"P50Y", - "modulo":60000 - /* 1 point every 10 minutes */ - } ] } } From 8c08b585693c2ee6bb80f710dee6894d513fb72a Mon Sep 17 00:00:00 2001 From: humar_t Date: Fri, 1 Dec 2023 14:31:34 +0100 Subject: [PATCH 10/20] Cleaning up policies. --- policies/llrf_measurements.policies | 15 --- policies/op.policies | 182 +++++----------------------- policies/sarfe10.policies | 8 +- policies/test.policies | 16 --- policies/timing.policies | 13 +- 5 files changed, 36 insertions(+), 198 deletions(-) delete mode 100644 policies/test.policies diff --git a/policies/llrf_measurements.policies b/policies/llrf_measurements.policies index 42d113f..9f16570 100644 --- a/policies/llrf_measurements.policies +++ b/policies/llrf_measurements.policies @@ -79,11 +79,6 @@ Examples for ttl settings: "ttl":"P2M", "modulo":100 } - , - { - "ttl":"P50Y", - "modulo":60000 - } ] } } @@ -101,11 +96,6 @@ Examples for ttl settings: "ttl":"P2M", "modulo":100 } - , - { - "ttl":"P50Y", - "modulo":60000 - } ] } } @@ -123,11 +113,6 @@ Examples for ttl settings: "ttl":"P2M", "modulo":100 } - , - { - "ttl":"P50Y", - "modulo":60000 - } ] } } diff --git a/policies/op.policies b/policies/op.policies index c8011c9..b28b621 100644 --- a/policies/op.policies +++ b/policies/op.policies @@ -9,12 +9,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -28,12 +24,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -47,12 +39,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -62,16 +50,12 @@ "data_reduction":{ "default":[ { - "ttl":"P6M", - "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 - }, - { - "ttl":-1, + "ttl":"P2W", "modulo":1 + }, + { + "ttl":"P2M", + "modulo":100 } ] } @@ -85,12 +69,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -104,12 +84,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P1M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -123,12 +99,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P1M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -144,12 +116,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -163,12 +131,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -219,12 +183,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -238,12 +198,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -259,12 +215,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -278,12 +230,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -299,12 +247,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -318,12 +262,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -339,12 +279,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -358,12 +294,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -377,12 +309,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -398,12 +326,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -419,12 +343,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -438,12 +358,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -459,12 +375,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -480,12 +392,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -499,12 +407,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -518,12 +422,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -537,12 +437,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -556,12 +452,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -575,12 +467,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } @@ -594,12 +482,8 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } diff --git a/policies/sarfe10.policies b/policies/sarfe10.policies index 8956e87..d75a88b 100644 --- a/policies/sarfe10.policies +++ b/policies/sarfe10.policies @@ -9,15 +9,11 @@ "modulo":1 }, { - "ttl":"P6M", + "ttl":"P2M", "modulo":100 - }, - { - "ttl":"P5Y", - "modulo":60000 } ] } } ] -} \ No newline at end of file +} diff --git a/policies/test.policies b/policies/test.policies deleted file mode 100644 index 26b4887..0000000 --- a/policies/test.policies +++ /dev/null @@ -1,16 +0,0 @@ -/* Policies for test sources - resp. Andrej Babic */ -{ - "policies": [ - { - "pattern":"^ignore", - "data_reduction":{ - "default":[ - { - "ttl":-1, - "modulo":1 - } - ] - } - } - ] -} diff --git a/policies/timing.policies b/policies/timing.policies index d4d7aca..da5aea5 100644 --- a/policies/timing.policies +++ b/policies/timing.policies @@ -1,22 +1,11 @@ { "policies": [ - { - "pattern":"^SIN-CVME-TIFGUN-EVR0:BEAMOK$", - "data_reduction":{ - "default":[ - { - "ttl":"P20W", - "modulo":1 - } - ] - } - }, { "pattern":"^.*:EvtSet$", "data_reduction":{ "default":[ { - "ttl":"P20W", + "ttl":"P2M", "modulo":1 } ] From d196944749ae906c6bae5b6584486cc9d8354f36 Mon Sep 17 00:00:00 2001 From: divall_e Date: Tue, 5 Dec 2023 11:24:47 +0100 Subject: [PATCH 11/20] Update sources/gunlaser.sources --- sources/gunlaser.sources | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/gunlaser.sources b/sources/gunlaser.sources index ccf4e3d..cb39248 100644 --- a/sources/gunlaser.sources +++ b/sources/gunlaser.sources @@ -11,5 +11,7 @@ ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10009"} ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10045", "labels": ["WIESER_10045"]} ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10075", "labels": ["WIESER_10075"]} + /* Test IFC */ + ,{"stream": "tcp://SIN-CVME-RF02:9999", "labels": ["IFC_TEST_SYS"]} ] } From d29d9ae644d6623737a9065a293ab4f53f533ae6 Mon Sep 17 00:00:00 2001 From: humar_t Date: Tue, 5 Dec 2023 13:30:47 +0100 Subject: [PATCH 12/20] Broken source --- sources/gunlaser.sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/gunlaser.sources b/sources/gunlaser.sources index cb39248..cc04230 100644 --- a/sources/gunlaser.sources +++ b/sources/gunlaser.sources @@ -12,6 +12,6 @@ ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10045", "labels": ["WIESER_10045"]} ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10075", "labels": ["WIESER_10075"]} /* Test IFC */ - ,{"stream": "tcp://SIN-CVME-RF02:9999", "labels": ["IFC_TEST_SYS"]} + /*,{"stream": "tcp://SIN-CVME-RF02:9999", "labels": ["IFC_TEST_SYS"]}*/ ] } From 28543906f7a6299eb47079a19f671e953ffceaaa Mon Sep 17 00:00:00 2001 From: Tadej Humar Date: Wed, 13 Dec 2023 15:39:11 +0100 Subject: [PATCH 13/20] Re-enable some BLMs --- sources/blm.sources | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/blm.sources b/sources/blm.sources index 01ebb95..dfa24f4 100644 --- a/sources/blm.sources +++ b/sources/blm.sources @@ -7,15 +7,15 @@ {"stream": "tcp://S10DI01-CVME-DBLM113:9999"}, {"stream": "tcp://S10CB04-CVME-DBLM130:9999"}, {"stream": "tcp://S10CB06-CVME-DBLM153:9999"}, - /* {"stream": "tcp://S10CB08-CVME-DBLM170:9999"}, */ + {"stream": "tcp://S10CB08-CVME-DBLM170:9999"}, {"stream": "tcp://S10BC01-CVME-DBLM184:9999"}, {"stream": "tcp://S20CB02-CVME-DBLM234:9999"}, /* {"stream": "tcp://S20CB04-CVME-DBLM255:9999"}, {"stream": "tcp://S20SY03-CVME-DBLM269:9999"}, */ {"stream": "tcp://S20SY03-CVME-DBLM292:9999"}, {"stream": "tcp://S30CB02-CVME-DBLM310:9999"}, - /* {"stream": "tcp://SATCL01-CVME-DBLM328:9999"}, - {"stream": "tcp://SATDI01-CVME-DBLM344:9999"}, + {"stream": "tcp://SATCL01-CVME-DBLM328:9999"}, + /* {"stream": "tcp://SATDI01-CVME-DBLM344:9999"}, {"stream": "tcp://SATCB01-CVME-DBLM355:9999"}, {"stream": "tcp://S30CB10-CVME-DBLM381:9999"}, {"stream": "tcp://S30CB14-CVME-DBLM417:9999"}, */ From 242dc4a4860bcb47ee6447bd7c426eb842495eae Mon Sep 17 00:00:00 2001 From: Tadej Humar Date: Wed, 20 Dec 2023 08:42:13 +0100 Subject: [PATCH 14/20] Added BLMs back --- sources/blm.sources | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sources/blm.sources b/sources/blm.sources index dfa24f4..e5ceba6 100644 --- a/sources/blm.sources +++ b/sources/blm.sources @@ -1,33 +1,33 @@ { /*DBLMs IOC's - Responsible D. Llorente */ "sources": [ - /* {"stream": "tcp://SINEG01-CVME-DBLM009:9999"}, */ + {"stream": "tcp://SINEG01-CVME-DBLM009:9999"}, {"stream": "tcp://SINLH02-CVME-DBLM018:9999"}, - /* {"stream": "tcp://SINDI02-CVME-DBLM084:9999"}, */ + {"stream": "tcp://SINDI02-CVME-DBLM084:9999"}, {"stream": "tcp://S10DI01-CVME-DBLM113:9999"}, {"stream": "tcp://S10CB04-CVME-DBLM130:9999"}, {"stream": "tcp://S10CB06-CVME-DBLM153:9999"}, {"stream": "tcp://S10CB08-CVME-DBLM170:9999"}, {"stream": "tcp://S10BC01-CVME-DBLM184:9999"}, {"stream": "tcp://S20CB02-CVME-DBLM234:9999"}, - /* {"stream": "tcp://S20CB04-CVME-DBLM255:9999"}, - {"stream": "tcp://S20SY03-CVME-DBLM269:9999"}, */ + {"stream": "tcp://S20CB04-CVME-DBLM255:9999"}, + {"stream": "tcp://S20SY03-CVME-DBLM269:9999"}, {"stream": "tcp://S20SY03-CVME-DBLM292:9999"}, {"stream": "tcp://S30CB02-CVME-DBLM310:9999"}, {"stream": "tcp://SATCL01-CVME-DBLM328:9999"}, - /* {"stream": "tcp://SATDI01-CVME-DBLM344:9999"}, + {"stream": "tcp://SATDI01-CVME-DBLM344:9999"}, {"stream": "tcp://SATCB01-CVME-DBLM355:9999"}, {"stream": "tcp://S30CB10-CVME-DBLM381:9999"}, - {"stream": "tcp://S30CB14-CVME-DBLM417:9999"}, */ + {"stream": "tcp://S30CB14-CVME-DBLM417:9999"}, {"stream": "tcp://SARCL02-CVME-DBLM457:9999"}, - /* {"stream": "tcp://SARCL02-CVME-DBLM469:9999"}, + {"stream": "tcp://SARCL02-CVME-DBLM469:9999"}, {"stream": "tcp://SARMA01-CVME-DBLM482:9999"}, {"stream": "tcp://SARUN01-CVME-DBLM499:9999"}, {"stream": "tcp://SARUN04-CVME-DBLM516:9999"}, - {"stream": "tcp://SARUN08-CVME-DBLM537:9999"}, */ + {"stream": "tcp://SARUN08-CVME-DBLM537:9999"}, {"stream": "tcp://SARUN11-CVME-DBLM546:9999"}, {"stream": "tcp://SARUN13-CVME-DBLM555:9999"}, - /* {"stream": "tcp://SARUN15-CVME-DBLM567:9999"}, */ + {"stream": "tcp://SARUN15-CVME-DBLM567:9999"}, {"stream": "tcp://SARUN20-CVME-DBLM599:9999"} ] } From 39a9c2b0405a017e5b0f44a80524a7b3e581a627 Mon Sep 17 00:00:00 2001 From: divall_e Date: Wed, 3 Jan 2024 12:01:57 +0100 Subject: [PATCH 15/20] Update file pumplaser.sources --- sources/pumplaser.sources | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/pumplaser.sources b/sources/pumplaser.sources index b659d7f..29018b5 100644 --- a/sources/pumplaser.sources +++ b/sources/pumplaser.sources @@ -6,10 +6,10 @@ ,{"stream": "tcp://SLAAR-CVME-LAS6891:9999"} ,{"stream": "tcp://SLAAR-CVME-LAS6891:9989"} /* Wieser sources */ - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10205", "labels": ["WIESER_10205"]} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10215", "labels": ["WIESER_10215"]} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10225", "labels": ["WIESER_10225"]} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10235", "labels": ["WIESER_10235"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10205", "labels": ["WIESER_10205"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10215", "labels": ["WIESER_10215"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10225", "labels": ["WIESER_10225"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10235", "labels": ["WIESER_10235"]} /* Spectrometer - SLAAT01-LSPC-SPEC1 */ ,{"stream": "tcp://sf-sioc-cs-b2:9105", "labels": ["BS_SPEC_B2"]} From 3263d0b2ea32e14543a3d20ab6441f95201dffac Mon Sep 17 00:00:00 2001 From: divall_e Date: Wed, 3 Jan 2024 14:29:37 +0100 Subject: [PATCH 16/20] Update file gunlaser.sources --- sources/gunlaser.sources | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sources/gunlaser.sources b/sources/gunlaser.sources index cc04230..6c5b346 100644 --- a/sources/gunlaser.sources +++ b/sources/gunlaser.sources @@ -8,9 +8,16 @@ ,{"stream": "tcp://SIN-CVME-LAS0071:9999"} ,{"stream": "tcp://SIN-CVME-LAS0201:9999"} /* Wieser sources */ - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10009"} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10045", "labels": ["WIESER_10045"]} - ,{"stream": "tcp://SF-SOFTIOC-LADC-11:10075", "labels": ["WIESER_10075"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10005", "labels": ["WIESER_10005"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10015", "labels": ["WIESER_10015"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10025", "labels": ["WIESER_10025"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10035", "labels": ["WIESER_10035"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10045", "labels": ["WIESER_10045"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10065", "labels": ["WIESER_10065"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10075", "labels": ["WIESER_10075"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10085", "labels": ["WIESER_10085"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10095", "labels": ["WIESER_10095"]} + ,{"stream": "tcp://SF-VSERV-LADC-01:10105", "labels": ["WIESER_10105"]} /* Test IFC */ /*,{"stream": "tcp://SIN-CVME-RF02:9999", "labels": ["IFC_TEST_SYS"]}*/ ] From 3209d6ebea0390953e422ac540783b57af939c84 Mon Sep 17 00:00:00 2001 From: Tadej Humar Date: Fri, 19 Jan 2024 15:21:18 +0100 Subject: [PATCH 17/20] RF-MODILK back in --- sources/rf_modulator.sources | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 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..823b42e --- /dev/null +++ b/sources/rf_modulator.sources @@ -0,0 +1,38 @@ +{ +/*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"} + ] +/*athos*/ + ,{"stream": "tcp://SATCB01-CVME-ILK:9000"} + ,{"stream": "tcp://SATMA02-CVME-ILK:9000"} +} + From 22a900de4a3984520f66a4a3bacb9c23f9f2cd0c Mon Sep 17 00:00:00 2001 From: Tadej Humar Date: Fri, 19 Jan 2024 15:27:04 +0100 Subject: [PATCH 18/20] Athos config is not at the correct place. --- sources/rf_modulator.sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/rf_modulator.sources b/sources/rf_modulator.sources index 823b42e..9af0b7d 100644 --- a/sources/rf_modulator.sources +++ b/sources/rf_modulator.sources @@ -32,7 +32,7 @@ ,{"stream": "tcp://S30CB13-CVME-ILK:9000"} ] /*athos*/ - ,{"stream": "tcp://SATCB01-CVME-ILK:9000"} - ,{"stream": "tcp://SATMA02-CVME-ILK:9000"} +/* ,{"stream": "tcp://SATCB01-CVME-ILK:9000"} + ,{"stream": "tcp://SATMA02-CVME-ILK:9000"} */ } From 7fbdcae5e99ae7474219e3047612717cbe87a730 Mon Sep 17 00:00:00 2001 From: divall_e Date: Thu, 25 Jan 2024 11:02:15 +0100 Subject: [PATCH 19/20] Update file gunlaser.sources --- sources/gunlaser.sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/gunlaser.sources b/sources/gunlaser.sources index 6c5b346..85200ee 100644 --- a/sources/gunlaser.sources +++ b/sources/gunlaser.sources @@ -18,7 +18,7 @@ ,{"stream": "tcp://SF-VSERV-LADC-01:10085", "labels": ["WIESER_10085"]} ,{"stream": "tcp://SF-VSERV-LADC-01:10095", "labels": ["WIESER_10095"]} ,{"stream": "tcp://SF-VSERV-LADC-01:10105", "labels": ["WIESER_10105"]} - /* Test IFC */ - /*,{"stream": "tcp://SIN-CVME-RF02:9999", "labels": ["IFC_TEST_SYS"]}*/ + /* Scoperecorder IFC */ + ,{"stream": "tcp://SIN-CVME-RF02:9999", "labels": ["IFC_RF02_SYS"]} ] } From 73f356ff727b9d1064d62ada95eee5a26032b85d Mon Sep 17 00:00:00 2001 From: divall_e Date: Thu, 1 Feb 2024 13:26:05 +0100 Subject: [PATCH 20/20] Update file camserver.sources --- sources/camserver.sources | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sources/camserver.sources b/sources/camserver.sources index d38fe69..837b10d 100644 --- a/sources/camserver.sources +++ b/sources/camserver.sources @@ -23,6 +23,9 @@ /* SATES21-CAMS-PATT1 */ ,{"stream": "tcp://sf-daqsync-12.psi.ch:9003", "labels": ["SATES21-CAMS-PATT1"]} + /* SATES21-CAMS154-GIGE6 */ + ,{"stream": "tcp://sf-daqsync-12.psi.ch:9056", "labels": ["SATES21-CAMS154-GIGE6"]} + /* SARES11-SPEC125-M1 */ ,{"stream": "tcp://sf-daqsync-13:9001", "labels": ["SARES11-SPEC125-M1"]}