From f09aa0352ef08c39a7c9ff24f65cb9da66513006 Mon Sep 17 00:00:00 2001 From: Stewart Martin-Haugh <smh@cern.ch> Date: Thu, 22 Feb 2018 17:41:35 +0100 Subject: [PATCH] Cleanup in preparation for reducing copy-paste --- .../TrigUpgradeTest/share/IDCalo.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py index 5e2db920b99..e28f91bc5d7 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py @@ -42,9 +42,6 @@ if TriggerFlags.doID: from InDetRecExample.InDetJobProperties import InDetFlags InDetFlags.doCaloSeededBrem = False - - - from InDetRecExample.InDetJobProperties import InDetFlags InDetFlags.InDet25nsec = True InDetFlags.doPrimaryVertex3DFinding = False InDetFlags.doPrintConfigurables = False @@ -243,18 +240,19 @@ if TriggerFlags.doID: ProcessPixels = DetFlags.haveRIO.pixel_on(), ProcessSCTs = DetFlags.haveRIO.SCT_on(), ProcessOverlaps = DetFlags.haveRIO.SCT_on(), + SpacePointCacheSCT = InDetCacheCreatorTrigViews.SpacePointCacheSCT, + SpacePointCachePix = InDetCacheCreatorTrigViews.SpacePointCachePix, OutputLevel=INFO) + + allViewAlgorithms += InDetSiTrackerSpacePointFinder from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma theFTF = TrigFastTrackFinder_eGamma() - allViewAlgorithms += InDetSiTrackerSpacePointFinder + TrigFastTrackFinder_eGamma.isRoI_Seeded = True + TrigFastTrackFinder_eGamma.RoIs = "EMViewRoIs" allViewAlgorithms += theFTF - allViewAlgorithms.TrigFastTrackFinder_eGamma.isRoI_Seeded = True - allViewAlgorithms.TrigFastTrackFinder_eGamma.RoIs = "EMViewRoIs" - InDetSiTrackerSpacePointFinder.SpacePointCacheSCT = InDetCacheCreatorTrigViews.SpacePointCacheSCT - InDetSiTrackerSpacePointFinder.SpacePointCachePix = InDetCacheCreatorTrigViews.SpacePointCachePix if TriggerFlags.doCalo: svcMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection=False @@ -262,7 +260,6 @@ if TriggerFlags.doCalo: from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_FastAlgo algo=T2CaloEgamma_FastAlgo("testFastAlgo") algo.OutputLevel=VERBOSE - #TopHLTSeq += algo algo.RoIs="EMViewRoIs" allViewAlgorithms += algo -- GitLab