From 37ed47d00d1f0a7d5863c19d82c1ecd47cbe4db3 Mon Sep 17 00:00:00 2001 From: scott snyder <snyder@bnl.gov> Date: Sun, 30 Jul 2017 03:56:08 +0200 Subject: [PATCH] InDetRecExample: Fix configuration for the case of disabled calo. If calo is disabled, don't try to access calo clusters. Needed to fix ATN tests after InDetAmbiScoringTool was migrated to use varhandles. Former-commit-id: 7c2ce4cb3db2c49970f7741ca31bb0beefdb6921 --- .../InDetRecExample/share/ConfiguredBackTracking.py | 6 +++++- .../InDetRecExample/share/ConfiguredNewTrackingSiPattern.py | 4 +++- .../share/ConfiguredNewTrackingTRTExtension.py | 6 +++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredBackTracking.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredBackTracking.py index 954bbd62ed9..9cfb0b31a11 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredBackTracking.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredBackTracking.py @@ -225,7 +225,11 @@ class ConfiguredBackTracking: usePixel = NewTrackingCuts.usePixel(), useSCT = NewTrackingCuts.useSCT(), minTRTonTrk = NewTrackingCuts.minSecondaryTRTonTrk(), - minTRTPrecisionFraction = NewTrackingCuts.minSecondaryTRTPrecFrac()) + minTRTPrecisionFraction = NewTrackingCuts.minSecondaryTRTPrecFrac(), + doEmCaloSeed = DetFlags.detdescr.Calo_allOn()) + if not InDetTRT_SeededScoringTool.doEmCaloSeed: + InDetTRT_SeededScoringTool.InputEmClusterContainerName = '' + # InDetTRT_SeededScoringTool.OutputLevel = DEBUG ToolSvc += InDetTRT_SeededScoringTool if (InDetFlags.doPrintConfigurables()): diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py index 6fcba2f0104..b8de4decd01 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py @@ -414,9 +414,11 @@ class ConfiguredNewTrackingSiPattern: usePixel = NewTrackingCuts.usePixel(), useSCT = NewTrackingCuts.useSCT(), InputEmClusterContainerName = InDetKeys.CaloClusterROIContainer(), - doEmCaloSeed = True and InDetFlags.doCaloSeededBrem(), + doEmCaloSeed = True and InDetFlags.doCaloSeededBrem() and DetFlags.detdescr.Calo_allOn(), minTRTonTrk = 0, minTRTPrecisionFraction = 0); + if not InDetAmbiScoringTool.doEmCaloSeed: + InDetAmbiScoringTool.InputEmClusterContainerName = '' # allow for some overlap for low-pt tracking #if InDetFlags.doLowPt() and not NewTrackingCuts.mode() == "LowPt": # InDetAmbiScoringTool.minPt = NewTrackingCuts.minPT()-100.*Units.MeV diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingTRTExtension.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingTRTExtension.py index 9bbbb990240..5b23c3eb1fe 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingTRTExtension.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingTRTExtension.py @@ -133,7 +133,11 @@ class ConfiguredNewTrackingTRTExtension: usePixel = NewTrackingCuts.usePixel(), useSCT = NewTrackingCuts.useSCT(), minTRTonTrk = NewTrackingCuts.minTRTonTrk(), - minTRTPrecisionFraction = NewTrackingCuts.minTRTPrecFrac()) + minTRTPrecisionFraction = NewTrackingCuts.minTRTPrecFrac(), + doEmCaloSeed = DetFlags.detdescr.Calo_allOn()) + if not InDetExtenScoringTool.doEmCaloSeed: + InDetExtenScoringTool.InputEmClusterContainerName = '' + if InDetFlags.trackFitterType() in ['KalmanFitter', 'KalmanDNAFitter', 'ReferenceKalmanFitter']: InDetExtenScoringTool.minTRTPrecisionFraction = 0.2 -- GitLab