From 883e31ab4f12ae5455500aff522bbbb2bd84dabe Mon Sep 17 00:00:00 2001
From: tstreble <thomas.strebler@cern.ch>
Date: Fri, 7 Jan 2022 17:58:45 +0100
Subject: [PATCH] Cleaning of InDetFlags #4
---
.../InDetConfig/python/InDetConfigFlags.py | 13 ++++++-------
InnerDetector/InDetConfig/python/TrackRecoConfig.py | 2 +-
.../InDetConfig/python/TrackingCommonConfig.py | 10 +++++-----
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/InnerDetector/InDetConfig/python/InDetConfigFlags.py b/InnerDetector/InDetConfig/python/InDetConfigFlags.py
index f68ae674d0ed..ba817087356e 100644
--- a/InnerDetector/InDetConfig/python/InDetConfigFlags.py
+++ b/InnerDetector/InDetConfig/python/InDetConfigFlags.py
@@ -16,14 +16,17 @@ def createInDetConfigFlags():
### Tracking parameters
+ icf.addFlag("InDet.Tracking.kalmanUpdator", "smatrix") # control which updator to load for KalmanFitter ("None"/"fast"/"smatrix"/"weight"/"amg")
icf.addFlag("InDet.Tracking.doRefit", False) # Turn running of refitting on and off
+ icf.addFlag("InDet.Tracking.propagatorType", "RungeKutta") # control which propagator to use ('RungeKutta'/'STEP')
icf.addFlag("InDet.Tracking.cutLevel", 19) # Control cuts and settings for different lumi to limit CPU and disk space
icf.addFlag("InDet.Tracking.doBremRecovery", True) # Turn on running of Brem Recover in tracking
icf.addFlag("InDet.Tracking.doCaloSeededBrem", True) # Brem Recover in tracking restricted to Calo ROIs
icf.addFlag("InDet.Tracking.doHadCaloSeededSSS", False) # Use Recover SSS to Calo ROIs
icf.addFlag("InDet.Tracking.doCaloSeededAmbi", lambda prevFlags: prevFlags.Detector.EnableCalo) # Use Calo ROIs to seed specific cuts for the ambi
- icf.addFlag("InDet.Tracking.doBeamHalo", False) # Turn running of BeamHalo second pass on and off
-
+ icf.addFlag("InDet.Tracking.doBeamHalo", False) # Turn running of BeamHalo second pass on and off / Which second pass?
+ icf.addFlag("InDet.Tracking.useBeamSpotInfoNN", True) # use beam spot position in pixel NN
+ icf.addFlag("InDet.Tracking.nnCutLargeD0Threshold", -1.0) # Enable check for dead modules and FEs
### Tracking passes/configurations scheduled
@@ -32,7 +35,7 @@ def createInDetConfigFlags():
icf.addFlag("InDet.Tracking.doTrackSegmentsTRT", False) # Turn running of track segment creation in TRT on and off
icf.addFlag("InDet.Tracking.doHighPileup", False) # Turn running of high pile-up reconstruction on and off
icf.addFlag("InDet.Tracking.doTRTExtension", True) # turn on / off TRT extensions
- icf.addFlag("InDet.doTrtSegments", lambda prevFlags: prevFlags.InDet.Tracking.doBackTracking or prevFlags.InDet.Tracking.doTRTStandalone) # control to run TRT Segment finding (do it always after new tracking!)
+ icf.addFlag("InDet.Tracking.doTRTSegments", lambda prevFlags: prevFlags.InDet.Tracking.doBackTracking or prevFlags.InDet.Tracking.doTRTStandalone) # control to run TRT Segment finding (do it always after new tracking!)
icf.addFlag("InDet.Tracking.doBackTracking", True) # Turn running of backtracking on and off
icf.addFlag("InDet.Tracking.doLargeD0", False)
icf.addFlag("InDet.Tracking.doR3LargeD0", True)
@@ -45,10 +48,6 @@ def createInDetConfigFlags():
icf.addFlag("InDet.Tracking.doTrackSegmentsDisappearing", True)
icf.addFlag("InDet.Tracking.doBeamGas", False) # Turn running of BeamGas second pass on and off
- icf.addFlag("InDet.useBeamSpotInfoNN", True) # use beam spot service in new tracking
- icf.addFlag("InDet.kalmanUpdator", "smatrix") # control which updator to load for KalmanFitter ("None"/"fast"/"smatrix"/"weight"/"amg")
- icf.addFlag("InDet.nnCutLargeD0Threshold", -1.0) # Enable check for dead modules and FEs
- icf.addFlag("InDet.propagatorType", "RungeKutta") # control which propagator to use ('RungeKutta'/'STEP')
icf.addFlag("InDet.trackFitterType", "GlobalChi2Fitter") # control which fitter to be used: 'KalmanFitter', 'KalmanDNAFitter', 'DistributedKalmanFilter', 'GlobalChi2Fitter', 'GaussianSumFilter'
icf.addFlag("InDet.useHolesFromPattern", False)
icf.addFlag("InDet.useZvertexTool", False) # start with Zvertex finding
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index 707a092dfcd0..c749fb233f3d 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -336,7 +336,7 @@ def InDetTrackRecoCfg(flags):
# TRT segments
# Different from TRT track segments at the top as takes as input previously built track collections
- if flags.InDet.doTrtSegments:
+ if flags.InDet.Tracking.doTRTSegments:
from InDetConfig.TRTSegmentFindingConfig import TRTSegmentFindingCfg
result.merge(TRTSegmentFindingCfg(flags,
extension = "",
diff --git a/InnerDetector/InDetConfig/python/TrackingCommonConfig.py b/InnerDetector/InDetConfig/python/TrackingCommonConfig.py
index eb176a5a7df4..267e61787507 100644
--- a/InnerDetector/InDetConfig/python/TrackingCommonConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackingCommonConfig.py
@@ -507,13 +507,13 @@ def InDetUpdatorCfg(flags, name = 'InDetUpdator', **kwargs):
acc = ComponentAccumulator()
tool = None
- if flags.InDet.kalmanUpdator == "fast" :
+ if flags.InDet.Tracking.kalmanUpdator == "fast" :
tool = CompFactory.Trk.KalmanUpdator_xk(name = the_name, **kwargs)
- elif flags.InDet.kalmanUpdator == "weight" :
+ elif flags.InDet.Tracking.kalmanUpdator == "weight" :
tool = CompFactory.Trk.KalmanWeightUpdator(name = the_name, **kwargs)
- elif flags.InDet.kalmanUpdator == "smatrix" :
+ elif flags.InDet.Tracking.kalmanUpdator == "smatrix" :
tool = CompFactory.Trk.KalmanUpdatorSMatrix(name = the_name, **kwargs)
- elif flags.InDet.kalmanUpdator == "amg" :
+ elif flags.InDet.Tracking.kalmanUpdator == "amg" :
tool = CompFactory.Trk.KalmanUpdatorAmg(name = the_name, **kwargs)
else :
tool = CompFactory.Trk.KalmanUpdator(name = the_name, **kwargs)
@@ -1364,7 +1364,7 @@ def InDetNNScoringToolBaseCfg(flags, name='InDetNNScoringTool', **kwargs) :
kwargs.setdefault("DriftCircleCutTool", InDetTRTDriftCircleCutForPatternReco )
kwargs.setdefault("nnCutConfig", "dev/TrackingCP/LRTAmbiNetwork/20200727_225401/nn-config.json" )
- kwargs.setdefault("nnCutThreshold", flags.InDet.nnCutLargeD0Threshold )
+ kwargs.setdefault("nnCutThreshold", flags.InDet.Tracking.nnCutLargeD0Threshold )
kwargs.setdefault("Extrapolator", InDetExtrapolator )
kwargs.setdefault("SummaryTool", InDetTrackSummaryTool )
kwargs.setdefault("useAmbigFcn", True )
--
GitLab