From 59bff0894084d4c1dcfcb093645351168c0095cb Mon Sep 17 00:00:00 2001
From: Sergi Rodriguez <Sergi.Rodriguez@cern.ch>
Date: Tue, 20 Feb 2024 12:02:05 +0100
Subject: [PATCH] tidying the python configuration
---
.../python/TRTCalibrationMgrConfig.py | 33 +++----------------
.../python/InDetTrackSelectorToolConfig.py | 31 ++++++++++++++++-
2 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py
index f022717dd8a7..964c1a7bbcb9 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/python/TRTCalibrationMgrConfig.py
@@ -32,34 +32,7 @@ def TRTCalibratorCfg(flags, name="TRTCalibrator", **kwargs) :
return acc
-# Tool to select tracks to be used for calibration
-def InDetDetailedTrackSelectorToolCfg(flags,name="InDetDetailedTrackSelectorTool",**kwargs):
- # FIXME - This function should go to the correct Athena pkg...
-
- from AthenaCommon.SystemOfUnits import GeV, mm
-
- acc = ComponentAccumulator()
- kwargs.setdefault("pTMin", 1.0*GeV)
- kwargs.setdefault("fitChi2OnNdfMax",50.0)
- kwargs.setdefault("z0Max",99999.0*mm)
- kwargs.setdefault("IPd0Max",10.0*mm)
- kwargs.setdefault("IPd0Max",300.0*mm)
- kwargs.setdefault("etaMax",2.1)
- kwargs.setdefault("nHitBLayer",0)
- kwargs.setdefault("nHitPix",2)
- kwargs.setdefault("nHitBLayerPlusPix",0)
- kwargs.setdefault("nHitSct",0)
- kwargs.setdefault("nHitSi",7)
- kwargs.setdefault("nHitTrtPlusOutliers",20)
- kwargs.setdefault("nHitTrtPlusOutliersHighE",20)
- kwargs.setdefault("nHitTrtHighE",0)
-
- from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
- kwargs.setdefault("Extrapolator", acc.popToolsAndMerge(InDetExtrapolatorCfg(flags)))
-
- from InDetConfig.InDetTrackSelectorToolConfig import InDetTrackSelectorToolCfg
- acc.setPrivateTools(acc.popToolsAndMerge(InDetTrackSelectorToolCfg(flags, name=name , **kwargs)))
- return acc
+
# Steering algorithm. Either it fills track and hit ntuples, or it calls TRTCalibrator
def TRT_CalibrationMgrCfg(flags,name='TRT_CalibrationMgr',calibconstants='',**kwargs) :
@@ -77,6 +50,7 @@ def TRT_CalibrationMgrCfg(flags,name='TRT_CalibrationMgr',calibconstants='',**kw
from ActsConfig.ActsTrackFittingConfig import ActsFitterCfg
kwargs.setdefault("TrackFitter", acc.popToolsAndMerge(ActsFitterCfg(flags)))
+ from InDetConfig.InDetTrackSelectorToolConfig import InDetDetailedTrackSelectorToolCfg
kwargs.setdefault("TrackSelectorTool", acc.popToolsAndMerge(InDetDetailedTrackSelectorToolCfg(flags)))
# FIXME! Let all straws participate in trackfinding as default - SERGI This is wrong and needs to be UPDATED @peter
@@ -95,7 +69,8 @@ def TRT_CalibrationMgrCfg(flags,name='TRT_CalibrationMgr',calibconstants='',**kw
acc.addEventAlgo(CompFactory.TRTCalibrationMgr(name, **kwargs))
return acc
-
+
+# FIXME - where is this tool used? Needs some feedback
def TRT_TrackHoleSearch(flags,name="TRT_TrackHoleSearch",**kwargs):
from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
diff --git a/InnerDetector/InDetConfig/python/InDetTrackSelectorToolConfig.py b/InnerDetector/InDetConfig/python/InDetTrackSelectorToolConfig.py
index c95cce16a8a5..4fc65d6ae8f1 100644
--- a/InnerDetector/InDetConfig/python/InDetTrackSelectorToolConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetTrackSelectorToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Configuration of InDetTrackSelectorTool package
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -263,3 +263,32 @@ def InDetTrigTRTDriftCircleCutToolCfg(flags, name='InDetTrigTRTDriftCircleCutToo
kwargs.setdefault("UseNewParameterization", True)
kwargs.setdefault("UseActiveFractionSvc", True)
return InDetTRTDriftCircleCutToolCfg(flags, name, **kwargs)
+
+
+
+# Tool to select tracks to be used for TRT calibration
+def InDetDetailedTrackSelectorToolCfg(flags,name="InDetDetailedTrackSelectorTool",**kwargs):
+
+ from AthenaCommon.SystemOfUnits import GeV, mm
+
+ acc = ComponentAccumulator()
+ kwargs.setdefault("pTMin", 1.0*GeV)
+ kwargs.setdefault("fitChi2OnNdfMax",50.0)
+ kwargs.setdefault("z0Max",99999.0*mm)
+ kwargs.setdefault("IPd0Max",10.0*mm)
+ kwargs.setdefault("IPd0Max",300.0*mm)
+ kwargs.setdefault("etaMax",2.1)
+ kwargs.setdefault("nHitBLayer",0)
+ kwargs.setdefault("nHitPix",2)
+ kwargs.setdefault("nHitBLayerPlusPix",0)
+ kwargs.setdefault("nHitSct",0)
+ kwargs.setdefault("nHitSi",7)
+ kwargs.setdefault("nHitTrtPlusOutliers",20)
+ kwargs.setdefault("nHitTrtPlusOutliersHighE",20)
+ kwargs.setdefault("nHitTrtHighE",0)
+
+ from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
+ kwargs.setdefault("Extrapolator", acc.popToolsAndMerge(InDetExtrapolatorCfg(flags)))
+
+ acc.setPrivateTools(acc.popToolsAndMerge(InDetTrackSelectorToolCfg(flags, name=name , **kwargs)))
+ return acc
--
GitLab