From 94d7b4ab9f8c3a16165980b62cffe770994ab38a Mon Sep 17 00:00:00 2001
From: Sergi Rodriguez <Sergi.Rodriguez@cern.ch>
Date: Fri, 7 Jul 2023 10:15:06 +0200
Subject: [PATCH 1/2] moving algos to the main function
---
.../python/JfexInputMonitorAlgorithm.py | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py
index 02db851dff14..38d94d2785a8 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py
@@ -7,11 +7,25 @@ def JfexInputMonitoringConfig(inputFlags):
# get the component factory - used for getting the algorithms
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+ from AthenaConfiguration.Enums import Format
result = ComponentAccumulator()
# make the athena monitoring helper
from AthenaMonitoring import AthMonitorCfgHelper
helper = AthMonitorCfgHelper(inputFlags,'JfexInputMonitoringCfg')
+
+
+ #Algorithms needed for the monitoring
+ if inputFlags.Input.Format==Format.BS:
+
+ #Decorator for the DataTowers
+ from L1CaloFEXAlgos.L1CaloFEXAlgosConfig import L1CaloFEXDecoratorCfg
+ result.merge(L1CaloFEXDecoratorCfg(inputFlags,"jFexTower2SCellDecorator"))
+
+ #jfex emulated input: EmulatedTowers
+ from L1CaloFEXAlgos.FexEmulatedTowersConfig import jFexEmulatedTowersCfg
+ result.merge(jFexEmulatedTowersCfg(inputFlags,"jFexEmulatedTowerMaker"))
+
# get any algorithms
JfexInputMonAlg = helper.addAlgorithm(CompFactory.JfexInputMonitorAlgorithm,'JfexInputMonAlg')
--
GitLab
From ae9a970e2e99ae2c3a24eaee240a8cbd9b169f7f Mon Sep 17 00:00:00 2001
From: Sergi Rodriguez <Sergi.Rodriguez@cern.ch>
Date: Fri, 7 Jul 2023 10:17:59 +0200
Subject: [PATCH 2/2] moving algos to the main function
---
.../TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py | 6 ------
1 file changed, 6 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
index a50a9c5148ff..85a1efbb1322 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
@@ -112,12 +112,6 @@ def LVL1CaloMonitoringConfig(flags):
from AthenaConfiguration.ComponentFactory import CompFactory
decoderAlg = CompFactory.L1TriggerByteStreamDecoderAlg(name="L1TriggerByteStreamDecoder", DecoderTools=[inputjFexTool], MaybeMissingROBs=maybeMissingRobs)
result.addEventAlgo(decoderAlg)
-
- from L1CaloFEXAlgos.L1CaloFEXAlgosConfig import L1CaloFEXDecoratorCfg
- result.merge(L1CaloFEXDecoratorCfg(flags,"jFexTower2SCellDecorator"))
-
- from L1CaloFEXAlgos.FexEmulatedTowersConfig import jFexEmulatedTowersCfg
- result.merge(jFexEmulatedTowersCfg(flags,"jFexEmulatedTowerMaker"))
from L1CaloFEXSim.L1CaloFEXSimCfg import L1CaloFEXSimCfg
result.merge(L1CaloFEXSimCfg(flags))
--
GitLab