From 2ad98e0d366d76305d583d7e52f0718f37e691f5 Mon Sep 17 00:00:00 2001
From: Gabriel Gallardo <gabriel.gallardo@cern.ch>
Date: Fri, 29 Mar 2019 12:38:01 +0000
Subject: [PATCH] MET Trigger: Move MET files to TriggerMenuMT
---
.../TrigUpgradeTest/share/fullMenu.py | 2 +-
.../TrigUpgradeTest/share/met.menu.py | 2 +-
.../TrigUpgradeTest/share/met.seq.test.py | 2 +-
.../python/HLTMenuConfig/MET/__init__.py | 2 ++
.../python/HLTMenuConfig/MET}/metDefs.py | 13 ++++---------
.../python/HLTMenuConfig/MET}/metMenuDefs.py | 15 +++++++--------
6 files changed, 16 insertions(+), 20 deletions(-)
create mode 100644 Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/__init__.py
rename Trigger/{TrigValidation/TrigUpgradeTest/python => TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET}/metDefs.py (95%)
rename Trigger/{TrigValidation/TrigUpgradeTest/python => TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET}/metMenuDefs.py (81%)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
index 49fa2a6d9ed7..7197498276b3 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
@@ -158,7 +158,7 @@ if (doTau):
# MET chains
##################################################################
if (doMET):
- from TrigUpgradeTest.metMenuDefs import metCellMenuSequence
+ from TriggerMenuMT.HLTMenuConfig.MET.metMenuDefs import metCellMenuSequence
metCellSeq = metCellMenuSequence()
metCellStep = ChainStep("Step1_met_cell", [metCellSeq])
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/met.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/met.menu.py
index 07534b576b7e..a421f67a5492 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/met.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/met.menu.py
@@ -11,7 +11,7 @@ include("TrigUpgradeTest/testHLT_MT.py")
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
-from TrigUpgradeTest.metMenuDefs import metCellMenuSequence, metJetMenuSequence
+from TriggerMenuMT.HLTMenuConfig.MET.metMenuDefs import metCellMenuSequence, metJetMenuSequence
metCellSeq = metCellMenuSequence()
metCellStep = ChainStep("Step1_met_cell", [metCellSeq])
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/met.seq.test.py b/Trigger/TrigValidation/TrigUpgradeTest/share/met.seq.test.py
index abcae5a40a2f..1bebc0b87607 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/met.seq.test.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/met.seq.test.py
@@ -22,7 +22,7 @@ InputMakerAlg.InputMakerInputDecisions=["L1MET"]
InputMakerAlg.InputMakerOutputDecisions=["InputMaker_from_L1MET"]
topSequence += InputMakerAlg
-from TrigUpgradeTest.metDefs import metCellRecoSequence
+from TriggerMenuMT.HLTMenuConfig.MET.metDefs import metCellRecoSequence
cellRecoSeq, METkey = metCellRecoSequence(InputMakerAlg.RoIs)
topSequence += cellRecoSeq
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/__init__.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/__init__.py
new file mode 100644
index 000000000000..91873a08bc5a
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/__init__.py
@@ -0,0 +1,2 @@
+#Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/metDefs.py
similarity index 95%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/metDefs.py
index 4ea7c2e23854..c63c12c85499 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/metDefs.py
@@ -6,16 +6,11 @@
#################################################
# Useful imports
#################################################
-from AthenaCommon.Constants import VERBOSE,DEBUG,INFO,WARNING
-
-from math import pi
+from AthenaCommon.Constants import WARNING
from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.Constants import VERBOSE,DEBUG,INFO
-from AthenaCommon.CFElements import parOR, seqAND, seqOR, stepSeq
+from AthenaCommon.CFElements import seqAND
def metCellAthSequence(ConfigFlags):
@@ -36,7 +31,7 @@ def metCellRecoSequence():
#################################################
# Add EFMissingETAlg and associated tools
#################################################
- from TrigEFMissingET.TrigEFMissingETConf import EFMissingETAlgMT, EFMissingETFromCellsMT, EFMissingETFromHelper
+ from TrigEFMissingET.TrigEFMissingETConf import EFMissingETAlgMT, EFMissingETFromHelper
metAlg = EFMissingETAlgMT( name="EFMET" )
metAlg.OutputLevel=WARNING
helperTool = EFMissingETFromHelper("theHelperTool")
@@ -98,7 +93,7 @@ def metClusterRecoSequence():
#################################################
# Add EFMissingETAlg and associated tools
#################################################
- from TrigEFMissingET.TrigEFMissingETConf import EFMissingETAlgMT, EFMissingETFromClustersMT, EFMissingETFromHelper
+ from TrigEFMissingET.TrigEFMissingETConf import EFMissingETAlgMT, EFMissingETFromHelper
metAlg = EFMissingETAlgMT( name="EFMET" )
metAlg.OutputLevel=WARNING
helperTool = EFMissingETFromHelper("theHelperTool")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/metMenuDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/metMenuDefs.py
similarity index 81%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/metMenuDefs.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/metMenuDefs.py
index 22a8dccca615..128cc5691192 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/metMenuDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/metMenuDefs.py
@@ -1,19 +1,18 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
-from AthenaCommon.Constants import VERBOSE,DEBUG,INFO,WARNING
+from AthenaCommon.Constants import DEBUG
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
-from AthenaCommon.CFElements import seqAND
from AthenaConfiguration.AllConfigFlags import ConfigFlags
def metCellMenuSequence():
# menu components
# retrieve the reco seuqnece
- from TrigUpgradeTest.metDefs import metCellAthSequence
+ from TriggerMenuMT.HLTMenuConfig.MET.metDefs import metCellAthSequence
(metCellSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(metCellAthSequence,ConfigFlags)
#hypo
- from TrigMissingETHypo.TrigMissingETHypoConfigMT import MissingETHypoAlgMT, TrigMETCellHypoToolFromDict, MissingETHypoToolMT
+ from TrigMissingETHypo.TrigMissingETHypoConfigMT import MissingETHypoAlgMT, TrigMETCellHypoToolFromDict
metHypoAlg = MissingETHypoAlgMT("METHypoAlg")
metHypoAlg.METContainerKey=sequenceOut
@@ -28,11 +27,11 @@ def metCellMenuSequence():
def metClusterMenuSequence():
# menu components
# retrieve the reco seuqnece
- from TrigUpgradeTest.metDefs import metClusterAthSequence
+ from TriggerMenuMT.HLTMenuConfig.MET.metDefs import metClusterAthSequence
(metClusterSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(metClusterAthSequence,ConfigFlags)
#hypo
- from TrigMissingETHypo.TrigMissingETHypoConfigMT import MissingETHypoAlgMT, TrigMETCellHypoToolFromDict, MissingETHypoToolMT
+ from TrigMissingETHypo.TrigMissingETHypoConfigMT import MissingETHypoAlgMT, TrigMETCellHypoToolFromDict
metHypoAlg = MissingETHypoAlgMT("METHypoAlg")
metHypoAlg.METContainerKey=sequenceOut
@@ -45,11 +44,11 @@ def metClusterMenuSequence():
def metJetMenuSequence():
# menu components
# retrieve the reco seuqnece
- from TrigUpgradeTest.metDefs import metJetAthSequence
+ from TriggerMenuMT.HLTMenuConfig.MET.metDefs import metJetAthSequence
(metJetSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(metJetAthSequence,ConfigFlags)
#hypo
- from TrigMissingETHypo.TrigMissingETHypoConfigMT import MissingETHypoAlgMT, TrigMETJetHypoToolFromName, MissingETHypoToolMT
+ from TrigMissingETHypo.TrigMissingETHypoConfigMT import MissingETHypoAlgMT, TrigMETJetHypoToolFromName
metHypoAlg = MissingETHypoAlgMT("METHypoAlg")
metHypoAlg.METContainerKey=sequenceOut
--
GitLab