From 1e4c8ae2df0071da6254beb75d1a6ac8f17c457b Mon Sep 17 00:00:00 2001 From: Fabio Ferrari Date: Thu, 17 Apr 2025 13:15:24 +0200 Subject: [PATCH 1/3] First commit --- MooreOnlineConf/options/plume.py | 8 +++++++- MooreOnlineConf/python/MooreOnlineConf/utils.py | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/MooreOnlineConf/options/plume.py b/MooreOnlineConf/options/plume.py index c46251396..430e50a8b 100644 --- a/MooreOnlineConf/options/plume.py +++ b/MooreOnlineConf/options/plume.py @@ -17,7 +17,8 @@ from PyConf.application import ( from PyConf.Algorithms import ( PlumeRawToDigits, PlumeDigitMonitor, - PlumeTAEMonitor, + PlumeLEDMonitor, + PlumeTAEMonitor ) from MooreOnlineConf.utils import ( common_monitors_node, @@ -48,6 +49,10 @@ def main(): monitor = PlumeDigitMonitor( name="PlumeDigitMonitor", Input=make_plume_digits(), ODIN=make_odin()) + led_monitor = PlumeLEDMonitor( + name="PlumeLEDMonitor", Input=make_plume_digits(), ODIN=make_odin()) + + # the TAE monitor is_tae, tae_decoding, tae_odins, tae_data = decode_tae( make_plume_digits, half_window=TAE_HALF_WINDOW) @@ -61,6 +66,7 @@ def main(): "top", [ common_monitors_node(), # common monitoring to all tasks + if_then("IfCalib", passes_rb(RoutingBit.CALIB), led_monitor), if_then("IfLUMI", passes_rb(RoutingBit.LUMI), monitor), if_then("IfTAE", is_tae, run_all("TAE", [tae_decoding, tae_monitor])), diff --git a/MooreOnlineConf/python/MooreOnlineConf/utils.py b/MooreOnlineConf/python/MooreOnlineConf/utils.py index a530c1cc0..fba532e22 100644 --- a/MooreOnlineConf/python/MooreOnlineConf/utils.py +++ b/MooreOnlineConf/python/MooreOnlineConf/utils.py @@ -350,5 +350,5 @@ def ensure_output_dir(output_path, tag): utgid = os.environ["UTGID"] local_tag_path = tag_path.with_suffix("." + utgid) with open(local_tag_path, "w") as f: - f.write(tag + "\n") - local_tag_path.replace(tag_path) + f.write(tag + "\n") +local_tag_path.replace(tag_path) -- GitLab From c4ea088dd332c752d1b419c49f7bca8b31b32508 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Thu, 17 Apr 2025 11:19:01 +0000 Subject: [PATCH 2/3] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/MooreOnline/-/jobs/54780047 --- MooreOnlineConf/options/plume.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/MooreOnlineConf/options/plume.py b/MooreOnlineConf/options/plume.py index 430e50a8b..07a933997 100644 --- a/MooreOnlineConf/options/plume.py +++ b/MooreOnlineConf/options/plume.py @@ -14,12 +14,8 @@ from PyConf.application import ( default_raw_banks, make_odin, ) -from PyConf.Algorithms import ( - PlumeRawToDigits, - PlumeDigitMonitor, - PlumeLEDMonitor, - PlumeTAEMonitor -) +from PyConf.Algorithms import (PlumeRawToDigits, PlumeDigitMonitor, + PlumeLEDMonitor, PlumeTAEMonitor) from MooreOnlineConf.utils import ( common_monitors_node, passes_rb, @@ -52,7 +48,6 @@ def main(): led_monitor = PlumeLEDMonitor( name="PlumeLEDMonitor", Input=make_plume_digits(), ODIN=make_odin()) - # the TAE monitor is_tae, tae_decoding, tae_odins, tae_data = decode_tae( make_plume_digits, half_window=TAE_HALF_WINDOW) -- GitLab From 5de3e0917bd7b02e1dc55c5f7102d939e8051103 Mon Sep 17 00:00:00 2001 From: Fabio Ferrari Date: Wed, 18 Jun 2025 12:40:54 +0200 Subject: [PATCH 3/3] Roll back to correct indentation --- MooreOnlineConf/python/MooreOnlineConf/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MooreOnlineConf/python/MooreOnlineConf/utils.py b/MooreOnlineConf/python/MooreOnlineConf/utils.py index fba532e22..a530c1cc0 100644 --- a/MooreOnlineConf/python/MooreOnlineConf/utils.py +++ b/MooreOnlineConf/python/MooreOnlineConf/utils.py @@ -350,5 +350,5 @@ def ensure_output_dir(output_path, tag): utgid = os.environ["UTGID"] local_tag_path = tag_path.with_suffix("." + utgid) with open(local_tag_path, "w") as f: - f.write(tag + "\n") -local_tag_path.replace(tag_path) + f.write(tag + "\n") + local_tag_path.replace(tag_path) -- GitLab