From ed5616a3fcc748c69157254d35e9d0f937e4a522 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Thu, 8 Aug 2019 13:15:35 +0000
Subject: [PATCH] FTF config fixes
---
.../python/TrigFastTrackFinder_Config.py | 3 +++
.../TrigValidation/TrigUpgradeTest/share/IDCalo.py | 14 ++++----------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 08d2c3137f5..54bfa159446 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -410,6 +410,9 @@ class TrigFastTrackFinder_Cosmic_Monitoring(TrigFastTrackFinder_CommonMonitoring
xbins = 100, xmin=-0.5, xmax=99.5)]
remap = {
+ "FTKRefit" : "FTKRefit",
+ "FTKMon" : "FTKMon",
+ "FTK" : "FTK",
"Muon" : "muon",
"MuonFS" : "muon",
"MuonCore" : "muonCore",
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
index b697da17072..cad219f600b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
@@ -34,21 +34,15 @@ if TriggerFlags.doID:
from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
- (viewAlgs, eventAlgs) = makeInDetAlgs()
-
- from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
-
- theTrigFastTrackFinder_eGamma = TrigFastTrackFinder_eGamma()
- theTrigFastTrackFinder_eGamma.isRoI_Seeded = True
- theTrigFastTrackFinder_eGamma.RoIs = "EMViewRoIs"
- viewAlgs.append(theTrigFastTrackFinder_eGamma)
+ (viewAlgs, eventAlgs) = makeInDetAlgs("FS")
for eventAlg in eventAlgs:
viewSeq += eventAlg
for viewAlg in viewAlgs:
allViewAlgorithms += viewAlg
-
+ if "RoIs" in viewAlg.properties():
+ viewAlg.RoIs = "EMViewRoIs"
#
# --- Ambiguity solver algorithm
@@ -81,7 +75,7 @@ if TriggerFlags.doID:
from TrkAmbiguitySolver.TrkAmbiguitySolverConf import Trk__TrkAmbiguitySolver
InDetTrigMTAmbiguitySolver = Trk__TrkAmbiguitySolver(name = 'InDetTrigMTAmbiguitySolver',
- TrackInput =['TrigFastTrackFinder_Tracks'], #FTF default
+ TrackInput =['TrigFastTrackFinder_Tracks_FS'], #FTF default
TrackOutput = 'AmbiSolver_Tracks' , #Change
AmbiguityProcessor = InDetTrigMTAmbiguityProcessor)
--
GitLab