Commit 23290388 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

TriggerFlags: delete obsolete old-style flags

Delete the following obsolete old-style `TriggerFlags`:
  - `writeBS`: not used
  - `doTransientByteStream`: all code using new-style flag
  - `generateMenuDiagnostics`: migrated remaining code to new-style flag
  - `fakeLVL1`: not used
  - `doAlwaysUnpackDSResult`: not used
parent 203b2952
......@@ -40,14 +40,13 @@ for option in defaultOptions:
else:
log.info(' %20s = (Default) %s' % (option, getattr(opt, option)))
TriggerFlags.generateMenuDiagnostics=True
from TrigConfigSvc.TrigConfigSvcCfg import getHLTConfigSvc, getL1ConfigSvc
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
from AthenaConfiguration.AllConfigFlags import ConfigFlags
ConfigFlags.Trigger.triggerMenuSetup = TriggerFlags.triggerMenuSetup= 'LS2_v1'
ConfigFlags.Trigger.generateMenuDiagnostics = True
svcMgr += conf2toConfigurable( getHLTConfigSvc(ConfigFlags))
svcMgr += conf2toConfigurable( getL1ConfigSvc(ConfigFlags))
......
......@@ -137,7 +137,7 @@ class ByteStreamUnpackGetterRun1or2(Configured):
from PyUtils.MetaReaderPeeker import metadata
if 'stream' in metadata:
stream_local = metadata['stream']
if stream_local.startswith('calibration_DataScouting_') or TriggerFlags.doAlwaysUnpackDSResult():
if stream_local.startswith('calibration_DataScouting_'):
if 'calibration' in stream_local and 'DataScouting_' in stream_local:
ds_tag = stream_local[12:27]
ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "HLT::HLTResult/"+ds_tag ]
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# -------------------------------------------------------------
# L1 Getter of the result
......@@ -14,27 +14,12 @@ from RecExConfig.Configured import Configured
from RecExConfig.ObjKeyStore import objKeyStore
class Lvl1ResultBuilderGetter(Configured):
#_output = {"CTP_Decision":"CTP_Decision", "LVL1_ROI":"LVL1_ROI"}
def configure(self):
# from AthenaServices.AthenaServicesConf import AthenaOutputStream
# from AthenaCommon.AppMgr import ServiceMgr
# from AthenaCommon.AlgSequence import AlgSequence
# topSequence = AlgSequence()
# ### the following was gotten from the LVL1TriggerGetter not sure if needed when not simulation
# if not (TriggerFlags.fakeLVL1() or TriggerFlags.doLVL1()):
# DetFlags.readRIOPool.LVL1_setOn()
# # ***Temp : needed to enable required combination of thresholds
# # mu4,mu6,mu10,mu11,mu20,mu40
# # Will be replaced by config. from Lvl1ConfigSvc
# if hasattr(ServiceMgr,'RPCcablingSimSvc'):
# ServiceMgr.RPCcablingSimSvc.HackFor1031 = True
if jobproperties.Global.InputFormat() == 'bytestream':
theApp.Dlls += [ "TrigT1Calo" ]
include("TrigT1CaloByteStream/ReadLVL1CaloBS_jobOptions.py")
# ###
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
......
......@@ -426,10 +426,7 @@ class rewriteLVL1(_modifier):
L1ByteStreamEncodersRecExSetup()
def postSetup(self):
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
if not TriggerFlags.writeBS:
log.warning('rewriteLVL1 is True but TriggerFlags.writeBS is False')
if not ConfigFlags.Output.doWriteBS:
log.warning('rewriteLVL1 is True but ConfigFlags.Output.doWriteBS is False')
if not ConfigFlags.Trigger.writeBS:
......
......@@ -294,9 +294,7 @@ def createTriggerFlags():
return flags
# for reference, this flags are skipped as never used or never set in fact, or set identical to de default or used in a very old JO:
# fakeLVL1
# doMergedHLTResult - not needed now
# doAlwaysUnpackDSResult - never set
# configForStartup
# the flags related to trigger DB are redundant of triggerConfig - need to decide if they are needed in this form
# also not defined the Prescale sets yet
......
......@@ -27,7 +27,6 @@ default_true_flags = [
"doLVL1", # run the LVL1 simulation (set to FALSE to read the LVL1 result from BS file)
"doL1Topo", # Run the L1 Topo simulation (set to FALSE to read the L1 Topo result from BS file)
"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
"doID", # if False, disable ID algos at LVL2 and EF """
"doCalo", # if False, disable Calo algorithms at LVL2 & EF """
"doCaloOffsetCorrection", # enable Calo pileup offset BCID correction """
......@@ -36,16 +35,11 @@ default_true_flags = [
]
default_false_flags = [
"fakeLVL1", # create fake RoI from KINE info """
"useRun1CaloEnergyScale",
"doTruth",
"doTriggerConfigOnly", # if True only the configuration services should be set, no algorithm """
"doTransientByteStream", # Write transient ByteStream before executing HLT algorithms.
# To be used for running on MC RDO with clients which require BS inputs.
"writeBS", # Write ByteStream output file """
"readBS",
"readMenuFromTriggerDb", # define the TriggerDb to be the source of the LVL1 and HLT trigger menu
"generateMenuDiagnostics", # Generate additional files heling in menu diagnostics """
]
for name in default_true_flags:
......@@ -696,7 +690,4 @@ def sync_Trigger2Reco():
TriggerFlags.doLVL1 = False
TriggerFlags.doHLT = False
if rec.doWriteBS():
TriggerFlags.writeBS = True
del log
......@@ -554,7 +554,6 @@ if opt.doWriteRDOTrigger:
ConfigFlags.Output.RDOFileName = 'RDO_TRIG.pool.root' # new JO flag
if opt.doWriteBS:
rec.doWriteBS = True # RecExCommon flag
TriggerFlags.writeBS = True # RecExCommon flag
ConfigFlags.Output.doWriteBS = True # new JO flag
ConfigFlags.Trigger.writeBS = True # new JO flag
......
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
"""
------ Documentation on HLT Tree creation -----
......@@ -34,7 +34,7 @@ from collections import OrderedDict
# Classes to configure the CF graph, via Nodes
from AthenaCommon.CFElements import parOR, seqAND
from AthenaCommon.AlgSequence import dumpSequence
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFDot import stepCF_DataFlow_to_dot, stepCF_ControlFlow_to_dot, all_DataFlow_to_dot, create_dot
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFDot import stepCF_DataFlow_to_dot, stepCF_ControlFlow_to_dot, all_DataFlow_to_dot
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
from AthenaCommon.Configurable import Configurable
from AthenaCommon.CFElements import getSequenceChildren, isSequence, compName
......@@ -382,7 +382,9 @@ def decisionTreeFromChains(HLTNode, chains, allDicts, newJO):
# create dot graphs
log.debug("finalDecisions: %s", finalDecisions)
if create_dot():
from AthenaConfiguration.AllConfigFlags import ConfigFlags
if ConfigFlags.Trigger.generateMenuDiagnostics:
all_DataFlow_to_dot(HLTNodeName, CFseq_list)
# matrix display
......@@ -530,7 +532,8 @@ def createControlFlow(HLTNode, CFseqList):
HLTNode += summary
if create_dot():
from AthenaConfiguration.AllConfigFlags import ConfigFlags
if ConfigFlags.Trigger.generateMenuDiagnostics:
log.debug("Now Draw...")
stepCF_DataFlow_to_dot(stepRecoNode.name(), CFseqList[nstep])
stepCF_ControlFlow_to_dot(stepRecoNode)
......
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
###### Here some graphical methods to produce dot files from Decision Handling
# to visualize: dot -T pdf Step1.dot > Step1.pdf
......@@ -8,11 +8,6 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import algColor, isPassFilt
import itertools
from AthenaCommon.CFElements import getSequenceChildren, isSequence, compName
def create_dot():
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
return TriggerFlags.generateMenuDiagnostics() or ConfigFlags.Trigger.generateMenuDiagnostics
DrawHypoTools=True
......
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