diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py index a73acaaa262e123bc7d93ce4254d46db10c59b34..48b18ac1f38b26e0d2f465b1a2afb31580c9b483 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration from TriggerJobOpts.TriggerFlags import TriggerFlags from AthenaCommon.Logging import logging @@ -441,14 +441,13 @@ class HLTTriggerResultGetter(Configured): from AthenaCommon.AppMgr import ServiceMgr as svcMgr from AthenaServices.Configurables import ThinningSvc, createThinningSvc - _doSlimming = True - if _doSlimming and rec.readRDO() and rec.doWriteAOD(): + if TriggerFlags.doNavigationSlimming() and rec.readRDO() and rec.doWriteAOD(): if not hasattr(svcMgr, 'ThinningSvc'): # if the default is there it is configured for AODs svcMgr += ThinningSvc(name='ThinningSvc', Streams=['StreamAOD']) _addSlimming('StreamAOD', svcMgr.ThinningSvc, _TriggerESDList ) #Use ESD item list also for AOD! log.info("configured navigation slimming for AOD output") - if _doSlimming and rec.readRDO() and rec.doWriteESD(): #rec.doWriteESD() and not rec.readESD(): + if TriggerFlags.doNavigationSlimming() and rec.readRDO() and rec.doWriteESD(): if not hasattr(svcMgr, 'ESDThinningSvc'): svcMgr += ThinningSvc(name='ESDThinningSvc', Streams=['StreamESD']) # the default is configured for AODs _addSlimming('StreamESD', svcMgr.ESDThinningSvc, _TriggerESDList ) diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py index adff0f8300b10f01ca53de35498a3c768ae6b084..5a783fbce8c283fb76894591b5405d4a4e34d4cc 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py @@ -365,6 +365,14 @@ class ESDEDMSet(JobProperty): _flags.append(ESDEDMSet) +class doNavigationSlimming(JobProperty): + """Enable the trigger navigation slimming""" + statusOn=True + allowedType=['bool'] + StoredValue=True + +_flags.append(doNavigationSlimming) + class OnlineCondTag(JobProperty): """ Default (online) HLT conditions tag """ statusOn=True