Skip to content
Snippets Groups Projects
Commit 7a50a946 authored by Catrin Bernius's avatar Catrin Bernius
Browse files

ATR-17934: moving forgotten SliceFlag (jet), fixing import paths, fixing... 

ATR-17934: moving forgotten SliceFlag (jet), fixing import paths, fixing indent mistake in GenerateMenuMT, fix of typo in CMakeList
parent 2665c5eb
No related branches found
No related tags found
1 merge request!20779WIP: Migrate DataQualityTools to ToolHandles
Hide whitespace changes
Inline Side-by-side
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetSliceFlags.py → Trigger/TriggerCommon/TriggerJobOpts/python/JetSliceFlags.py
+ 3
− 7
View file @ 7a50a946
......@@ -3,7 +3,7 @@
""" Jet slice specific flags """
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer, jobproperties
from TriggerMenu.menu.CommonSliceHelper import CommonSliceHelper, AllowedList
from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper, AllowedList
__author__ = 'T. Bold'
__version__="$Revision: 1.31 $"
......@@ -20,18 +20,14 @@ class signatures(JobProperty):
_flags.append(signatures)
# create container
from TriggerMenu.menu.CommonSliceHelper import CommonSliceHelper
class JetSlice(JobPropertyContainer, CommonSliceHelper):
class JetSlice(JobPropertyContainer, CommonSignatureHelper):
""" Jet Slice Flags """
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.add_Container(JetSlice)
# add add common slice flags
TriggerFlags.JetSlice.import_JobProperties('TriggerMenu.menu.CommonSliceFlags')
TriggerFlags.JetSlice.import_JobProperties('TriggerJobOpts.CommonSignatureFlags')
for flag in _flags:
TriggerFlags.JetSlice.add_JobProperty(flag)
......
Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
+ 3
− 3
View file @ 7a50a946
......@@ -6,10 +6,10 @@
atlas_subdir( TriggerMenuMT )
# Install files from the package:
atlas_install_python_modules( python/*.py python/LVL1MenuConfig/*.py python/HLTMenuConfig/*.py
python/HLTMenuConfic/Menu python/LVL1MenuConfig/LVL1
atlas_install_python_modules( python/*.py python/LVL1MenuConfig/*.py
python/HLTMenuConfig/Menu python/LVL1MenuConfig/LVL1
python/LVL1MenuConfig/LVL1Menu python/LVL1MenuConfig/LVL1Topo python/LVL1MenuConfig/L1TopoMenu
python/HLTMenuConfig/Egamma python/HLTMenuConfig/Muon python/HLTMenuConfig/Jet python/CommonUtils
python/HLTMenuConfig/Egamma python/HLTMenuConfig/Muon python/HLTMenuConfig/Jet
python/HLTMenuConfig/Combined
)
atlas_install_joboptions( share/*.py )
......
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+ 27
− 26
View file @ 7a50a946
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
from TriggerJobOpts.TriggerFlags import TriggerFlags
from TriggerMenuMT.HLTMenuConfig.Muon.MuonSliceFlags import MuonSliceFlags
from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaSliceFlags import EgammaSliceFlags
from TriggerMenuMT.HLTMenuConfig.Jet.JetSliceFlags import JetSliceFlags
from TriggerMenuMT.HLTMenuConfig.Combined.CombinedSliceFlags import CombinedSliceFlags
from TriggerJobOpts.MuonSliceFlags import MuonSliceFlags
from TriggerJobOpts.EgammaSliceFlags import EgammaSliceFlags
from TriggerJobOpts.JetSliceFlags import JetSliceFlags
from TriggerJobOpts.CombinedSliceFlags import CombinedSliceFlags
# Configure the scheduler
from AthenaCommon.AlgScheduler import AlgScheduler
......@@ -53,36 +53,37 @@ class GenerateMenuMT:
self.doMuonChains = False
allowedSignatures = ["jet","egamma","muon", "electron", "photon","met","tau",
allowedSignatures = ["jet","egamma","muon", "electron", "photon","met","tau",
"minbias", "heavyion", "cosmic", "calibration", "streaming", "monitoring", "ht", 'bjet','eb']
listOfChainDefs = []
chainDicts = TriggerMenuMT.HLTMenuConfig.Menu.MenuUtils.splitInterSignatureChainDict(chainDicts)
log.debug("\n chainDicts2 %s", chainDicts)
listOfChainDefs = []
chainDicts = TriggerMenuMT.HLTMenuConfig.Menu.MenuUtils.splitInterSignatureChainDict(chainDicts)
log.debug("\n chainDicts2 %s", chainDicts)
for chainDict in chainDicts:
chainDef = None
print 'checking chainDict for chain %s %s %r' %(chainDict['chainName'],chainDict["signature"], self.doEnhancedBiasChains)
if chainDict["signature"] == "Muon" and self.doMuonChains:
try:
chainDef = TriggerMenuMT.HLTMenuConfig.Muon.generateMuonChainDefs.generateChainDefs(chainDict)
except:
log.error('Problems creating ChainDef for chain %s ' % (chainDict['chainName']))
log.info(traceback.print_exc())
continue
for chainDict in chainDicts:
chainDef = None
print 'checking chainDict for chain %s %s %r' %(chainDict['chainName'],chainDict["signature"], self.doEnhancedBiasChains)
else:
log.error('Chain %s ignored - either because the trigger signature ("slice") has been turned off or because the corresponding chain dictionary cannot be read.' %(chainDict['chainName']))
log.debug('Chain dictionary of failed chain is %s.', chainDict)
if chainDict["signature"] == "Muon" and self.doMuonChains:
try:
chainDef = TriggerMenuMT.HLTMenuConfig.Muon.generateMuonChainDefs.generateChainDefs(chainDict)
except:
log.error('Problems creating ChainDef for chain %s ' % (chainDict['chainName']))
log.info(traceback.print_exc())
continue
log.debug(' ChainDef %s ' % chainDef)
else:
log.error('Chain %s ignored - either because the trigger signature ("slice") has been turned off or because the corresponding chain dictionary cannot be read.' %(chainDict['chainName']))
log.debug('Chain dictionary of failed chain is %s.', chainDict)
log.debug(' ChainDef %s ' % chainDef)
if len(listOfChainDefs) == 0:# or not (len(listOfChainDefs)==len(chainDicts)):
if len(listOfChainDefs) == 0:
return False
else:
theChainDef = listOfChainDefs[0]
return theChainDef
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment