From 4f1b5412e13885da3eac94712d3999962abf3e80 Mon Sep 17 00:00:00 2001 From: tstreble Date: Tue, 28 Jun 2022 19:02:45 +0200 Subject: [PATCH 1/3] Introduced default CA config for MultipleScatteringUpdator --- .../python/AtlasExtrapolatorToolsConfig.py | 21 ++++++++++++++++--- .../python/TrkGlobalChi2FitterConfig.py | 8 +++---- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py index c80353bfc4f..56a1d6c33f1 100644 --- a/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py +++ b/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py @@ -102,16 +102,31 @@ def FastSimNavigatorCfg(flags, result.setPrivateTools(CompFactory.Trk.Navigator(name, **kwargs)) return result +# Uses Highland formula for sigma from Trk::MultipleScatteringUpdator::sigmaSquare = default config +def AtlasMultipleScatteringUpdatorCfg(flags, + name="AtlasMultipleScatteringUpdator", + **kwargs): + acc = ComponentAccumulator() + kwargs.setdefault("UseTrkUtils", True) + acc.setPrivateTools( + CompFactory.Trk.MultipleScatteringUpdator(name, **kwargs)) + return acc -def MultipleScatteringUpdatorCfg(flags, - name="MultipleScatteringUpdator", - **kwargs): +# Uses Highland formula for sigma from Trk::MaterialInteraction::sigmaMS (different log term) = non default config +# Used for GlobalChi2Fitter +def InDetMultipleScatteringUpdatorCfg(flags, + name="InDetMultipleScatteringUpdator", + **kwargs): acc = ComponentAccumulator() kwargs.setdefault("UseTrkUtils", False) acc.setPrivateTools( CompFactory.Trk.MultipleScatteringUpdator(name, **kwargs)) return acc +def ITkMultipleScatteringUpdatorCfg(flags, + name="ITkMultipleScatteringUpdator", + **kwargs): + return InDetMultipleScatteringUpdatorCfg(flags, name, **kwargs) def fatrasMultipleScatteringUpdatorCfg(flags, name="ISF_FatrasMultipleScatteringUpdator", diff --git a/Tracking/TrkConfig/python/TrkGlobalChi2FitterConfig.py b/Tracking/TrkConfig/python/TrkGlobalChi2FitterConfig.py index 53e1afd8c4c..dd9e02892e2 100644 --- a/Tracking/TrkConfig/python/TrkGlobalChi2FitterConfig.py +++ b/Tracking/TrkConfig/python/TrkGlobalChi2FitterConfig.py @@ -37,7 +37,7 @@ def InDetGlobalChi2FitterBaseCfg(flags, from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg from TrkConfig.AtlasExtrapolatorToolsConfig import ( AtlasNavigatorCfg, AtlasEnergyLossUpdatorCfg, - InDetMaterialEffectsUpdatorCfg, MultipleScatteringUpdatorCfg) + InDetMaterialEffectsUpdatorCfg, InDetMultipleScatteringUpdatorCfg) InDetExtrapolator = acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags)) InDetNavigator = acc.popToolsAndMerge( @@ -46,7 +46,7 @@ def InDetGlobalChi2FitterBaseCfg(flags, InDetMaterialEffectsUpdator = acc.popToolsAndMerge( InDetMaterialEffectsUpdatorCfg(flags)) MultipleScatteringUpdator = acc.popToolsAndMerge( - MultipleScatteringUpdatorCfg(flags)) + InDetMultipleScatteringUpdatorCfg(flags)) from TrkConfig.TrkExRungeKuttaPropagatorConfig import InDetPropagatorCfg InDetPropagator = acc.popToolsAndMerge(InDetPropagatorCfg(flags)) @@ -450,7 +450,7 @@ def ITkGlobalChi2FitterBaseCfg(flags, from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg from TrkConfig.AtlasExtrapolatorToolsConfig import ( AtlasNavigatorCfg, AtlasEnergyLossUpdatorCfg, - ITkMaterialEffectsUpdatorCfg, MultipleScatteringUpdatorCfg) + ITkMaterialEffectsUpdatorCfg, ITkMultipleScatteringUpdatorCfg) Extrapolator = acc.popToolsAndMerge(AtlasExtrapolatorCfg(flags)) Navigator = acc.popToolsAndMerge(AtlasNavigatorCfg(flags)) @@ -458,7 +458,7 @@ def ITkGlobalChi2FitterBaseCfg(flags, ITkMaterialEffectsUpdator = acc.popToolsAndMerge( ITkMaterialEffectsUpdatorCfg(flags)) MultipleScatteringUpdator = acc.popToolsAndMerge( - MultipleScatteringUpdatorCfg(flags)) + ITkMultipleScatteringUpdatorCfg(flags)) from TrkConfig.TrkExRungeKuttaPropagatorConfig import ITkPropagatorCfg ITkPropagator = acc.popToolsAndMerge(ITkPropagatorCfg(flags)) -- GitLab From 0a460919445390c2fb94770049616633f7ec55aa Mon Sep 17 00:00:00 2001 From: Thomas Strebler Date: Tue, 28 Jun 2022 21:30:29 +0200 Subject: [PATCH 2/3] Added reference for Highland formula --- Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py index 56a1d6c33f1..0a153322955 100644 --- a/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py +++ b/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py @@ -102,7 +102,7 @@ def FastSimNavigatorCfg(flags, result.setPrivateTools(CompFactory.Trk.Navigator(name, **kwargs)) return result -# Uses Highland formula for sigma from Trk::MultipleScatteringUpdator::sigmaSquare = default config +# Uses Highland formula for sigma from Trk::MultipleScatteringUpdator::sigmaSquare (PDG 2018 formula 33.15) = default config def AtlasMultipleScatteringUpdatorCfg(flags, name="AtlasMultipleScatteringUpdator", **kwargs): @@ -112,7 +112,7 @@ def AtlasMultipleScatteringUpdatorCfg(flags, CompFactory.Trk.MultipleScatteringUpdator(name, **kwargs)) return acc -# Uses Highland formula for sigma from Trk::MaterialInteraction::sigmaMS (different log term) = non default config +# Uses Highland formula for sigma from Trk::MaterialInteraction::sigmaMS (PDG 2010 formula 27.14) = non default config # Used for GlobalChi2Fitter def InDetMultipleScatteringUpdatorCfg(flags, name="InDetMultipleScatteringUpdator", -- GitLab From e3e1f73b12cced681efd4649474c33734fad4afa Mon Sep 17 00:00:00 2001 From: Thomas Strebler Date: Wed, 29 Jun 2022 14:33:08 +0200 Subject: [PATCH 3/3] Updated comments --- .../TrkConfig/python/AtlasExtrapolatorToolsConfig.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py index 0a153322955..958bba24010 100644 --- a/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py +++ b/Tracking/TrkConfig/python/AtlasExtrapolatorToolsConfig.py @@ -102,7 +102,10 @@ def FastSimNavigatorCfg(flags, result.setPrivateTools(CompFactory.Trk.Navigator(name, **kwargs)) return result -# Uses Highland formula for sigma from Trk::MultipleScatteringUpdator::sigmaSquare (PDG 2018 formula 33.15) = default config +# Uses Highland formula for sigma +# from Trk::MaterialInteraction::sigmaMS +# (PDG 2018 formula 33.15) +# = default config def AtlasMultipleScatteringUpdatorCfg(flags, name="AtlasMultipleScatteringUpdator", **kwargs): @@ -112,8 +115,10 @@ def AtlasMultipleScatteringUpdatorCfg(flags, CompFactory.Trk.MultipleScatteringUpdator(name, **kwargs)) return acc -# Uses Highland formula for sigma from Trk::MaterialInteraction::sigmaMS (PDG 2010 formula 27.14) = non default config -# Used for GlobalChi2Fitter +# Uses Highland formula for sigma +# from Trk::MultipleScatteringUpdator::sigmaSquare +# (PDG 2010 formula 27.14) +# = non default config, used for GlobalChi2Fitter def InDetMultipleScatteringUpdatorCfg(flags, name="InDetMultipleScatteringUpdator", **kwargs): -- GitLab