diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
index 92f15417f03d01f871fd8ebb377dda63ddc9e093..0f3709e1054747021edef741f85d76d2969febe3 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
@@ -24,7 +24,7 @@ def decodeEtEta(match, chain):
return conf_tool
-def trigJetHypoToolFromName(name, thresholdHLT):
+def trigJetHypoToolFromName(name, jetconfig):
"""Configure a jet hypo tool from chain name.
Delegate to functions according to the hypo scenartio."""
@@ -32,7 +32,7 @@ def trigJetHypoToolFromName(name, thresholdHLT):
scenario_dict = {re_EtEta0: decodeEtEta}
- chain = thresholdHLT
+ chain = jetconfig
for k, v in scenario_dict.items():
match = k.match(chain)
if match:
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 251b42fc39640e77f625e4786f5169f206418d4f..f1dec87db8a9f073d1e7c6a041ae89fd5ff08ccd 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -100,6 +100,20 @@ atlas_add_test( muMenu
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_muMenu
)
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_jet )
+atlas_add_test( simpleJetJob
+ SCRIPT test/test_jet.sh
+ PROPERTIES TIMEOUT 500
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_jet
+ )
+
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_jetMenu )
+atlas_add_test( jetMenu
+ SCRIPT test/test_jet_menu.sh
+ PROPERTIES TIMEOUT 500
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_jetMenu
+ )
+
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_fullMenu )
atlas_add_test( fullMenu
SCRIPT test/test_full_menu.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
index 90ccf8fdab16d1a9b044cf46041ae4c5abf52587..2d8cc091f96cc436312ba7ed991fe4bce7c7b621 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
@@ -1,3 +1,6 @@
+#
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#
def jetRecoSequence(inputMakerOut):
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
index 80c4ccc56cf08ba8c2548616bc90eea23cfad2e1..5f3ed3b56b950c34880d38e89a7930f7525bb3e5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
@@ -1,3 +1,6 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
+
from AthenaCommon.Constants import VERBOSE,DEBUG,INFO
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
index e066b59aba4cb93ce18c1dab6cdc212711abf609..6d82efe0c2d27104c9c7e2b25a49b497a45be094 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
@@ -52,6 +52,20 @@ if TriggerFlags.doID==True:
MuonChains += [Chain(name='HLT_2mu6Comb', Seed="L1_MU6", ChainSteps=[step1mufast, step2muComb ])]
+
+# jet chains
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
+from TrigUpgradeTest.jetMenuDefs import jetSequence
+
+jetSeq1 = jetSequence()
+jetstep1=ChainStep("Step1_jet", [jetSeq1])
+
+jetChains = [
+ Chain(name='HLT_j85', Seed="L1_J20", ChainSteps=[jetstep1] ),
+ Chain(name='HLT_j100', Seed="L1_J20", ChainSteps=[jetstep1] )
+ ]
+
+
# combo chains
comboChains= []
comboStep=ChainStep("Step1_mufast_et", [fastCaloStep,muFastStep])
@@ -59,7 +73,7 @@ comboChains += [Chain(name='HLT_e3_etcut_mu6', Seed="L1_EM8I_MU10", ChainSteps
# sum all
-testChains = egammaChains + MuonChains+ comboChains
+testChains = egammaChains + MuonChains + jetChains + comboChains
#################################
@@ -78,11 +92,15 @@ if globalflags.InputFormat.is_bytestream():
for unpack in topSequence.L1DecoderTest.roiUnpackers:
if unpack.name() is "EMRoIsUnpackingTool":
unpack.Decisions="L1EM"
- emUnpacker=unpack
+
if unpack.name() is "MURoIsUnpackingTool":
unpack.Decisions="L1MU"
- muUnpacker=unpack
-
+
+ if unpack.name() is "JRoIsUnpackingTool":
+# unpack.Decisions="L1J"
+ unpack.FSDecisions="L1J"
+
+
for unpack in topSequence.L1DecoderTest.rerunRoiUnpackers:
if unpack.name() is "EMRerunRoIsUnpackingTool":
unpack.Decisions="RerunL1EM"
@@ -96,18 +114,6 @@ for unpack in topSequence.L1DecoderTest.rerunRoiUnpackers:
EnabledChainNamesToCTP = dict([ (c.name, c.seed) for c in testChains])
topSequence.L1DecoderTest.ChainToCTPMapping = EnabledChainNamesToCTP
-# EnabledElChains= [c.seed.strip().split("_")[1] +" : "+ c.name for c in egammaChains]
-# EnabledMuChains= [c.seed.strip().split("_")[1] +" : "+ c.name for c in MuonChains]
-# for c in comboChains:
-# seeds=c.seed.split("_")
-# seeds.pop(0) #remove first L1 string
-# for s in seeds:
-# if "MU" in s: EnabledMuComboChains.append(s +" : "+ c.name)
-# if "EM" in s: EnabledElComboChains.append(s +" : "+ c.name)
-
-# muUnpacker.ThresholdToChainMapping = EnabledMuChains + EnabledMuComboChains
-# emUnpacker.ThresholdToChainMapping = EnabledElChains + EnabledElComboChains
-#topSequence.L1DecoderTest.prescaler.Prescales = ["HLT_e3_etcut:2", "HLT_2e3_etcut:2.5"]
##########################################
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/jet.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/jet.menu.py
index 58624090548d781ed3e52bf100b8a5fccdb79d7a..40ba44a7387581c3f363ba3a68109a82b72f3e43 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/jet.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/jet.menu.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
#
# import flags
@@ -12,10 +12,11 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
from TrigUpgradeTest.jetMenuDefs import jetSequence
jetSeq1 = jetSequence()
-
step1=ChainStep("Step1_jet", [jetSeq1])
+
testChains = [
- Chain(name='HLT_j85', Seed="L1_J20", ChainSteps=[step1] )
+ Chain(name='HLT_j85', Seed="L1_J20", ChainSteps=[step1] ),
+ Chain(name='HLT_j100', Seed="L1_J20", ChainSteps=[step1] )
]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py b/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py
index 404382e152111a2fd06b2e18dbade0d8d3f465db..0fc007edc977300c7d55559b7d05261e1079b941 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
#
include("TrigUpgradeTest/testHLT_MT.py")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuChains.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuChains.py
index 9153c0650e528b4cb3c45c4f3179611a4ec5cf68..27f03267caf03b946dcf3aea3ca00f3acf4f2576 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuChains.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuChains.py
@@ -1,24 +1,28 @@
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#
+
## chain name, HypoTool confname (for combined chains there is more than one)
-ChainDictionary ={ 'HLT_e8' : ['HLT_e8'],
- 'HLT_e20' : ['HLT_e20'],
- 'HLT_mu6' : ['HLT_mu6'],
- 'HLT_mu6Comb' : ['HLT_mu6'],
- 'HLT_mu6fast' : ['HLT_mu6'],
- 'HLT_mu8' : ['HLT_mu8'],
- 'HLT_mu81step': ['HLT_mu8'],
- 'HLT_mu20' : ['HLT_mu20'],
- 'HLT_2mu6' : ['HLT_2mu6'], # review double object
- 'HLT_2mu6Comb' : ['HLT_2mu6'], # review double object
- 'HLT_mu8_e8' : ['HLT_mu8','HLT_e8'],
- 'HLT_e3_etcut': ['HLT_e3_etcut'],
+ChainDictionary ={ 'HLT_e8' : ['HLT_e8'],
+ 'HLT_e20' : ['HLT_e20'],
+ 'HLT_mu6' : ['HLT_mu6'],
+ 'HLT_mu6Comb' : ['HLT_mu6'],
+ 'HLT_mu6fast' : ['HLT_mu6'],
+ 'HLT_mu8' : ['HLT_mu8'],
+ 'HLT_mu81step' : ['HLT_mu8'],
+ 'HLT_mu20' : ['HLT_mu20'],
+ 'HLT_2mu6' : ['HLT_2mu6'], # review double object
+ 'HLT_2mu6Comb' : ['HLT_2mu6'], # review double object
+ 'HLT_mu8_e8' : ['HLT_mu8','HLT_e8'],
+ 'HLT_e3_etcut' : ['HLT_e3_etcut'],
'HLT_e3_etcut1step': ['HLT_e3_etcut'],
- 'HLT_e5_etcut': ['HLT_e5_etcut'],
- 'HLT_e7_etcut': ['HLT_e7_etcut'],
- 'HLT_mu6_e3_etcut': ['HLT_mu6', 'HLT_e3_etcut'],
- 'HLT_e3_etcut_mu6': ['HLT_e3_etcut', 'HLT_mu6'],
- 'HLT_g5_etcut' : ['HLT_g5_etcut'],
- 'HLT_j85' : ['HLT_j85']
+ 'HLT_e5_etcut' : ['HLT_e5_etcut'],
+ 'HLT_e7_etcut' : ['HLT_e7_etcut'],
+ 'HLT_mu6_e3_etcut' : ['HLT_mu6', 'HLT_e3_etcut'],
+ 'HLT_e3_etcut_mu6' : ['HLT_e3_etcut', 'HLT_mu6'],
+ 'HLT_g5_etcut' : ['HLT_g5_etcut'],
+ 'HLT_j85' : ['HLT_j85'],
+ 'HLT_j100' : ['HLT_j100']
}