diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py index 02db851dff14f5fb1e5693fc1d9a097cadfda046..38d94d2785a814c89c8201480957adf4a817ed8c 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') diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py index a50a9c5148ff1cc65eab76b0183a684d915f4f80..85a1efbb1322130dae3bf3a3bdb6b3bd61d7fa03 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))