diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/ConfiguredNewTrackingTrigCuts.py index 9986c256086ee14675091b07c79f14c4b186ad02..2c6918e0958b53963da18b392be8def5f9211dc1 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 d278609556f4de61a0ce3702bbba5644f34d0411..44ac92d384b07a8b740bcd94d5abd981fb11d724 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 2a796260b1baf328fbb43e6ee29819953462bd7c..ce703aead8b847b6bc47b56b3a812343b25f56a4 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 4676ea419d85ca4925e4c8f23365c7959e4488d7..bc02078b5afa5d558cafc889de0646d4f43028b9 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 e0f6897e45b02ef20cdc463ce72f14418c9c2eed..6477c5e68735c6cea26754c31035da37119ca06c 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 9ac120bc8e3c762cc4624f0321ccf56088af52b0..b7d2fa99f2155ccb72330973e891ad20f459a367 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() ):