From 716b328fe0dd05dc5b113c87e4880d3ba1b10b15 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Thu, 13 Jul 2017 19:14:24 +0200
Subject: [PATCH] Adapted to new location of CFElements
---
.../AthenaCommon}/python/CFElements.py | 0
Trigger/TrigValidation/TrigUpgradeTest/share/HLTCF.py | 2 +-
Trigger/TrigValidation/TrigUpgradeTest/share/L1CF.py | 2 +-
Trigger/TrigValidation/TrigUpgradeTest/share/mergeTest.py | 2 ++
4 files changed, 4 insertions(+), 2 deletions(-)
rename {Trigger/TrigValidation/TrigUpgradeTest => Control/AthenaCommon}/python/CFElements.py (100%)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/CFElements.py b/Control/AthenaCommon/python/CFElements.py
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/CFElements.py
rename to Control/AthenaCommon/python/CFElements.py
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/HLTCF.py b/Trigger/TrigValidation/TrigUpgradeTest/share/HLTCF.py
index 0094544c330..7ffe31beca6 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/HLTCF.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/HLTCF.py
@@ -1,4 +1,4 @@
-from TrigUpgradeTest.CFElements import *
+from AthenaCommon.CFElements import parOR, seqAND
allAlgs={}
def useExisting(name):
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/L1CF.py b/Trigger/TrigValidation/TrigUpgradeTest/share/L1CF.py
index e0e800016bf..67a10d223a8 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/L1CF.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/L1CF.py
@@ -1,7 +1,7 @@
from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
topSequence = AlgSequence()
-from TrigUpgradeTest.CFElements import *
+from AthenaCommon.CFElements import parOR, seqAND
TopHLTSeq = seqAND("TopHLTSeq")
topSequence += TopHLTSeq
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/mergeTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/mergeTest.py
index 2b678960070..a024c111929 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/mergeTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/mergeTest.py
@@ -88,6 +88,8 @@ allRoITrk = reco("allRoITrk", Output="TrigTracks", FileName="noreco.dat", Input=
# the seq of merger & tracking shoudl be enabled by any of the filter
stepNo += 1
+from AthenaCommon.CFElements import stepSeq
+
steps[stepNo] += stepSeq("emtrk", useExisting( "Step0EM" ), [ trkInputMerger, allRoITrk ] )
steps[stepNo] += stepSeq("mutrk", useExisting( "Step0MU" ), [ trkInputMerger, allRoITrk ] )
steps[stepNo] += stepSeq("muetrk", useExisting( "Step0MU_E" ), [ trkInputMerger, allRoITrk ] )
--
GitLab