Commit 1120f646 authored by Thomas Strebler's avatar Thomas Strebler
Browse files

More updates with AtlasUpgradeExtrapolator

parent bd2e467e
......@@ -6,9 +6,6 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline, addFolders
# @TODO retire once migration to TrackingGeometry conditions data is complete
from InDetRecExample.TrackingCommon import use_tracking_geometry_cond_alg
def ITkPrdAssociationToolCfg(flags, name='ITkPrdAssociationTool',**kwargs) :
acc = ComponentAccumulator()
'''
......
......@@ -346,7 +346,7 @@ def ITkKalmanTrackFitterBaseCfg(flags, name='ITkKalmanTrackFitterBase',**kwargs)
pix_cluster_on_track_args['nameSuffix']=nameSuffix
from TrkConfig.AtlasUpgradeExtrapolatorConfig import AtlasUpgradeExtrapolatorCfg
Extrapolator = result.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
Extrapolator = acc.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
kwargs.setdefault("ExtrapolatorHandle", Extrapolator)
if 'RIO_OnTrackCreatorHandle' not in kwargs :
......@@ -403,7 +403,7 @@ def ITkKalmanCompetingPixelClustersToolCfg(flags, name='ITkKalmanCompetingPixelC
if 'Extrapolator' not in kwargs:
from TrkConfig.AtlasUpgradeExtrapolatorConfig import AtlasUpgradeExtrapolatorCfg
Extrapolator = result.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
Extrapolator = acc.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
kwargs.setdefault("Extrapolator", Extrapolator)
acc.setPrivateTools(CompFactory.InDet.CompetingPixelClustersOnTrackTool(name=name, **kwargs))
......@@ -416,7 +416,7 @@ def ITkKalmanCompetingStripClustersToolCfg(flags, name='ITkKalmanCompetingStripC
if 'Extrapolator' not in kwargs:
from TrkConfig.AtlasUpgradeExtrapolatorConfig import AtlasUpgradeExtrapolatorCfg
Extrapolator = result.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
Extrapolator = acc.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
kwargs.setdefault("Extrapolator", Extrapolator)
acc.setPrivateTools(CompFactory.InDet.CompetingSCT_ClustersOnTrackTool(name=name,**kwargs))
......@@ -544,7 +544,7 @@ def ITkDistributedKalmanFilterCfg(flags, name="ITkDistributedKalmanFilter", **kw
if 'ExtrapolatorTool' not in kwargs :
from TrkConfig.AtlasUpgradeExtrapolatorConfig import AtlasUpgradeExtrapolatorCfg
Extrapolator = result.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
Extrapolator = acc.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
kwargs.setdefault('ExtrapolatorTool', Extrapolator)
if 'ROTcreator' not in kwargs :
......
......@@ -150,8 +150,8 @@ def InDetPhysValTruthDecoratorAlgCfg(flags, **kwargs):
Extrapolator = None
if flags.Detector.GeometryITk:
from InDetConfig.ITkRecToolConfig import ITkExtrapolatorCfg
Extrapolator = acc.getPrimaryAndMerge(ITkExtrapolatorCfg(flags))
from TrkConfig.AtlasUpgradeExtrapolatorConfig import AtlasUpgradeExtrapolatorCfg
Extrapolator = acc.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
else:
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
Extrapolator = acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags))
......
......@@ -34,8 +34,8 @@ def InDetRttTruthSelectionToolCfg(flags, name="InDetRttTruthSelectionTool", **kw
Extrapolator = None
if flags.Detector.GeometryITk:
from InDetConfig.ITkRecToolConfig import ITkExtrapolatorCfg
Extrapolator = acc.getPrimaryAndMerge(ITkExtrapolatorCfg(flags))
from TrkConfig.AtlasUpgradeExtrapolatorConfig import AtlasUpgradeExtrapolatorCfg
Extrapolator = acc.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(flags))
else:
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
Extrapolator = acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags))
......
......@@ -3,12 +3,10 @@ from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
def ITkCaloExtensionBuilderAlgCfg(inputFlags):
#Run-3 uses
#from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
from InDetConfig.ITkRecToolConfig import ITkExtrapolatorCfg
from TrkConfig.AtlasUpgradeExtrapolatorConfig import AtlasUpgradeExtrapolatorCfg
Trk__ParticleCaloExtensionTool = CompFactory.Trk.ParticleCaloExtensionTool
result = ComponentAccumulator()
pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = result.getPrimaryAndMerge(ITkExtrapolatorCfg(inputFlags)))
pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = result.getPrimaryAndMerge(AtlasUpgradeExtrapolatorCfg(inputFlags)))
CaloExtensionBuilderAlg = CompFactory.Trk.CaloExtensionBuilderAlg
CaloExtensionBuilderAlg = CaloExtensionBuilderAlg(LastCaloExtentionTool = pcExtensionTool,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment