Commit 94c5da91 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'l1muon' into 'master'

Update digit container names used for L1 muon simulation

See merge request atlas/athena!31042
parents 9939911f 274c2f5c
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
def Lvl1SimulationSequence( flags = None ):
......@@ -82,8 +82,6 @@ def Lvl1SimulationSequence( flags = None ):
conddb.addFolder( "TRIGGER_OFL", l1calofolder )
# muons
from AthenaCommon.Include import include ## TODO, see if can be replaced by new JO
include( "MuonByteStreamCnvTest/jobOptions_MuonRDOToDigit.py" )
from MuonByteStreamCnvTest.MuonByteStreamCnvTestConf import MuonRdoToMuonDigitTool
MuonRdoToMuonDigitTool = MuonRdoToMuonDigitTool (DecodeMdtRDO = False,
DecodeRpcRDO = True,
......@@ -95,7 +93,9 @@ def Lvl1SimulationSequence( flags = None ):
mdtRdoDecoderTool="",
cscRdoDecoderTool="",
stgcRdoDecoderTool="",
mmRdoDecoderTool="")
mmRdoDecoderTool="",
RpcDigitContainer = "RPC_DIGITS_L1",
TgcDigitContainer = "TGC_DIGITS_L1")
MuonRdoToMuonDigitTool.cscCalibTool = "CscCalibTool"
from AthenaCommon.AppMgr import ToolSvc
......@@ -125,12 +125,13 @@ def Lvl1SimulationSequence( flags = None ):
Hardware = True, # not sure if needed, not there in old config, present in JO
DataDetail = False,
RPCbytestream = False,
RPCbytestreamFile = ""),
RPCbytestreamFile = "",
RPCDigitContainer = "RPC_DIGITS_L1"),
# based on Trigger/TrigT1/TrigT1TGC/python/TrigT1TGCConfig.py
# interesting is that this JO sets inexisting properties, commented out below
LVL1TGCTrigger__LVL1TGCTrigger("LVL1TGCTrigger",
InputData_perEvent = "TGC_DIGITS",
InputData_perEvent = "TGC_DIGITS_L1",
MuCTPIInput_TGC = "L1MuctpiStoreTGC",
MaskFileName12 = "TrigT1TGCMaskedChannel._12.db"),
muctpi
......
......@@ -358,8 +358,6 @@ if TriggerFlags.doMuon():
TriggerFlags.MuonSlice.doTrigMuonConfig=True
import MuonCnvExample.MuonCablingConfig # noqa: F401
import MuonRecExample.MuonReadCalib # noqa: F401
if globalflags.InputFormat.is_pool():
include( "MuonByteStreamCnvTest/jobOptions_MuonRDOToDigit.py" )
include ("MuonRecExample/MuonRecLoadTools.py")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment