From 373427e6ac9c7aa3d8c25e0d2ae2fe70f4fb24cf Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Thu, 27 Feb 2020 12:49:44 +0100
Subject: [PATCH] Adjust InDetTrigRecExample to removal of FTK tools
---
.../python/ConfiguredNewTrackingTrigCuts.py | 1 -
.../InDetTrigRecExample/python/EFIDUtils.py | 2 +-
.../python/InDetTrigConfigRecNewTracking.py | 18 +-----------------
.../python/InDetTrigConfigRecPostProcessing.py | 7 +------
.../python/InDetTrigSliceSettings.py | 2 --
.../python/InDetTrigTrackingCuts.py | 11 -----------
6 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py
index 9986c256086..2c6918e0958 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py
@@ -29,5 +29,4 @@ EFIDTrackingCutsBeamGas = ConfiguredNewTrackingTrigCuts("BeamGas")
EFIDTrackingCutsLowPt = ConfiguredNewTrackingTrigCuts("LowPt")
EFIDTrackingCutsTRT = ConfiguredNewTrackingTrigCuts("TRT")
EFIDTrackingCutsHeavyIon = ConfiguredNewTrackingTrigCuts("HeavyIon")
-FTKTrackingCuts = ConfiguredNewTrackingTrigCuts("FTK")
L2IDTrackingCuts = EFIDTrackingCuts
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/EFIDUtils.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/EFIDUtils.py
index d278609556f..44ac92d384b 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/EFIDUtils.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/EFIDUtils.py
@@ -67,7 +67,7 @@ def debuglevel(level=2):
steeringEF = job.TrigSteer_HLT
steeringEF.OutputLevel=level
import re
- exp=re.compile("EFID|FTF|IDTrig|FTK|L2ID")
+ exp=re.compile("EFID|FTF|IDTrig|L2ID")
pokus=None
reftoconf=list()
reftoname=list()
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecNewTracking.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecNewTracking.py
index 2a796260b1b..ce703aead8b 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecNewTracking.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecNewTracking.py
@@ -12,7 +12,7 @@ from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
from InDetTrigRecExample.ConfiguredNewTrackingTrigCuts import \
EFIDTrackingCuts,EFIDTrackingCutsCosmics,EFIDTrackingCutsBeamGas, \
- EFIDTrackingCutsHeavyIon, FTKTrackingCuts
+ EFIDTrackingCutsHeavyIon
InDetTrigCutValues = EFIDTrackingCuts
from AthenaCommon.Logging import logging
@@ -260,9 +260,6 @@ class TrigAmbiguitySolver_EF( InDet__InDetTrigAmbiguitySolver ):
super(InDet__InDetTrigAmbiguitySolver , self ).__init__( name )
slice = type
- if name.find('FTK')>-1:
- slice = 'FTK'
-
from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigPrdAssociationTool, \
InDetTrigTrackFitter, InDetTrigExtrapolator, InDetTrigTrackSummaryTool, \
@@ -312,13 +309,6 @@ class TrigAmbiguitySolver_EF( InDet__InDetTrigAmbiguitySolver ):
InDetTrigScoringTool.maxSiHoles = EFIDTrackingCutsBeamGas.maxHoles()
InDetTrigScoringTool.useTRT_AmbigFcn= False
InDetTrigScoringTool.useSigmaChi2 = True
-
- if slice=='FTK' or slice=='FTKRefit' or slice=='FTKMon':
- InDetTrigScoringTool.minSiClusters = FTKTrackingCuts.minClusters()
- InDetTrigScoringTool.maxSiHoles = FTKTrackingCuts.maxHoles()
- InDetTrigScoringTool.maxPixelHoles = FTKTrackingCuts.maxPixelHoles()
- InDetTrigScoringTool.maxSCTHoles = FTKTrackingCuts.maxSCTHoles()
- InDetTrigScoringTool.maxDoubleHoles = FTKTrackingCuts.maxDoubleHoles()
#
ToolSvc += InDetTrigScoringTool
@@ -365,12 +355,6 @@ class TrigAmbiguitySolver_EF( InDet__InDetTrigAmbiguitySolver ):
InDetTrigAmbiguityProcessor.tryBremFit = True
import AthenaCommon.SystemOfUnits as Units
InDetTrigAmbiguityProcessor.pTminBrem = 5 * Units.GeV
- elif slice=='FTK' or slice=='FTKRefit' or slice=='FTKMon':
- from TrigInDetConf.TrigInDetRecToolsFTK import InDetTrigAmbiTrackSelectionToolFTK,InDetTrigTrackFitterFTK
- InDetTrigAmbiguityProcessor.SelectionTool = InDetTrigAmbiTrackSelectionToolFTK
- InDetTrigAmbiguityProcessor.Fitter=InDetTrigTrackFitterFTK
- InDetTrigAmbiguityProcessor.SuppressHoleSearch=True # Hole search makes no sense for FTK tracks as they are limited to 12 hits
- #InDetTrigAmbiguityProcessor.RefitPrds =
if InDetTrigFlags.materialInteractions() and InDetTrigFlags.solenoidOn():
InDetTrigAmbiguityProcessor.MatEffects = 3
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPostProcessing.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPostProcessing.py
index 4676ea419d8..bc02078b5af 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPostProcessing.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPostProcessing.py
@@ -186,7 +186,6 @@ class TrigVxPrimaryAllTESG_EF( InDet__TrigVxPrimaryAllTE ):
self.VertexFinderTool = InDetTrigPriVxFinderTool
self.RunWithoutField = False
self.RetrieveTracksFromSG = True
- self.TrackCollectionFromSG = "FTKConv_Trk_Tracks";
#monitoring
from InDetTrigPriVxFinder.InDetTrigPriVxFinderMonitoring import InDetTrigPriVxFinderValidationMonitor
@@ -274,7 +273,7 @@ class InDetTrigTrackingxAODCnv_EF( InDet__TrigTrackingxAODCnv ):
self.PRDToTrackMapExchange = InDetTrigPRDtoTrackMapExchangeTool
- if "_FTF" in name or "_FTK" in name:
+ if "_FTF" in name:
creatorTool = InDetTrigParticleCreatorToolFTF
elif "_IDTrig" in name and type=="electron":
creatorTool = InDetTrigParticleCreatorToolWithSummaryTRTPid
@@ -284,10 +283,6 @@ class InDetTrigTrackingxAODCnv_EF( InDet__TrigTrackingxAODCnv ):
if "_IDTrig" in name and (type=="muon" or type=="electron"):
self.doIBLresidual = True
- #for FTK commissioning
- if "_FTK" in name:
- self.doIBLresidual = True
-
#monitoring
self.MonSliceSpecific = True
from InDetTrigRecExample.InDetTrigSliceSettings import InDetTrigSliceSettings
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py
index e0f6897e45b..6477c5e6873 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigSliceSettings.py
@@ -38,7 +38,6 @@ class InDetTrigSliceSettingsDB:
'tauCore', 'tauIso',
'beamSpot', 'cosmics',
'bjetVtx',
- 'FTK', 'FTKRefit', 'FTKMon',
'bphysHighPt'
]
@@ -108,7 +107,6 @@ class InDetTrigSliceSettingsDB:
for i in _slices:
doresmon[i] = False
doresmon['muon'] = True
- doresmon['FTKMon'] = True
self.db['doResMon']=doresmon
for i in _slices:
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigTrackingCuts.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigTrackingCuts.py
index 9ac120bc8e3..b7d2fa99f21 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigTrackingCuts.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigTrackingCuts.py
@@ -216,17 +216,6 @@ class InDetTrigTrackingCuts :
#self.__Xi2maxNoAdd = 35.0
self.__nWeightedClustersMin = self.__minClusters-1
- if mode == "FTK":
- self.__extension = "FTK"
- # --- cluster cuts
- #self.__minClusters = 9
- #self.__minSiNotShared = 8
- #self.__maxShared = 5
- self.__maxHoles = 4
- self.__maxPixelHoles = 2
- self.__maxSctHoles = 4
- self.__maxDoubleHoles = 2
-
# --- changes for Pixel/SCT segments
from AthenaCommon.DetFlags import DetFlags
if ( DetFlags.haveRIO.pixel_on() and not DetFlags.haveRIO.SCT_on() ):
--
GitLab