Commit 8490600a authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Remove TriggerFlags.writeL1TopoValData

With the removal of `L1TopoValDataCnv` this flag serves no purpose
anymore.
parent 2eb7ea89
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
import sys
from AthenaCommon.Logging import logging
......@@ -53,10 +53,6 @@ rec.doTile.set_Value_and_Lock(False)
rec.doTrigger.set_Value_and_Lock(True)
# switch off failint L1Topo stuff
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.writeL1TopoValData.set_Value_and_Lock(False)
ConfigureTriggerStream()
......
......@@ -49,10 +49,6 @@ rec.doTile.set_Value_and_Lock(True)
rec.doTrigger.set_Value_and_Lock(True)
# switch off failint L1Topo stuff
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.writeL1TopoValData.set_Value_and_Lock(False)
ConfigureTriggerStream()
......
# 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 TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
......@@ -165,18 +165,6 @@ class ByteStreamUnpackGetterRun2(Configured):
TrigSerializeConvHelper = TrigSerializeConvHelper(doTP = True)
ToolSvc += TrigSerializeConvHelper
#
# Configure L1Topo validation data algorithm
#
if hasHLT and TriggerFlags.doMergedHLTResult() and TriggerFlags.writeL1TopoValData() :
# make sure that CTP_RDO is known (see also ATR-14683)
ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [
"CTP_RDO/CTP_RDO"
]
from L1TopoValDataCnv.L1TopoValDataCnvConf import xAODMaker__L1TopoValDataCnvAlg
L1TopoValDataCvnAlg = xAODMaker__L1TopoValDataCnvAlg()
topSequence += L1TopoValDataCvnAlg
return True
......@@ -345,13 +333,6 @@ class HLTTriggerResultGetter(Configured):
objKeyStore.addManyTypesStreamESD(getTrigIDTruthList(TriggerFlags.ESDEDMSet()))
objKeyStore.addManyTypesStreamAOD(getTrigIDTruthList(TriggerFlags.AODEDMSet()))
if (rec.doESD() or rec.doAOD()) and TriggerFlags.writeL1TopoValData():
objKeyStore.addManyTypesStreamESD(['xAOD::TrigCompositeContainer#HLT_xAOD__TrigCompositeContainer_L1TopoValData',
'xAOD::TrigCompositeAuxContainer#HLT_xAOD__TrigCompositeContainer_L1TopoValDataAux.'])
objKeyStore.addManyTypesStreamAOD(['xAOD::TrigCompositeContainer#HLT_xAOD__TrigCompositeContainer_L1TopoValData',
'xAOD::TrigCompositeAuxContainer#HLT_xAOD__TrigCompositeContainer_L1TopoValDataAux.'])
log.debug("HLT_xAOD__TrigCompositeContainer_L1TopoValData(Aux.) for L1Topo validation added to the data.")
if rec.doAOD() or rec.doWriteAOD():
# schedule the RoiDescriptorStore conversion
# log.warning( "HLTTriggerResultGetter - setting up RoiWriter" )
......
......@@ -13,9 +13,6 @@ def createTriggerFlags():
# enables L1 topological trigger simulation
flags.addFlag('Trigger.doL1Topo', True )
# writes additional info from Topo simulation
flags.addFlag('Trigger.writeL1TopoValData', True )
# need proper documentation
flags.addFlag('Trigger.useL1CaloCalibration', False)
......
......@@ -29,7 +29,6 @@ default_true_flags = [
"useCaloTTL", # False for DC1. Can use True for Rome files with Digits or post-Rome data """
"doMergedHLTResult", # if False disable decoding of the merged HLT Result (so decoding L2/EF Result) """
"doAlwaysUnpackDSResult", # if False disable decoding of DS results for all files but for real DS files
"writeL1TopoValData", # if False disable writing out of the xAOD L1Topo validation object """
"doFEX", # if False disable Feature extraction algorithms """
"doHypo", # if False disable all Hypothesis algorithms (HYPO)"""
"doID", # if False, disable ID algos at LVL2 and EF """
......
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