diff --git a/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/python/L1TopoOnlineMonitoringConfig.py b/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/python/L1TopoOnlineMonitoringConfig.py index 9b523e4cf396b60bcd17979b96a15342512da3e6..b0270c9577a3ba9bafc38c27779354bb394a7eba 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/python/L1TopoOnlineMonitoringConfig.py +++ b/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/python/L1TopoOnlineMonitoringConfig.py @@ -49,6 +49,10 @@ def getL1TopoLegacyOnlineMonitor(flags): alg.MonTool = GenericMonitoringTool('MonTool') configureLegacyHistograms(alg, flags) + # Disable ByteStream monitoring when running on MC + alg.doRawMon = not flags.Input.isMC + alg.doCnvMon = not flags.Input.isMC + def getAlgProp(prop): return getattr(alg, prop) if hasattr(alg, prop) \ else alg.getDefaultProperty(prop) diff --git a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py index 8d6a5d17e3c0ad7c3115a7f3ad15888072202a03..38be92568c0aa2b406dd14982a90a2c93a947474 100644 --- a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py +++ b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py @@ -3,6 +3,7 @@ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Run2TriggerTowerMaker from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory +from AthenaConfiguration.Enums import Format class Run2TriggerTowerMakerBase (LVL1__Run2TriggerTowerMaker): __slots__ = [] @@ -76,6 +77,16 @@ def Run2TriggerTowerMakerCfg(flags, name='Run2TriggerTowerMaker25ns'): condFoldersAcc, condFolders = L1CaloCondFoldersCfg(flags) acc.merge(condFoldersAcc) + # R2TTMaker reads TTL1 containers from input POOL file (RDO, ESD, ...) + if flags.Input.Format is Format.POOL: + ttl1Containers = [ + ('LArTTL1Container', 'LArTTL1EM'), + ('LArTTL1Container', 'LArTTL1HAD'), + ('TileTTL1Container', 'TileTTL1Cnt'), + ] + from SGComps.SGInputLoaderConfig import SGInputLoaderCfg + acc.merge(SGInputLoaderCfg(flags, Load=ttl1Containers)) + # R2TTMaker reads L1Menu in BeginRun incident, so needs L1ConfigSvc from TrigConfigSvc.TrigConfigSvcCfg import L1ConfigSvcCfg acc.merge(L1ConfigSvcCfg(flags)) diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1MuonSimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1MuonSimulationConfig.py index 4ed7dfe0c9de704fc74bdd7c81c57b580ea7809c..3730594e461baaff86ff1bc72d0b99dbb9da47c6 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1MuonSimulationConfig.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1MuonSimulationConfig.py @@ -2,11 +2,17 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory +from AthenaConfiguration.Enums import Format from IOVDbSvc.IOVDbSvcConfig import addFolders def TMDBConfig(flags): acc = ComponentAccumulator() - if not flags.Input.isMC: + + # Read MuRcvRawChCnt from the input file (for POOL directly, for BS via converter) + if flags.Input.Format is Format.POOL: + from SGComps.SGInputLoaderConfig import SGInputLoaderCfg + acc.merge(SGInputLoaderCfg(flags, Load=[('TileRawChannelContainer','MuRcvRawChCnt')])) + else: from TriggerJobOpts.TriggerByteStreamConfig import ByteStreamReadCfg acc.merge(ByteStreamReadCfg(flags, ["TileRawChannelContainer/MuRcvRawChCnt"])) @@ -145,6 +151,16 @@ def RecoMuonSegmentSequence(flags): def MuonRdo2DigitConfig(flags): acc = ComponentAccumulator() + + # Read RPCPAD and TGCRDO from the input POOL file (for BS it comes from [Rpc|Tgc]RawDataProvider) + if flags.Input.Format is Format.POOL: + rdoInputs = [ + ('RpcPadContainer','RPCPAD'), + ('TgcRdoContainer','TGCRDO'), + ] + from SGComps.SGInputLoaderConfig import SGInputLoaderCfg + acc.merge(SGInputLoaderCfg(flags, Load=rdoInputs)) + from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg acc.merge(MuonGeoModelCfg(flags)) MuonRdoToMuonDigitTool = CompFactory.MuonRdoToMuonDigitTool (DecodeMdtRDO = False,