diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py index e6123c73b554ff2eef02b014c695bb1a1ec0eb90..5531173f417d0989f71f8f39d119859b833f83c7 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py @@ -404,10 +404,6 @@ del _flags ## make an alias for trigger flags which looks like old TriggerFlags class TriggerFlags = rec.Trigger - -## add online specific flags -import TriggerJobOpts.TriggerOnlineFlags # noqa: F401 - ## add slices generation flags log.info("TriggerFlags importing SliceFlags" ) from TriggerJobOpts.SliceFlags import * # noqa: F401, F403 diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerOnlineFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerOnlineFlags.py deleted file mode 100644 index 980948ccdb2fa7ff8c9f23544eb15af7de87fed4..0000000000000000000000000000000000000000 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerOnlineFlags.py +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration - -################################################################################ -# @file TriggerOnlineFlags.py -# @author Frank Winklmeier -# @brief Trigger flags for online running -################################################################################ - -from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer -from AthenaCommon.JobProperties import jobproperties # noqa: F401 - -_flags = [] - -class doDBConfig(JobProperty): - """ Flag to extract the trigger configuration """ - statusOn = True - allowedTypes = ['bool'] - StoredValue = False - -_flags += [doDBConfig] - -class doDBConfigBaseName(JobProperty): - """ Base name of the file that holds the trigger configuration """ - statusOn = True - allowedTypes = ['str'] - StoredValue = '' - -_flags += [doDBConfigBaseName] - -class partitionName(JobProperty): - """ Name of the partition if running in online environment, otherwise empty """ - statusOn = True - allowedTypes = ['str'] - import os - StoredValue = os.getenv('TDAQ_PARTITION') or '' - -_flags += [partitionName] - -# Create "Online" container -class Online(JobPropertyContainer): - """ Trigger online flags - """ - pass - -from TriggerJobOpts.TriggerFlags import TriggerFlags -TriggerFlags.add_Container(Online) - -# Add all flags -for f in _flags: - TriggerFlags.Online.add_JobProperty(f) diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py index c7971f5c7f00c2eb8eced1cd175f29256f14b5a8..1e67b6fe910ffe22539dd55387f00b0ea2be8f91 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py @@ -29,8 +29,6 @@ class opt: doID = True # ConfigFlags.Trigger.doID doCalo = True # ConfigFlags.Trigger.doCalo doMuon = True # ConfigFlags.Trigger.doMuon - doDBConfig = None # dump trigger configuration - trigBase = None # file name for trigger config dump doWriteRDOTrigger = False # Write out RDOTrigger? doWriteBS = True # Write out BS? doL1Unpacking = True # decode L1 data in input file if True, else setup emulation @@ -242,11 +240,6 @@ ConfigFlags.Trigger.enableL1TopoDump = opt.enableL1TopoDump # Pass on the option enabling HLT selection algorithms ConfigFlags.Trigger.doHLT = TriggerFlags.doHLT = bool(opt.doHLT) -# To extract the Trigger configuration -TriggerFlags.Online.doDBConfig = bool(opt.doDBConfig) -if opt.trigBase is not None: - TriggerFlags.Online.doDBConfigBaseName = opt.trigBase - # Setup list of modifiers # Common modifiers for MC and data setModifiers = ['noLArCalibFolders',