From 38e4aafa0cd449e497ac5604fc22a07643f21d66 Mon Sep 17 00:00:00 2001
From: Francesca Pastore <francesca.pastore@cern.ch>
Date: Fri, 14 Jun 2019 10:53:16 +0200
Subject: [PATCH] some cleanup; removed inDetSetup file in TUT; renamed jetDef
in TUT
---
.../TrigUpgradeTest/python/InDetSetup.py | 7 ----
.../TrigUpgradeTest/python/jetMenuDefs.py | 34 -------------------
.../TrigUpgradeTest/share/IDCalo.py | 3 +-
.../TrigUpgradeTest/share/MinBias.py | 3 --
.../TrigUpgradeTest/share/bjet_menu_ALLTE.py | 2 --
.../TrigUpgradeTest/share/dataScoutingTest.py | 4 +--
.../TrigUpgradeTest/share/egamma.withViews.py | 2 --
.../TrigUpgradeTest/share/full_menu_cf.py | 7 +---
.../TrigUpgradeTest/share/mu.withViews.py | 2 --
.../TrigUpgradeTest/share/pebTest.py | 4 +--
.../TrigUpgradeTest/share/testHLT_MT.py | 10 +++++-
.../HLTMenuConfig/Bjet/BjetSequenceSetup.py | 4 +--
.../CommonSequences/CaloSequenceSetup.py | 4 ---
.../HLTMenuConfig/Egamma/ElectronDef.py | 2 --
.../Egamma/ElectronSequenceSetup.py | 3 --
.../python/HLTMenuConfig/Muon/MuonDef.py | 4 +--
.../python/HLTMenuConfig/Muon/MuonSetup.py | 4 +--
.../Tau/TauChainConfiguration.py | 4 ---
18 files changed, 17 insertions(+), 86 deletions(-)
delete mode 100644 Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
delete mode 100644 Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
deleted file mode 100644
index fa3274cfdff..00000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
+++ /dev/null
@@ -1,7 +0,0 @@
-def inDetSetup():
- from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
- InDetTrigFlags.doPixelClusterSplitting = False
-
- # PixelLorentzAngleSvc and SCTLorentzAngleSvc
- from AthenaCommon.Include import include
- include("InDetRecExample/InDetRecConditionsAccess.py")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
deleted file mode 100644
index 4755614ff44..00000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-#
-
-from TriggerMenuMT.HLTMenuConfig.Jet.JetMenuSequences import jetMenuSequence, jetRecoSequence
-
-def jetDictFromString(jet_def_string):
- """ Function to retrieve the jet dictionaory from string"""
-
- # Translate the definition string into an approximation
- # of the "recoParts" in the jet chainParts.
- jetRecoDict = {}
- # Insert values from string
- # Python names are more descriptive. May want to sync
- # these names with the SignatureDict, needs coordination with
- # menu group when they start to implement this
- jetalg, inputtype, clusterscale, jetcalib = jet_def_string.split('_')
- jetRecoDict = {
- "recoAlg": jetalg,
- "dataType": inputtype,
- "calib": clusterscale,
- "jetCalib": jetcalib
- }
- return jetRecoDict
-
-def jetRecoSequenceFromString(jet_def_string):
- """ Function to retrieve jet Reco sequence from string"""
- jetRecoDict=jetDictFromString(jet_def_string)
- return jetRecoSequence(None,**jetRecoDict)
-
-
-def jetMenuSequenceFromString(jet_def_string):
- """ Function to retrieve jet menu sequence from string"""
- jetRecoDict=jetDictFromString(jet_def_string)
- return jetMenuSequence(None,**jetRecoDict) # First arg dummy flags for RecoFragmentsPool
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
index f182c1e6fe9..b2572216d40 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
@@ -30,8 +30,7 @@ allViewAlgorithms = AthSequencer(viewNodeName, Sequential=False, ModeOR=False, S
if TriggerFlags.doID:
- from TrigUpgradeTest.InDetSetup import inDetSetup
- inDetSetup()
+
from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
(viewAlgs, eventAlgs) = makeInDetAlgs()
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/MinBias.py b/Trigger/TrigValidation/TrigUpgradeTest/share/MinBias.py
index 1f533d87116..ed7b396ed16 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/MinBias.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/MinBias.py
@@ -4,9 +4,6 @@
include("TrigUpgradeTest/testHLT_MT.py")
-from TrigUpgradeTest.InDetSetup import inDetSetup
-inDetSetup()
-
from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
eventAlgs,viewAlgs = makeInDetAlgs(whichSignature='FS', separateTrackParticleCreator='MinBias')
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/bjet_menu_ALLTE.py b/Trigger/TrigValidation/TrigUpgradeTest/share/bjet_menu_ALLTE.py
index 600e4b6e5da..152d73a471f 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/bjet_menu_ALLTE.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/bjet_menu_ALLTE.py
@@ -12,9 +12,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
# We should retrieve all the steps here
from TriggerMenuMT.HLTMenuConfig.Bjet.BjetSequenceSetup import getBJetSequence
-from TrigUpgradeTest.InDetSetup import inDetSetup
-inDetSetup()
step1 = ChainStep("Step1ALLTE_bjet", [getBJetSequence('jALLTE')])
step2 = ChainStep("Step2ALLTE_bjet", [getBJetSequence('gscALLTE')])
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
index f6db3e91d64..d83c0c8b2fe 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
@@ -32,9 +32,7 @@ AllowedEventBuildingIdentifiers.extend(['dataScoutingElectronTest','pebtestthree
if (doElectron):
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence
- from TrigUpgradeTest.InDetSetup import inDetSetup
-
- inDetSetup()
+
fastCaloStep= fastCaloMenuSequence("Ele")
electronStep= electronMenuSequence()
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index d001b36f02e..e150a66b3b1 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -8,8 +8,6 @@ include("TrigUpgradeTest/testHLT_MT.py")
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
-from TrigUpgradeTest.InDetSetup import inDetSetup
-inDetSetup()
CTPToChainMapping = {"HLT_e3_etcut": "L1_EM3",
"HLT_e5_etcut": "L1_EM3",
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
index 47c3ad9bd43..aced43adb57 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
@@ -28,11 +28,6 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep, Re
testChains = []
-
-
-#from TrigUpgradeTest.InDetSetup import inDetSetup
-#inDetSetup()
-
##################################################################
# egamma chains
@@ -134,7 +129,7 @@ if opt.doMuonSlice == True:
# jet chains
##################################################################
if opt.doJetSlice == True:
- from TrigUpgradeTest.jetMenuDefs import jetMenuSequenceFromString
+ from TrigUpgradeTest.jetMenuHelper import jetMenuSequenceFromString
# small-R jets, different calibrations
jetSeq_a4_tc_em = jetMenuSequenceFromString("a4_tc_em_subjesIS")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
index 1191b356a44..5a616b45316 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
@@ -73,8 +73,6 @@ def __mon(finalCollName, stepColls=[]):
# Setup the standard muon chain
# ===============================================================================================
-from TrigUpgradeTest.InDetSetup import inDetSetup
-inDetSetup()
### Load data from Muon detectors ###
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
index e39ef6110a2..c1b0feccb5d 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
@@ -32,9 +32,7 @@ AllowedEventBuildingIdentifiers.extend(['pebtestfour','pebtestfive'])
if (doElectron):
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence
- from TrigUpgradeTest.InDetSetup import inDetSetup
-
- inDetSetup()
+
fastCaloStep= fastCaloMenuSequence("Ele")
electronStep= electronMenuSequence()
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
index 7a39cc42c35..288ff2b54c5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
@@ -79,7 +79,6 @@ if opt.doEmptyMenu == True:
else:
for s in slices:
setattr(opt, s, True)
-# opt.doBjetSlice=False #Wait for ATR-19439
opt.doTauSlice =False #Wait for ATR-17399
# Setting the TriggerFlags.XXXSlice to use in TriggerMenuMT
@@ -385,6 +384,15 @@ if opt.doL1Unpacking:
topSequence += L1EmulationTest()
+if TriggerFlags.doID:
+ from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
+ InDetTrigFlags.doPixelClusterSplitting = False
+
+ # PixelLorentzAngleSvc and SCTLorentzAngleSvc
+ from AthenaCommon.Include import include
+ include("InDetRecExample/InDetRecConditionsAccess.py")
+
+
# ---------------------------------------------------------------
# Monitoring
# ---------------------------------------------------------------
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index 2fa2136600a..04846f7596b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -30,7 +30,7 @@ def getBJetSequence( step ):
def bJetStep1Sequence():
- from TrigUpgradeTest.jetMenuDefs import jetRecoSequenceFromString
+ from TrigUpgradeTest.jetMenuHelper import jetRecoSequenceFromString
(recoSequence, InputMakerAlg, sequenceOut) = jetRecoSequenceFromString("a4_tc_em_subjes")
@@ -96,7 +96,7 @@ def bJetStep1Sequence():
def bJetStep1SequenceALLTE():
# Construct jets
- from TrigUpgradeTest.jetMenuDefs import jetRecoSequenceFromString
+ from TrigUpgradeTest.jetMenuHelper import jetRecoSequenceFromString
#from TrigUpgradeTest.jetDefs import jetAthSequence
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
index 858e1205310..f49223fa895 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
@@ -23,10 +23,6 @@ def fastCaloSequence(ConfigFlags):
from TrigT2CaloCommon.CaloDef import fastCaloRecoSequence
(fastCaloInViewSequence, sequenceOut) = fastCaloRecoSequence(InViewRoIs)
- # FPP
- import AthenaCommon.CfgMgr as CfgMgr
- fastCaloInViewSequence += CfgMgr.AthViews__ViewTestAlg("view_testFastCalo1")
-
# connect EVC and reco
fastCaloSequence = seqAND("fastCaloSequence", [fastCaloViewsMaker, fastCaloInViewSequence ])
return (fastCaloSequence, fastCaloViewsMaker, sequenceOut)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 2f1982f25f6..63b8ce043df 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -11,7 +11,6 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, RecoFragm
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import fastElectronMenuSequence
-from TrigUpgradeTest.InDetSetup import inDetSetup
from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precisionCaloMenuSequence
#----------------------------------------------------------------
@@ -23,7 +22,6 @@ def electronFastCaloCfg( flags ):
return fastCaloMenuSequence("ElectronFastCalo")
def fastElectronSequenceCfg( flags ):
- inDetSetup()
return fastElectronMenuSequence()
def precisionCaloSequenceCfg( flags ):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
index f7a576a3a90..e78adeea245 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
@@ -63,9 +63,6 @@ def fastElectronSequence(ConfigFlags):
electronInViewAlgs = parOR("electronInViewAlgs", viewAlgs + [ theElectronFex ])
l2ElectronViewsMaker.ViewNodeName = "electronInViewAlgs"
- # to debug the vView content
- electronInViewAlgs += CfgMgr.AthViews__ViewTestAlg("view_testElectron1")
-
electronAthSequence = seqAND("electronAthSequence", eventAlgs + [l2ElectronViewsMaker, electronInViewAlgs ] )
return (electronAthSequence, l2ElectronViewsMaker, theElectronFex.ElectronsName)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
index ef73e545bac..0c78362c4a0 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
@@ -14,7 +14,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep
from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence, muCombSequence, muEFMSSequence, muEFSASequence, muIsoSequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence, muEFIsoSequence, muEFInsideOutSequence
-#from TrigUpgradeTest.InDetSetup import inDetSetup
+
#--------------------------------------------------------
# fragments generating config will be functions in new JO
@@ -80,8 +80,6 @@ class MuonChainConfiguration(ChainConfigurationBase):
def getStepDictionary(self):
- # Calling inDetSetup here
-# inDetSetup()
# --------------------
# define here the names of the steps and obtain the chainStep configuration
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index ea39479c354..f8fc79d01dc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -354,7 +354,7 @@ def muonIDFastTrackingSequence( RoIs ):
### and Define EventViewNodes to run the algorithms ###
from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
(viewAlgs, eventAlgs) = makeInDetAlgs("Muon")
- #(viewAlgs, eventAlgs) = makeInDetAlgs(separateTrackParticleCreator="_Muon")
+
from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_Muon
theFTF_Muon = TrigFastTrackFinder_Muon()
@@ -637,8 +637,6 @@ def muEFCBRecoSequence( RoIs, name ):
muEFCBRecoSequence += PTSeq
- # to debug the View content
- muEFCBRecoSequence += CfgMgr.AthViews__ViewTestAlg("view_testMuon")
#Default from FTF
#trackParticles = "xAODTracks"
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
index 7f503dc587e..c4275fd14d6 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
@@ -14,7 +14,6 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep
from TriggerMenuMT.HLTMenuConfig.Tau.TauMenuSequences import tauCaloMenuSequence, tauCoreTrackSequence, tauPrecisionSequence
-from TrigUpgradeTest.InDetSetup import inDetSetup
#--------------------------------------------------------
# fragments generating config will be functions in new JO
@@ -44,9 +43,6 @@ class TauChainConfiguration(ChainConfigurationBase):
chainSteps = []
log.debug("Assembling chain for " + self.chainName)
- # Calling inDetSetup here
- inDetSetup()
-
# --------------------
# define here the names of the steps and obtain the chainStep configuration
# --------------------
--
GitLab