From 363ec14916059bcf30a49b98c296529ea78d1d9f Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Fri, 23 Feb 2018 17:00:44 +0100
Subject: [PATCH] Move FTF out of main ID setup: different muon/electron
configurations
Former-commit-id: 4dc3792920f62a66577c5bf269b60a825652f5fb
---
.../TrigValidation/TrigUpgradeTest/python/InDetSetup.py | 6 ------
Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py | 7 +++++++
.../TrigUpgradeTest/share/egamma.withViews.py | 6 ++++++
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
index ab4feb4b4aa..0d16e41891b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
@@ -212,12 +212,6 @@ def makeInDetAlgs():
viewAlgs.append(InDetSiTrackerSpacePointFinder)
- from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
-
- TrigFastTrackFinder_eGamma.isRoI_Seeded = True
- TrigFastTrackFinder_eGamma.RoIs = "EMViewRoIs"
- viewAlgs.append(TrigFastTrackFinder_eGamma())
-
from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool
from TrigInDetConf.TrigInDetPostTools import InDetTrigParticleCreatorToolFTF
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
index 2c875738ed6..0ddd750f379 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
@@ -59,6 +59,13 @@ if TriggerFlags.doID:
(viewAlgs, eventAlgs) = makeInDetAlgs()
+ from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
+
+ TrigFastTrackFinder_eGamma.isRoI_Seeded = True
+ TrigFastTrackFinder_eGamma.RoIs = "EMViewRoIs"
+ viewAlgs.append(TrigFastTrackFinder_eGamma())
+
+
for eventAlg in eventAlgs:
viewSeq += eventAlg
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index 616382d9263..7a12cbe9185 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -111,6 +111,12 @@ egammaCaloStep = stepSeq("egammaCaloStep", filterL1RoIsAlg, [ fastCaloSequence,
from TrigUpgradeTest.InDetSetup import makeInDetAlgs
(viewAlgs, eventAlgs) = makeInDetAlgs()
+from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
+
+theFTF = TrigFastTrackFinder_eGamma()
+theFTF.isRoI_Seeded = True
+viewAlgs.append(theFTF)
+
# A simple algorithm to confirm that data has been inherited from parent view
# Required to satisfy data dependencies
--
GitLab