Commit 26312cfe authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

TriggerJobOpts: use Phase1 muon sim in newJO test

Migrate the CA-based L1 and HLT job options to use the Phase-1 Muctpi
simulation.
parent 4f9c24c9
......@@ -220,8 +220,8 @@ def muFastSteeringCfg( flags, roisKey, setup="" ):
topoRoad=True,
dEtasurrRoI = 0.14,
dPhisurrRoI = 0.14,
MonTool = None )
#MonTool = TrigL2MuonSAMonitoring() )
MonTool = None,
UseRun3Config = flags.Trigger.enableL1MuonPhase1 )
# Default backextrapolator is for MC Misaligned Detector
# Based on MuonBackExtrapolatorForMisalignedDet at TrigMuonBackExtrapolator/TrigMuonBackExtrapolatorConfig.py
......
......@@ -45,8 +45,8 @@ def L1LegacyTopoSimulationCfg(flags):
if flags.Trigger.enableL1MuonPhase1:
muProvider = CompFactory.LVL1.MuonInputProvider("MuonInputProvider",
ROIBResultLocation = "", #disable input from RoIBResult
MuctpiSimTool = muctpiTool,
MuonEncoding = 1 if flags.Input.isMC else 0)
MuonROILocation = "",
MuonEncoding = 1)
else:
muProvider = CompFactory.LVL1.MuonInputProviderLegacy("MuonInputProviderLegacy",
ROIBResultLocation = "", #disable input from RoIBResult
......@@ -78,7 +78,8 @@ def L1TopoSimulationCfg(flags):
if flags.Trigger.enableL1MuonPhase1:
muProvider = CompFactory.LVL1.MuonInputProvider("MuonInputProvider",
ROIBResultLocation = "", #disable input from RoIBResult
MuonEncoding = 1 if flags.Input.isMC else 0)
MuonROILocation = "",
MuonEncoding = 1)
else:
#Grab the MUCTPI tool
from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiToolRDOCfg
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaCommon.Logging import logging
......@@ -35,13 +35,12 @@ def MUCTPI_AthToolCfg(name):
# Decide which LUT to use, based on which run we are simulating:
tool.LUTXMLFile = "TrigConfMuctpi/overlapRun3_20201214.xml"
logger.info( "Configuring MuCTPI simulation with configuration file:" )
logger.info( " "+tool.LUTXMLFile )
logger.info( "Configuring MuCTPI simulation with configuration file: %s", tool.LUTXMLFile )
return tool
def MUCTPI_AthAlgCfg(name):
def MUCTPI_AthAlgCfg(flags):
acc = ComponentAccumulator()
alg = CompFactory.getComp("LVL1MUCTPIPHASE1::MUCTPI_AthAlg")(name="MUCTPI_AthAlg")
alg.MUCTPI_AthTool = MUCTPI_AthToolCfg(name="MUCTPI_AthTool")
......
......@@ -106,18 +106,13 @@ def Lvl1MuonSimulationCfg(flags):
from MuonConfig.MuonCablingConfig import RPCCablingConfigCfg
acc.merge( RPCCablingConfigCfg(flags) )
if not flags.Input.isMC:
tagName = flags.Trigger.L1MuonSim.CondDBOffline if flags.Trigger.L1MuonSim.CondDBOffline != '' else "OFLCOND-MC16-SDR-RUN2-04"
acc.merge(addFolders(flags, ["<db>COOLOFL_RPC/OFLP200</db> /RPC/TRIGGER/CM_THR_ETA",
"<db>COOLOFL_RPC/OFLP200</db> /RPC/TRIGGER/CM_THR_PHI"],
tag=tagName, className="CondAttrListCollection"))
rpcL1Alg = CompFactory.TrigT1RPC("TrigT1RPC",
Hardware = True, # not sure if needed, not there in old config, present in JO
DataDetail = False,
RPCbytestream = False,
RPCbytestreamFile = "",
RPCDigitContainer = "RPC_DIGITS_L1")
Hardware = True, # not sure if needed, not there in old config, present in JO
DataDetail = False,
RPCbytestream = False,
RPCbytestreamFile = "",
RPCDigitContainer = "RPC_DIGITS_L1",
useRun3Config = True)
acc.addEventAlgo(rpcL1Alg)
#TGC
......@@ -150,9 +145,10 @@ def Lvl1MuonSimulationCfg(flags):
tgcL1Alg = CompFactory.LVL1TGCTrigger.LVL1TGCTrigger("LVL1TGCTrigger",
InputData_perEvent = "TGC_DIGITS_L1",
MuCTPIInput_TGC = "L1MuctpiStoreTGC",
MaskFileName12 = "TrigT1TGCMaskedChannel._12.db")
InputData_perEvent = "TGC_DIGITS_L1",
MuCTPIInput_TGC = "L1MuctpiStoreTGC",
MaskFileName12 = "TrigT1TGCMaskedChannel._12.db",
useRun3Config = True)
if not flags.Input.isMC:
tgcL1Alg.TileMuRcv_Input = "rerunTileMuRcvCnt"
......@@ -160,23 +156,8 @@ def Lvl1MuonSimulationCfg(flags):
from TrigConfigSvc.TrigConfigSvcCfg import L1ConfigSvcCfg
acc.merge(L1ConfigSvcCfg(flags))
# based on: Trigger/TrigT1/TrigT1Muctpi/python/TrigT1MuctpiConfig.py
muctpiAlg = CompFactory.LVL1MUCTPI.L1Muctpi("L1Muctpi",
OverlapStrategyName = "LUT",
DumpLUT = False,
FlaggingMode = False,
MultiplicityStrategyName = "INCLUSIVE",
# TODO this value depends on the flags on original however seem always to default to this two settings below
# is definitely different for Run3
LUTXMLFile = "TrigConfMuctpi/data10_7TeV.periodI.physics_Muons.MuCTPI_LUT.NoBEOverlaps_composedEF.v002_modifiedBB.xml",
RunPeriod = "RUN2",
GeometryXMLFile = "TrigConfMuctpi/TestMioctGeometry_2016_05_30_CS_2600573263.xml",
DoNIMOutput = True,
NIMBarrelBit = 29,
NIMEndcapBit = 30,
LVL1ConfigSvc = acc.getService("LVL1ConfigSvc"))
acc.addEventAlgo(muctpiAlg)
from TrigT1MuctpiPhase1.TrigT1MuctpiPhase1Config import MUCTPI_AthAlgCfg
acc.merge(MUCTPI_AthAlgCfg(flags))
return acc
......@@ -194,6 +175,7 @@ if __name__ == "__main__":
flags.Scheduler.ShowDataDeps=True
flags.Scheduler.CheckDependencies=True
flags.Scheduler.ShowDataFlow=True
flags.Trigger.enableL1MuonPhase1=True
acc = MainServicesCfg(flags)
......
......@@ -231,6 +231,7 @@ if __name__ == '__main__':
flags.Scheduler.ShowDataDeps=True
flags.Scheduler.CheckDependencies=True
flags.Scheduler.ShowDataFlow=True
flags.Trigger.enableL1MuonPhase1=True
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
acc = MainServicesCfg(flags)
......
......@@ -54,6 +54,9 @@ flags.IOVDb.GlobalTag = lambda f: 'OFLCOND-MC16-SDR-25-02' if f.Input.isMC else
flags.Common.isOnline = lambda f: not f.Input.isMC
flags.Common.MsgSourceLength=70
flags.Trigger.doLVL1=True # run L1 sim also on data
flags.Trigger.enableL1MuonPhase1=True
flags.Trigger.enableL1CaloPhase1=False
flags.Trigger.enableL1CaloLegacy=True
flags.Concurrency.NumThreads = 1
flags.InDet.useSctDCS = False
......
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