Skip to content
Snippets Groups Projects
Commit 3ab964d3 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'mc-deps' into 'master'

[Trigger] Fix unmet dependencies in MC

See merge request atlas/athena!50543
parents f73c64fc 79b2758b
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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))
......
......@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment