Commit f9fe5f4d authored by Thomas Strebler's avatar Thomas Strebler
Browse files

Updated configs beyond tracking using InDetExtrapolator

parent de22f089
......@@ -41,7 +41,7 @@ def CaloGeoAndNoiseCfg(inputFlags):
return result
def PFExtrapolatorCfg(flags):
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
result = ComponentAccumulator()
extrapolator_acc = InDetExtrapolatorCfg(flags, "InDetTrigExtrapolator")
result.merge(extrapolator_acc)
......@@ -85,7 +85,7 @@ def MuonCaloTagCfg(flags, tracktype, tracksin, extcache, cellsin):
Return the component accumulator and the tracks with muons removed
"""
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
result = ComponentAccumulator()
extrapolator_acc = InDetExtrapolatorCfg(flags, "InDetTrigExtrapolator")
result.merge(extrapolator_acc)
......
......@@ -87,7 +87,7 @@ def egammaTrkRefitterToolCfg(flags, name='GSFRefitterTool', **kwargs):
kwargs.setdefault("useBeamSpot", False)
kwargs.setdefault("ReintegrateOutliers", True)
if "Extrapolator" not in kwargs:
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
kwargs["Extrapolator"] = acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags, name="egammaExtrapolator"))
if "FitterTool" not in kwargs:
from InDetConfig.TrackingCommonConfig import GaussianSumFitterCfg
......
......@@ -145,7 +145,7 @@ def SiTrackMaker_xkCfg(flags, name="SiTrackMaker_xk"):
def ExtrapolatorCfg(flags):
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
return InDetExtrapolatorCfg(flags, name="InDetTrigExtrapolator")
def InDetTestPixelLayerToolCfg(flags):
......@@ -885,7 +885,7 @@ def TrackSelectionToolCfg(flags):
def ambiguityScoringToolCfg(flags):
acc = ComponentAccumulator()
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg #TODO using offline, consider porting
from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg #TODO using offline, consider porting
tool = CompFactory.InDet.InDetAmbiScoringTool(name = f"{prefix}_AmbiguityScoringTool_{flags.InDet.Tracking.name}",
SummaryTool = acc.getPrimaryAndMerge(TrackSummaryToolCfg(flags)),
Extrapolator = acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags, name="InDetTrigExtrapolator")),
......@@ -912,8 +912,8 @@ def KalmanUpdatorCfg(flags):
def FitterToolCfg(flags):
acc = ComponentAccumulator()
from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
from TrkConfig.AtlasExtrapolatorConfig import AtlasNavigatorCfg
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
from TrkConfig.AtlasExtrapolatorToolsConfig import AtlasNavigatorCfg
from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
cond_alg = None #TODO may need to pull AtlasTrackingGeometryCondAlg and use it later
fitter = CompFactory.Trk.GlobalChi2Fitter(name = 'InDetTrigTrackFitter',
ExtrapolationTool = acc.getPrimaryAndMerge(InDetExtrapolatorCfg(flags, name="InDetTrigExtrapolator")),
......
......@@ -122,7 +122,7 @@ def iterativeVertexFinderCfg(flags, signature):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from InDetConfig.TrackingCommonConfig import InDetTrackSummaryToolCfg
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
from InDetTrigRecExample.TrigInDetConfiguredVtxCuts import ConfiguredTrigVtxCuts
acc = ComponentAccumulator()
......@@ -175,7 +175,7 @@ def adaptiveMultiVertexFinderCfg(flags, signature):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from InDetConfig.TrackingCommonConfig import InDetTrackSummaryToolCfg
from InDetConfig.InDetRecToolConfig import InDetExtrapolatorCfg
from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
acc = ComponentAccumulator()
......
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