diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
index 6a9c62c476a1f4aa380efe2c72dfa23ae6106850..c5c7e13d7c82c3ef45c9cb117f45022805133929 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
@@ -104,10 +104,10 @@ if dumpTrtInfo:
#Setup charge->ToT back-conversion to restore ToT info as well
-if dumpPixInfo:
- from PixelCalibAlgs.PixelCalibAlgsConf import PixelChargeToTConversion
- PixelChargeToTConversionSetter = PixelChargeToTConversion(name = "PixelChargeToTConversionSetter")
- IDDerivationSequence += PixelChargeToTConversionSetter
+if dumpPixInfo:
+ from PixelCalibAlgs.PixelCalibAlgsConf import PixelChargeToTConversion
+ PixelChargeToTConversionSetter = PixelChargeToTConversion(name = "PixelChargeToTConversionSetter")
+ IDDerivationSequence += PixelChargeToTConversionSetter
if (printIdTrkDxAODConf):
print(PixelChargeToTConversionSetter)
print(PixelChargeToTConversionSetter.properties())
@@ -124,7 +124,7 @@ if makeSplitTracks:
splittertoolcomb= InDet__InDetTrackSplitterTool(name="SplitterTool",
TrackFitter=ToolSvc.InDetTrackFitter,
OutputUpperTracksName = "TracksUpperSplit",
- OutputLowerTracksName = "TracksLowerSplit")
+ OutputLowerTracksName = "TracksLowerSplit")
ToolSvc += splittertoolcomb
from InDetTrackValidation.InDetTrackValidationConf import InDet__InDetSplittedTracksCreator
@@ -139,8 +139,7 @@ if makeSplitTracks:
# Create xAOD::TrackParticles out of them
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
- InDetxAODSplitParticleCreatorTool = Trk__TrackParticleCreatorTool(name = "InDetSplitxAODParticleCreatorTool",
- Extrapolator = InDetExtrapolator,
+ InDetxAODSplitParticleCreatorTool = Trk__TrackParticleCreatorTool(name = "InDetSplitxAODParticleCreatorTool",
TrackSummaryTool = InDetTrackSummaryToolSharedHits,
KeepParameters = True)
ToolSvc += InDetxAODSplitParticleCreatorTool
@@ -198,7 +197,7 @@ if TrtZSel or TrtJSel:
'HLT_e140_lhloose_nod0',
'HLT_e300_etcut']
expression_trigE = ' || '.join(triggersE)
-
+
triggersM = [
# Single muon
'HLT_mu26_imedium',
@@ -206,14 +205,14 @@ if TrtZSel or TrtJSel:
'HLT_mu28_imedium',
'HLT_mu28_ivarmedium',
'HLT_mu40',
- 'HLT_mu50'
+ 'HLT_mu50'
]
expression_trigM = ' || '.join(triggersM)
# Zee TnP
requirement_Zee_tag = '(Electrons.Tight || Electrons.LHTight) && Electrons.pt > 24.5*GeV'
requirement_Zee_probe = 'Electrons.pt > 6.5*GeV'
-
+
ZeeMassTool = DerivationFramework__InvariantMassTool( name = "ZeeMassTool",
ObjectRequirements = requirement_Zee_tag,
SecondObjectRequirements = requirement_Zee_probe,
@@ -222,14 +221,14 @@ if TrtZSel or TrtJSel:
SecondMassHypothesis = 0.511*MeV,
ContainerName = "Electrons",
SecondContainerName = "Electrons")
-
+
ToolSvc+=ZeeMassTool
expression_Zee = 'count(Zee_DiElectronMass > 75.0*GeV && Zee_DiElectronMass < 105.0*GeV)>=1'
-
+
# Zmumu TnP
requirement_Zmm_tag = 'Muons.ptcone40/Muons.pt < 0.3 && Muons.pt > 10.*GeV'
requirement_Zmm_probe = 'Muons.ptcone40/Muons.pt < 0.3 && Muons.pt > 4.5*GeV'
-
+
ZmmMassTool = DerivationFramework__InvariantMassTool( name = "ZmmMassTool",
ObjectRequirements = requirement_Zmm_tag,
SecondObjectRequirements = requirement_Zmm_probe,
@@ -242,15 +241,15 @@ if TrtZSel or TrtJSel:
expression_Zmm = 'count(Zmm_DiMuonMass > 75.0*GeV && Zmm_DiMuonMass < 105.0*GeV)>=1'
expression = '( ' + expression_Zee + ' && ( ' + expression_trigE + ' ) ) || ( ' + expression_Zmm + ' && ( ' + expression_trigM + ' ) )'
-
+
# Event selection tool
from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
Z_SkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "Z_SkimmingTool",
expression = expression)
-
+
ToolSvc += Z_SkimmingTool
print(Z_SkimmingTool)
-
+
if TrtJSel:
triggersE = [
# Di-electron
@@ -262,7 +261,7 @@ if TrtZSel or TrtJSel:
'HLT_e14_lhtight_nod0_e4_etcut_Jpsiee',
]
expression_trigE = ' || '.join(triggersE)
-
+
triggersM = [
# Di-muon
'HLT_2mu4',
@@ -282,7 +281,7 @@ if TrtZSel or TrtJSel:
# JPSIee TnP
requirement_JPSIee_tag = '(Electrons.Tight || Electrons.LHTight) && Electrons.pt > 4.5*GeV'
requirement_JPSIee_probe = 'Electrons.pt > 4.5*GeV'
-
+
JPSIeeMassTool = DerivationFramework__InvariantMassTool( name = "JPSIeeMassTool",
ObjectRequirements = requirement_JPSIee_tag,
SecondObjectRequirements = requirement_JPSIee_probe,
@@ -291,14 +290,14 @@ if TrtZSel or TrtJSel:
SecondMassHypothesis = 0.511*MeV,
ContainerName = "Electrons",
SecondContainerName = "Electrons")
-
+
ToolSvc+=JPSIeeMassTool
expression_JPSIee = '(count(JPSIee_DiElectronMass > 2.0*GeV && JPSIee_DiElectronMass < 4.0*GeV)>=1)'
-
+
# JPSImumu TnP
requirement_JPSImm_tag = '(Muons.ptcone40/Muons.pt < 0.3 && Muons.pt > 4.5*GeV)'
requirement_JPSImm_probe = '(Muons.ptcone40/Muons.pt < 0.3 && Muons.pt > 4.5*GeV)'
-
+
JPSImmMassTool = DerivationFramework__InvariantMassTool( name = "JPSImmMassTool",
ObjectRequirements = requirement_JPSImm_tag,
SecondObjectRequirements = requirement_JPSImm_probe,
@@ -311,8 +310,8 @@ if TrtZSel or TrtJSel:
expression_JPSImm = '(count(JPSImm_DiMuonMass > 2.0*GeV && JPSImm_DiMuonMass < 4.0*GeV)>=1)'
expression = '( ' + expression_JPSIee + ' && ( ' + expression_trigE + ' ) ) || ( ' + expression_JPSImm + ' && ( ' + expression_trigM + ' ) )'
-
-
+
+
# Event selection tool
from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
JPSI_SkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "JPSI_SkimmingTool",
@@ -322,12 +321,12 @@ if TrtZSel or TrtJSel:
print(JPSI_SkimmingTool)
-if skimmingExpression:
+if skimmingExpression:
from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
stringSkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "stringSkimmingTool",
expression = skimmingExpression)
-
- ToolSvc += stringSkimmingTool
+
+ ToolSvc += stringSkimmingTool
DRAW_ZMUMU_SkimmingTool=None
@@ -632,16 +631,16 @@ IDTRKThinningTool = DerivationFramework__TrackParticleThinning(name = "IDTRKThin
ToolSvc += IDTRKThinningTool
thinningTools.append(IDTRKThinningTool)
-if pixelClusterThinningExpression:
+if pixelClusterThinningExpression:
from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackMeasurementThinning
- trackMeasurementThinningTool = DerivationFramework__TrackMeasurementThinning(
+ trackMeasurementThinningTool = DerivationFramework__TrackMeasurementThinning(
name = "TrackMeasurementThinningTool",
ThinningService = "IDTRKThinningSvc",
SelectionString = pixelClusterThinningExpression,
TrackMeasurementValidationKey = "PixelClusters",
ApplyAnd = False)
- ToolSvc += trackMeasurementThinningTool
+ ToolSvc += trackMeasurementThinningTool
thinningTools.append(trackMeasurementThinningTool)
# Add decoration with truth parameters if running on simulation
@@ -671,7 +670,7 @@ IDDerivationSequence += CfgMgr.DerivationFramework__DerivationKernel("DFTSOS_KER
ThinningTools = thinningTools,
OutputLevel = INFO)
-topSequence += IDDerivationSequence
+topSequence += IDDerivationSequence
if (printIdTrkDxAODConf):
print(IDDerivationSequence )
print(IDDerivationSequence.properties())
@@ -808,7 +807,7 @@ if dumpTriggerInfo:
IDTRKVALIDStream.AddItem("xAOD::TrigNavigationAuxInfo#TrigNavigationAux.")
if dumpTrtInfo and not isIdTrkDxAODSimulation:
- # strangely these options cause crashes in R21 MC reco: ATLASRECTS-3861
+ # strangely these options cause crashes in R21 MC reco: ATLASRECTS-3861
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
SlimmingHelper = SlimmingHelper("SlimmingHelper")
SlimmingHelper.AllVariables += ["HLT_xAOD__ElectronContainer_egamma_Electrons","HLT_xAOD__MuonContainer_MuonEFInfo"]
diff --git a/InnerDetector/InDetExample/InDetAlignExample/share/GenericTracks.py b/InnerDetector/InDetExample/InDetAlignExample/share/GenericTracks.py
index 6ce744fbfc781dc63acc151a0fe148b68f3433a6..af8db28f50eb324f0e4a0ef58f0b35ae2f9ad28f 100644
--- a/InnerDetector/InDetExample/InDetAlignExample/share/GenericTracks.py
+++ b/InnerDetector/InDetExample/InDetAlignExample/share/GenericTracks.py
@@ -98,7 +98,7 @@ if newInDetAlignAlg_Options["useTrackSelector"]:
UseIDTrackSelectionTool = True,
#PassAllTracks = True, ## Uncomment this line to bypass track slection
IDTrackSelectionTool = trackSelectorNew)
-
+
#ToolSvc += alignTrackSelection
@@ -302,29 +302,28 @@ if not Cosmics:
#ToolSvc += InDetAlignMonBeamSpot_noTrig
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonBeamSpot_noTrig ]
-###############################################
+###############################################
# trying to implement the track segments for cosmics
if Cosmics:
from InDetTrackSplitterTool.InDetTrackSplitterToolConf import InDet__InDetTrackSplitterTool
- from InDetTrackValidation.InDetTrackValidationConf import InDet__InDetSplittedTracksCreator
+ from InDetTrackValidation.InDetTrackValidationConf import InDet__InDetSplittedTracksCreator
from InDetAlignmentMonitoring.InDetAlignmentMonitoringConf import IDAlignMonTrackSegments
-
+
#----- tools for track splliting ---- START ----
splittertoolcomb= InDet__InDetTrackSplitterTool(name="VARO_SplitterTool",
TrackFitter = InDetTrackFitter, #InDetTrackFitter,
OutputUpperTracksName = "TracksUpperSplit",
OutputLowerTracksName = "TracksLowerSplit",
- OutputLevel = INFO)
+ OutputLevel = INFO)
#ToolSvc += splittertoolcomb
printfunc (splittertoolcomb)
- # tool to convert to xAOD::TrackParticles
+ # tool to convert to xAOD::TrackParticles
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
- InDetxAODSplitParticleCreatorTool = Trk__TrackParticleCreatorTool(name = "InDetSplitxAODParticleCreatorTool",
- Extrapolator = InDetExtrapolator,
+ InDetxAODSplitParticleCreatorTool = Trk__TrackParticleCreatorTool(name = "InDetSplitxAODParticleCreatorTool",
TrackSummaryTool = InDetTrackSummaryToolSharedHits,
- KeepParameters = True,
+ KeepParameters = True,
OutputLevel = DEBUG)
#ToolSvc += InDetxAODSplitParticleCreatorTool
#----- tools for track splliting ---- COMPLETED ----
@@ -332,7 +331,7 @@ if Cosmics:
#
#### first task #### prepare the segment track selectors
#
-
+
#--> needed ? InDetAlignMonManager.DataType = "cosmics"
m_alignMonTrackSelectorTool = []
m_alignMonTrackSelectionTool = []
@@ -365,8 +364,8 @@ if Cosmics:
#ToolSvc += m_alignMonTrackSelectorTool[i]
if (InDetFlags.doPrintConfigurables()):
printfunc (m_alignMonTrackSelectorTool[i])
-
-
+
+
m_alignMonTrackSelectionTool.append(InDetAlignMon__TrackSelectionTool(name = m_alignMonTrackSelectionToolName[i],
## Uncomment this line to bypass track slection
#PassAllTracks = True,
@@ -378,7 +377,7 @@ if Cosmics:
printfunc (" <NewInDetAlignMonitoring> ** SELECTION ** m_alignMonTrackSelectionTool[",i,"] =", m_alignMonTrackSelectionToolName[i])
printfunc (m_alignMonTrackSelectionTool[i])
-
+
#
##### second task #### define the input track collections and the output segment collections
#
@@ -387,10 +386,10 @@ if Cosmics:
m_upperTracksName = ["AlignTracks_Upper", "Combined_Upper"]
m_lowerTracksName = ["AlignTracks_Lower", "Combined_Lower"]
#m_Splitter = []
-
+
m_trackSegmentsUpLow = []
m_trackSegmentsUpLowName = ["InDetAlignMonTrackSegment_AlignTracks", "InDetAlignMonTrackSegments_Combined"]
-
+
m_inputTracksUpLow = ["AlignTracks", "CombinedInDetTracks"]
m_d0Range = [ 200.0, 200.0]
m_deltaD0 = [ 0.25, 0.25]
@@ -419,7 +418,7 @@ if Cosmics:
printfunc (" ")
printfunc (" ***************** ")
-
+
# monitoring part of the track segments matchinv
m_trackSegmentsUpLow.append(IDAlignMonTrackSegments(name = m_trackSegmentsUpLowName[i],
InputTracksName = m_inputTracksUpLow[i],
@@ -444,12 +443,12 @@ if Cosmics:
printfunc (" <NewInDetAlignMonitoring> step ",i, m_trackSegmentsUpLowName[i]," added to the ToolSvc")
#
- #### third task #### define monitoring histograms for each cosmic ray track segment
+ #### third task #### define monitoring histograms for each cosmic ray track segment
#
# 1) create and fill the track-collections list
m_trkcolls = []
for i in range(len(m_trackSplitterName)):
- m_trkcolls.append(m_upperTracksName[i]+"Split")
+ m_trkcolls.append(m_upperTracksName[i]+"Split")
m_trkcolls.append(m_lowerTracksName[i]+"Split")
# 2) convert the tracks to xAOD
@@ -474,12 +473,12 @@ if Cosmics:
AddTruthLink = False,
OutputLevel = INFO)
topSequence += xAODSplitTrackParticleCnvAlg
-
+
# 2.2 ) lower track segments (same as above)
splitter_TakeLower=InDet__InDetSplittedTracksCreator(name=m_inputTracksUpLow[i]+'_Splitter_TakeLower',
TrackSplitterTool = splittertoolcomb,
TrackCollection = m_inputTracksUpLow[i], #"Tracks",
- OutputTrackCollection = m_lowerTracksName[i]+"Split",
+ OutputTrackCollection = m_lowerTracksName[i]+"Split",
takeUpperSegment = False,
takeLowerSegment = True,
OutputLevel = INFO)
@@ -487,7 +486,7 @@ if Cosmics:
printfunc (splitter_TakeLower)
xAODSplitTrackParticleCnvAlg = xAODMaker__TrackParticleCnvAlg(name=m_inputTracksUpLow[i]+'_Splitter_TakeLower_xAOD',
- xAODContainerName ="xAOD::TrackParticleContainer",
+ xAODContainerName ="xAOD::TrackParticleContainer",
xAODTrackParticlesFromTracksContainerName = m_lowerTracksName[i]+"Split",
TrackParticleCreator = InDetxAODSplitParticleCreatorTool,
TrackContainerName = m_lowerTracksName[i]+"Split",
@@ -497,7 +496,7 @@ if Cosmics:
OutputLevel = INFO)
topSequence += xAODSplitTrackParticleCnvAlg
-
+
# 3) now create the monitoring histos
for i in range(len(m_trkcolls)):
printfunc (" <NewInDetAlignMonitoring> going to define InDetAlignMonResiduals for track collection: ", m_trkcolls[i])
@@ -538,7 +537,7 @@ if Cosmics:
)
#ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
-
+
InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
name = "InDetAlignMonEfficiencies_"+m_trkcolls[i],
trackSelection = m_allSelection,
@@ -552,9 +551,9 @@ if Cosmics:
)
#ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
-
-###############################################
+
+###############################################
if not hasattr(ServiceMgr, 'THistSvc'):
from GaudiSvc.GaudiSvcConf import THistSvc
ServiceMgr += THistSvc()
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredxAODTrackParticleCreation.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredxAODTrackParticleCreation.py
index ea8e096780a3b644586f3c09c1de18ff12100811..aafaa1a5685bded6b01fdcce4263cb4528392f3d 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredxAODTrackParticleCreation.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredxAODTrackParticleCreation.py
@@ -31,8 +31,7 @@ class ConfiguredxAODTrackParticleCreation:
#Always the same (so far) so can in principle go in InDetRecLoadTools
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
- InDetxAODParticleCreatorTool = Trk__TrackParticleCreatorTool(name = "InDetxAODParticleCreatorTool"+InputTrackCollection,
- Extrapolator = InDetExtrapolator,
+ InDetxAODParticleCreatorTool = Trk__TrackParticleCreatorTool(name = "InDetxAODParticleCreatorTool"+InputTrackCollection,
TrackSummaryTool = InDetTrackSummaryToolSharedHits,
BadClusterID = InDetFlags.pixelClusterBadClusterID(),
KeepParameters = True,
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py
index 20ec7169eece7d6e1173ca20902c1471b223474e..736ea6e7a28ba42e3307ec5e002350204b426d36 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py
@@ -77,7 +77,6 @@ def getInDetxAODParticleCreatorTool(prd_to_track_map=None, suffix="") :
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
InDetxAODParticleCreatorTool = Trk__TrackParticleCreatorTool(name = "InDetxAODParticleCreatorTool"+suffix,
- Extrapolator = InDetExtrapolator,
TrackSummaryTool = track_summary_tool,
BadClusterID = InDetFlags.pixelClusterBadClusterID(),
KeepParameters = True,
@@ -140,7 +139,7 @@ def convertTrackParticles(aod_track_particles_in, track_particle_truth_in,track_
xAODTrackParticleCnvAlg.TrackTruthContainerName = ""
from MCTruthClassifier.MCTruthClassifierBase import MCTruthClassifier
xAODTrackParticleCnvAlg.MCTruthClassifier = MCTruthClassifier
- topSequence += xAODTrackParticleCnvAlg
+ topSequence += xAODTrackParticleCnvAlg
if (doCreation or doConversion):# or InDetFlags.useExistingTracksAsInput()) : <---- [XXX JDC Should we included this?
# problems appear when nothing should
@@ -151,7 +150,7 @@ if (doCreation or doConversion):# or InDetFlags.useExistingTracksAsInput()) : <-
# if finally there is no need of the special "MergedTrack" name
if 'InputTrackCollectionTruth' not in dir():
InputTrackCollectionTruth = InDetKeys.TracksTruth()
- if not InDetFlags.doDBMstandalone():
+ if not InDetFlags.doDBMstandalone():
if doCreation :
createTrackParticles(InputTrackCollection, InputTrackCollectionTruth, InDetKeys.xAODTrackParticleContainer(),topSequence)
from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags
@@ -167,7 +166,7 @@ if (doCreation or doConversion):# or InDetFlags.useExistingTracksAsInput()) : <-
if (InDetFlags.doDBMstandalone() or InDetFlags.doDBM() ) and doCreation :
- # or instead of InDetKeys.DBMTracksTruth() rather InDetKeys.DBMDetailedTracksTruth() ?
+ # or instead of InDetKeys.DBMTracksTruth() rather InDetKeys.DBMDetailedTracksTruth() ?
createTrackParticles( InDetKeys.xAODDBMTrackParticleContainer(), InDetKeys.DBMTracksTruth(), InDetKeys.xAODDBMTrackParticleContainer(),topSequence)
if not InDetFlags.doVertexFinding():
@@ -177,7 +176,7 @@ if not InDetFlags.doVertexFinding():
if len(getRecVertexNameIfInFile(InDetKeys.PrimaryVertices()))>0 :
from xAODTrackingCnv.xAODTrackingCnvConf import xAODMaker__VertexCnvAlg
xAODVertexCnvAlg = xAODMaker__VertexCnvAlg("VertexCnvAlg")
- xAODVertexCnvAlg.xAODContainerName = InDetKeys.xAODVertexContainer()
+ xAODVertexCnvAlg.xAODContainerName = InDetKeys.xAODVertexContainer()
xAODVertexCnvAlg.AODContainerName = InDetKeys.PrimaryVertices()
xAODVertexCnvAlg.TPContainerName = InDetKeys.xAODTrackParticleContainer()
topSequence += xAODVertexCnvAlg
@@ -214,8 +213,8 @@ if InDetFlags.doPseudoTracking():
if InDetFlags.doR3LargeD0() and InDetFlags.storeSeparateLargeD0Container():
if doCreation :
createTrackParticles(InDetKeys.ExtendedLargeD0Tracks(), InDetKeys.ExtendedLargeD0TracksTruth(), InDetKeys.xAODLargeD0TrackParticleContainer(),topSequence)
-
-
+
+
if InDetFlags.doTrackSegmentsPixel() and InDetFlags.doParticleCreation():
if doCreation :
createTrackParticles(InDetKeys.PixelTracks(), InDetKeys.PixelTracksTruth(), InDetKeys.xAODPixelTrackParticleContainer(),topSequence)
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/python/InDetVKalVxInJetFinder.py b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/python/InDetVKalVxInJetFinder.py
index 8b221fd247f2907ee782e6c0ce84bbf5841c4e16..6b1e538af3354f5bf7ab810936fe24d52b47f676 100644
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/python/InDetVKalVxInJetFinder.py
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/python/InDetVKalVxInJetFinder.py
@@ -6,13 +6,13 @@ from InDetVKalVxInJetTool.InDetVKalVxInJetToolConf import InDet__InDetVKalVxInJe
# define the class
class InDetVKalVxInJetFinder( InDet__InDetVKalVxInJetTool ):
- def __init__(self, name = 'InDetVKalVxInJetFinder' ):
+ def __init__(self, name = 'InDetVKalVxInJetFinder' ):
mlog = logging.getLogger( 'InDetVKalVxInJetFinder::__init__ ' )
mlog.info("entering")
#----------------------
# VKalVrt vertex fitter
- #
+ #
from TrkVKalVrtFitter.TrkVKalVrtFitterConf import Trk__TrkVKalVrtFitter
SVertexFitterTool = Trk__TrkVKalVrtFitter(name="SVertexFitterTool",
Extrapolator="Trk::Extrapolator/AtlasExtrapolator"
@@ -31,7 +31,6 @@ class InDetVKalVxInJetFinder( InDet__InDetVKalVxInJetTool ):
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
if hasattr(ToolSvc,'InDetTrackSummaryTool'):
SVParticleCreatorTool = Trk__TrackParticleCreatorTool(name="SVParticleCreatorTool",
- Extrapolator="Trk::Extrapolator/AtlasExtrapolator",
TrackSummaryTool="InDetTrackSummaryTool",
UseTrackSummaryTool=False )
else:
@@ -51,7 +50,7 @@ class InDetVKalVxInJetFinder( InDet__InDetVKalVxInJetTool ):
# define the class
class AtlasVKalVxInJetFinder( InDet__InDetVKalVxInJetTool ):
- def __init__(self, name = 'AtlasVKalVxInJetFinder' ):
+ def __init__(self, name = 'AtlasVKalVxInJetFinder' ):
from __main__ import ToolSvc
mlog = logging.getLogger( 'AtlasVKalVxInJetFinder::__init__ ' )
@@ -61,7 +60,7 @@ class AtlasVKalVxInJetFinder( InDet__InDetVKalVxInJetTool ):
SVAtlasExtrapolator=AtlasExtrapolator()
ToolSvc+=SVAtlasExtrapolator
- #--------------------------
+ #--------------------------
from TrkTrackSummaryTool.AtlasTrackSummaryTool import AtlasTrackSummaryTool
SVAtlasTrackSummaryTool = AtlasTrackSummaryTool()
ToolSvc += SVAtlasTrackSummaryTool
@@ -71,14 +70,13 @@ class AtlasVKalVxInJetFinder( InDet__InDetVKalVxInJetTool ):
#
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
SVParticleCreatorTool = Trk__TrackParticleCreatorTool(name="SVParticleCreatorTool",
- Extrapolator=SVAtlasExtrapolator,
TrackSummaryTool=SVAtlasTrackSummaryTool,
UseTrackSummaryTool=False
)
ToolSvc += SVParticleCreatorTool
#----------------------
# VKalVrt vertex fitter
- #
+ #
from TrkVKalVrtFitter.TrkVKalVrtFitterConf import Trk__TrkVKalVrtFitter
SVertexFitterTool = Trk__TrkVKalVrtFitter(name="SVertexFitterTool",
Extrapolator=SVAtlasExtrapolator
@@ -89,7 +87,7 @@ class AtlasVKalVxInJetFinder( InDet__InDetVKalVxInJetTool ):
#
from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__FullLinearizedTrackFactory
SVLinearizedTrackFactory = Trk__FullLinearizedTrackFactory(name="SVLinearizedTrackFactory",Extrapolator = SVAtlasExtrapolator)
- ToolSvc += SVLinearizedTrackFactory
+ ToolSvc += SVLinearizedTrackFactory
from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__TrackToVertexIPEstimator
SVTrackToVertexIPEstimator = Trk__TrackToVertexIPEstimator(name="SVTrackToVertexIPEstimator",
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py
index 1480d72a1ab003ae5cef93d1592a4cb4c4417782..6bd95841cbec0e11b4642c3ef7f3a2158ccd55ad 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py
@@ -294,7 +294,6 @@ class MuonParticleCreatorTool(Trk__TrackParticleCreatorTool,ConfiguredBase):
def __init__(self,name="MuonParticleCreatorTool",**kwargs):
self.applyUserDefaults(kwargs,name)
- kwargs.setdefault("Extrapolator", "AtlasExtrapolator" )
kwargs.setdefault("TrackSummaryTool", "MuonTrackSummaryTool" )
kwargs.setdefault("KeepAllPerigee", True )
kwargs.setdefault("UseMuonSummaryTool", True)
diff --git a/PhysicsAnalysis/JpsiUpsilonTools/share/configureElectronServices.py b/PhysicsAnalysis/JpsiUpsilonTools/share/configureElectronServices.py
index d996f5a33c26e53c948069d93fe0210cee1b40a5..de9c530fd582ad3566eecd3fffc0d75862ae8e56 100644
--- a/PhysicsAnalysis/JpsiUpsilonTools/share/configureElectronServices.py
+++ b/PhysicsAnalysis/JpsiUpsilonTools/share/configureElectronServices.py
@@ -40,7 +40,7 @@ print InDetTrackSelectorToolEE
#
#from egammaTrackTools.egammaTrackToolsConf import CaloCluster_OnTrackBuilder
#ccotBuilderTool = CaloCluster_OnTrackBuilder(name = "ccotBuilderTool",
-# UseClusterEnergy = False,
+# UseClusterEnergy = False,
# UseClusterPhi = False)
#ToolSvc += ccotBuilderTool
#
@@ -64,7 +64,6 @@ print InDetTrackSelectorToolEE
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
InDetParticleCreatorTool = Trk__TrackParticleCreatorTool(name = "InDetParticleCreatorTool",
KeepParameters = True,
- Extrapolator = InDetExtrapolator,
TrackSummaryTool = InDetTrackSummaryTool,
UseTrackSummaryTool = True)
ToolSvc += InDetParticleCreatorTool
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index 43ca55ae2ff361046f424151abba0266aba0de99..a9feb9a3017a9fcc1c784db220adda9b38a9335d 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -123,10 +123,6 @@ def MuonCombinedParticleCreatorCfg(flags, name="MuonCombinedParticleCreator",**k
kwargs.setdefault("TrackSummaryTool", acc.getPrimary() )
result.merge (acc)
- acc = AtlasExtrapolatorCfg(flags)
- kwargs.setdefault("Extrapolator", acc.getPrimary() )
- result.addPublicTool(kwargs['Extrapolator'])
- result.merge(acc)
kwargs.setdefault("KeepAllPerigee",True )
kwargs.setdefault("UseMuonSummaryTool",True )
if flags.Beam.Type=="cosmics":
@@ -179,7 +175,6 @@ def MuonMaterialProviderToolCfg(flags, name = "MuonMaterialProviderTool"):
result.merge(acc)
result.addPublicTool(atlas_extrapolator)
kwargs = dict()
- kwargs["Extrapolator"] = atlas_extrapolator
if flags.Muon.SAMuonTrigger:
from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryToolCfg
acc = MuonTrackSummaryToolCfg(flags)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
index bcfed3b938bc10b9eeea10bef59a78e0bb9ae31c..268ca48ad731163839beb37a7329919efb0b4e77 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
@@ -47,11 +47,11 @@ def MuonCombinedInDetDetailedTrackSelectorTool_LRT(name='MuonCombinedInDetDetail
kwargs.setdefault("nHitSct", 4 )
kwargs.setdefault("nHitSi", 4 )
kwargs.setdefault("nHitTrt", 0 )
- kwargs.setdefault("useTrackQualityInfo", False )
+ kwargs.setdefault("useTrackQualityInfo", False )
kwargs.setdefault("TrackSummaryTool", getPublicTool("AtlasTrackSummaryTool") )
kwargs.setdefault("Extrapolator", getPublicTool("AtlasExtrapolator") )
return CfgMgr.InDet__InDetDetailedTrackSelectorTool(name,**kwargs)
-
+
def MuonInDetForwardCandidateTool( name = 'MuonInDetForwardCandidateTool', **kwargs):
@@ -66,7 +66,6 @@ def MuonCombinedParticleCreator(name="MuonCombinedParticleCreator",**kwargs):
else:
import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary ) #getPublicTool("CombinedMuonTrackSummary") )
- kwargs.setdefault("Extrapolator", getPublicTool("AtlasExtrapolator") )
kwargs.setdefault("KeepAllPerigee",True )
kwargs.setdefault("UseMuonSummaryTool",True )
if beamFlags.beamType() == 'cosmics':
@@ -75,7 +74,6 @@ def MuonCombinedParticleCreator(name="MuonCombinedParticleCreator",**kwargs):
def MuonCaloParticleCreator(name="MuonCaloParticleCreator",**kwargs):
import MuonCombinedRecExample.CombinedMuonTrackSummary # noqa: F401 (import side-effects)
- kwargs.setdefault("Extrapolator", getPublicTool("AtlasExtrapolator") )
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary ) #getPublicTool("CombinedMuonTrackSummary") )
kwargs.setdefault("KeepAllPerigee",True )
kwargs.setdefault("PerigeeExpression","Origin")
@@ -133,8 +131,8 @@ def MuonCreatorTool_LRT(name="MuonCreatorTool_LRT",**kwargs):
kwargs.setdefault("MuonPrinter", getPublicTool("MuonPrintingTool") )
kwargs.setdefault("RequireIDTrack", True)
return CfgMgr.MuonCombined__MuonCreatorTool(name,**kwargs)
-
-
+
+
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_preprocessing.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_preprocessing.py
index f7f163b58835e63214e6d59166d2b48352be6aa2..4e7256332d13aa9bfc7bbba2d7eb3c1ecc8156f6 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_preprocessing.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_preprocessing.py
@@ -32,7 +32,6 @@ if rec.doMuonCombined() and jobproperties.Beam.beamType()=='cosmics' and DetFlag
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
InDetParticleCreatorTool_split = Trk__TrackParticleCreatorTool(name = "InDetParticleCreatorTool_split",
KeepParameters = True,
- Extrapolator = InDetExtrapolator,
TrackSummaryTool = InDetTrackSummaryTool,
PerigeeExpression = "Origin")
ToolSvc += InDetParticleCreatorTool_split
@@ -60,7 +59,7 @@ if rec.doMuonCombined() and jobproperties.Beam.beamType()=='cosmics' and DetFlag
#truth tracks
if rec.doTruth():
include ("InDetRecExample/ConfiguredInDetTrackTruth.py")
-
+
InDetTracksTruth = ConfiguredInDetTrackTruth(InDetKeys.Tracks()+"_split",
InDetKeys.DetailedTracksTruth()+"_split",
InDetKeys.Tracks()+"_Truth_split")
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py
index 5f7c833c4439a371ce32dc86aaf49e2628f79f32..4732fd0e36283fe2257896d9b9c0289a20248c67 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py
@@ -11,8 +11,7 @@ from AthenaCommon.Logging import logging
from egammaAlgs import egammaAlgsConf
from egammaRec import egammaKeys
from egammaRec.Factories import AlgFactory
-from egammaTools.egammaExtrapolators import (AtlasPublicExtrapolator,
- egammaExtrapolator)
+from egammaTools.egammaExtrapolators import egammaExtrapolator
# default configuration of the EMBremCollectionBuilder
from InDetRecExample.InDetJobProperties import InDetFlags
from InDetRecExample.InDetKeys import InDetKeys
@@ -116,7 +115,6 @@ class egammaBremCollectionBuilder (egammaAlgsConf.EMBremCollectionBuilder):
GSFBuildInDetParticleCreatorTool = Trk__TrackParticleCreatorTool(
name="GSFBuildInDetParticleCreatorTool",
KeepParameters=True,
- Extrapolator=AtlasPublicExtrapolator(),
UseTrackSummaryTool=False)
#
# Track slimming (private not in ToolSvc)
diff --git a/Tracking/TrkTools/TrkParticleCreator/TrkParticleCreator/TrackParticleCreatorTool.h b/Tracking/TrkTools/TrkParticleCreator/TrkParticleCreator/TrackParticleCreatorTool.h
index f2c64b2fa3ff41b5cdd2642a201f875793968db6..b1817a6f15f4d40d39a08a4e321b00b427a49ad4 100644
--- a/Tracking/TrkTools/TrkParticleCreator/TrkParticleCreator/TrackParticleCreatorTool.h
+++ b/Tracking/TrkTools/TrkParticleCreator/TrkParticleCreator/TrackParticleCreatorTool.h
@@ -193,10 +193,6 @@ private:
"Trk::TrackSummaryTool/AtlasTrackSummaryTool"
};
- PublicToolHandle<IExtrapolator> m_extrapolator{ this,
- "Extrapolator",
- "Trk::Extrapolator/AtlasExtrapolator" };
-
ToolHandle<Reco::ITrackToVertex> m_trackToVertex{ this,
"TrackToVertex",
"Reco::TrackToVertex/TrackToVertex" };
diff --git a/Tracking/TrkTools/TrkParticleCreator/src/TrackParticleCreatorTool.cxx b/Tracking/TrkTools/TrkParticleCreator/src/TrackParticleCreatorTool.cxx
index 8b42badeca206635d50c1e0375e54153a84d66d4..075e2dbbd6c0bc12b1ce901a40acb9a4ddfdc6d4 100644
--- a/Tracking/TrkTools/TrkParticleCreator/src/TrackParticleCreatorTool.cxx
+++ b/Tracking/TrkTools/TrkParticleCreator/src/TrackParticleCreatorTool.cxx
@@ -172,14 +172,6 @@ TrackParticleCreatorTool::TrackParticleCreatorTool(const std::string& t,
m_trackSummaryTool.disable();
}
- /* Retrieve track extrapolator from ToolService */
- if ( m_extrapolator.retrieve().isFailure() ) {
- ATH_MSG_FATAL( "Failed to retrieve tool " << m_extrapolator );
- return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG( "Retrieved tool " << m_extrapolator );
-
-
if (detStore()->retrieve(m_detID, "AtlasID" ).isFailure()) {
ATH_MSG_FATAL ("Could not get AtlasDetectorID ");
return StatusCode::FAILURE;
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
index 243f1cae90b722fdd54bde815c238c9e4fb0c2b2..e72b7c0beaf034712051e4aa25f381cfd2b0577b 100755
--- a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
@@ -269,7 +269,6 @@ def TMEF_TrackSummaryToolNoHole(name='TMEF_TrackSummaryToolNoHole',**kwargs):
def TMEF_TrkToTrackParticleConvTool(name="TMEF_TrkToTrackParticleConvTool",**kwargs):
#import MuonCombinedRecExample.CombinedMuonTrackSummary
- kwargs.setdefault("Extrapolator", "AtlasExtrapolator" )
kwargs.setdefault("TrackSummaryTool", 'TMEF_TrackSummaryToolNoHole')#ToolSvc.CombinedMuonTrackSummary ) #getPublicTool("CombinedMuonTrackSummary") )
kwargs.setdefault("KeepAllPerigee",False )
return CfgMgr.Trk__TrackParticleCreatorTool(name,**kwargs)
diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py
index d832c9e4ca71b9d5575405aaf7cf4547ed3dcc5e..5ba49c10fd77a9b72d54b5217867d0a01cb67aab 100644
--- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py
+++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py
@@ -42,8 +42,7 @@ from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import \
- InDetTrigTrackSummaryToolSharedHits, \
- InDetTrigExtrapolator
+ InDetTrigTrackSummaryToolSharedHits
from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool, InDetTrigTrackSummaryToolSharedHitsWithTRTPid
@@ -51,7 +50,6 @@ from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool,
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
InDetTrigParticleCreatorTool = \
Trk__TrackParticleCreatorTool( name = "InDetTrigParticleCreatorTool",
- Extrapolator = InDetTrigExtrapolator,
TrackSummaryTool = InDetTrigTrackSummaryToolSharedHits,
KeepParameters = False,
)
@@ -62,7 +60,6 @@ if (InDetTrigFlags.doPrintConfigurables()):
InDetTrigParticleCreatorToolWithSummary = \
Trk__TrackParticleCreatorTool( name = "InDetTrigParticleCreatorToolWithSummary",
- Extrapolator = InDetTrigExtrapolator,
TrackSummaryTool = InDetTrigTrackSummaryToolSharedHits,
KeepParameters = True,
ComputeAdditionalInfo = True
@@ -74,7 +71,6 @@ if (InDetTrigFlags.doPrintConfigurables()):
InDetTrigParticleCreatorToolWithSummaryTRTPid = \
Trk__TrackParticleCreatorTool( name = "InDetTrigParticleCreatorToolWithSummaryTRTPid",
- Extrapolator = InDetTrigExtrapolator,
TrackSummaryTool = InDetTrigTrackSummaryToolSharedHitsWithTRTPid,
KeepParameters = True,
ComputeAdditionalInfo = True
@@ -87,7 +83,6 @@ if (InDetTrigFlags.doPrintConfigurables()):
InDetTrigParticleCreatorToolParams = \
Trk__TrackParticleCreatorTool( name = "InDetTrigParticleCreatorToolParams",
- Extrapolator = InDetTrigExtrapolator,
TrackSummaryTool = InDetTrigTrackSummaryToolSharedHits,
KeepParameters = True
)
@@ -98,7 +93,6 @@ if (InDetTrigFlags.doPrintConfigurables()):
InDetTrigParticleCreatorToolFTF = \
Trk__TrackParticleCreatorTool( name = "InDetTrigParticleCreatorToolFTF",
- Extrapolator = InDetTrigExtrapolator,
TrackSummaryTool = InDetTrigFastTrackSummaryTool,
KeepParameters = True,
ComputeAdditionalInfo = True
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py
index 8682b2070bfa02be41d5ac21541980a7b3268bb8..3bba5355014c5e658a4bfd9455537b5082c79e7d 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py
@@ -1,8 +1,8 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
# Contains algs/tools used by Inner Detector Trigger
-
-#Global keys/names for collections
+
+#Global keys/names for collections
#from .InDetTrigCollectionKeys import TrigTRTKeys, TrigPixelKeys
from InDetRecExample.TrackingCommon import makePublicTool, setDefaults
@@ -11,7 +11,7 @@ from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
#-------------------------------
-#TODO:
+#TODO:
#Make loader for extrapolator
@@ -25,8 +25,8 @@ def get_name_suffix(signature):
return '_%s'%signature
#Retrieve full name of the algorithm/tool which consist of
-#1] Predefined PREFIX describing the scope where this tool is being used (Inner Detector Trigger)
-#2] CORE name containing the actual name of the tool
+#1] Predefined PREFIX describing the scope where this tool is being used (Inner Detector Trigger)
+#2] CORE name containing the actual name of the tool
#3] SUFFIX which is derived from signature name: _electron, _muonLate, _FS etc
def get_full_name( core, suffix ):
return '{}{}{}'.format( get_name_prefix(), core, get_name_suffix(suffix) )
@@ -35,12 +35,12 @@ def get_full_name( core, suffix ):
#Retrieve name of the score map
#Map of Tracks and floats (representing score of a given track)
def get_scoredmap( suffix ):
- return "ScoredMap{}".format(suffix)
+ return "ScoredMap{}".format(suffix)
def trackSummaryTool_getter( doTRT ):
- from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackSummaryTool
- from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigTrackSummaryToolSharedHitsWithTRTPid
+ from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackSummaryTool
+ from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigTrackSummaryToolSharedHitsWithTRTPid
#Load shared hits with Ele PID if TRT specified
if doTRT:
@@ -54,10 +54,8 @@ def trackSummaryTool_getter( doTRT ):
@makePublicTool
def trackParticleCreatorTool_builder(name, config):
"""Tool with functionality to convert Trk:Tracks into xAOD::TrackParticles"""
- from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigExtrapolator
from TrkParticleCreator.TrkParticleCreatorConf import Trk__TrackParticleCreatorTool
return Trk__TrackParticleCreatorTool(name = name,
- Extrapolator = InDetTrigExtrapolator,
KeepParameters = config.PT.setting.keepTrackParameters,
TrackSummaryTool = trackSummaryTool_getter( config.PT.setting.doTRT ) )
@@ -76,7 +74,7 @@ def trackMonitoringTool_builder(suffix):
from TrigInDetMonitoringTools.TrigInDetTrackingMonitoring import TrigInDetTrackCnvMonitoring
genericMonTool = TrigInDetTrackCnvMonitoring( name = 'GenericMonitoring_{}'.format(suffix))
-
+
#Now pass this tool to the Track Monitoring tool
from TrigInDetMonitoringTools.TrigInDetMonitoringToolsConf import TrigInDetTrackMonitoringTool
@@ -95,32 +93,32 @@ def getTrackingSuffix( name ):
return '_EFID'
else:
return ''
-
-
+
+
def trackParticleCnv_builder(name, config, inTrackCollectionKey, outTrackParticlesKey ):
"""Alg that stages conversion of Trk::TrackCollection into xAOD::TrackParticle container"""
-
+
trackParticleCreatorTool = trackParticleCreatorTool_builder( name = get_full_name( 'TrackParticleCreatorTool',config.name),
config = config )
-
+
trackCollectionCnvTool = trackCollectionCnvTool_builder( name = get_full_name( 'xAODTrackCollectionCnvTool',config.name),
trackParticleCreatorTool = trackParticleCreatorTool,
config = config )
-
+
from xAODTrackingCnv.xAODTrackingCnvConf import xAODMaker__TrackParticleCnvAlg
return xAODMaker__TrackParticleCnvAlg( name = name,
# Properties below are used for: TrackCollection -> xAOD::TrackParticle
ConvertTracks = True, #Turn on retrieve of TrackCollection, false by default
- TrackContainerName = inTrackCollectionKey,
- xAODTrackParticlesFromTracksContainerName = outTrackParticlesKey,
+ TrackContainerName = inTrackCollectionKey,
+ xAODTrackParticlesFromTracksContainerName = outTrackParticlesKey,
TrackCollectionCnvTool = trackCollectionCnvTool,
TrackParticleCreator = trackParticleCreatorTool,
#Add track monitoring
- DoMonitoring = True,
- TrackMonTool = trackMonitoringTool_builder( config.name + getTrackingSuffix(name) ),
+ DoMonitoring = True,
+ TrackMonTool = trackMonitoringTool_builder( config.name + getTrackingSuffix(name) ),
# Properties below are used for obsolete: Rec:TrackParticle, aod -> xAOD::TrackParticle (Turn off)
ConvertTrackParticles = False, # Retrieve of Rec:TrackParticle, don't need this atm
- xAODContainerName = '',
+ xAODContainerName = '',
#---------------------------------------------------------------------------------
)
@@ -142,14 +140,14 @@ def ambiguityScoringTool_builder(name, config):
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigExtrapolator
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTRTDriftCircleCut
- #NOTE: Run2 config seems to be using offline version of
+ #NOTE: Run2 config seems to be using offline version of
#https://gitlab.cern.ch/atlas/athena/-/blob/master/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
- #1] Is this really what we want here?
+ #1] Is this really what we want here?
#2] TODO: Somehow merge/adapt the settings in InDetTrigConfigSettings.py?
if config.PT.isSignature('cosmicsN'):
#Can potentially recreate the isntance of the tool here and in the if config just have a list of parameters needed to be changed for the tool
- from InDetTrigRecExample.InDetTrigConfigRecLoadToolsCosmics import InDetTrigScoringToolCosmics_SiPattern
+ from InDetTrigRecExample.InDetTrigConfigRecLoadToolsCosmics import InDetTrigScoringToolCosmics_SiPattern
return InDetTrigScoringToolCosmics_SiPattern
else:
@@ -159,7 +157,7 @@ def ambiguityScoringTool_builder(name, config):
kwargs = {}
#Prepare default parameter settings for the tool
kwargs = setDefaults( kwargs,
- Extrapolator = InDetTrigExtrapolator,
+ Extrapolator = InDetTrigExtrapolator,
DriftCircleCutTool = InDetTrigTRTDriftCircleCut,
SummaryTool = trackSummaryTool_getter( config.PT.setting.doTRT ),
#to have a steeper turn-n curve
@@ -175,7 +173,7 @@ def ambiguityScoringTool_builder(name, config):
usePixel = InDetTrigCutValues.usePixel(),
useSCT = InDetTrigCutValues.useSCT(),
doEmCaloSeed = False,
- useAmbigFcn = True,
+ useAmbigFcn = True,
useTRT_AmbigFcn = False,
minTRTonTrk = 0,
)
@@ -207,7 +205,7 @@ def ambiguityScoringTool_builder(name, config):
def associationTool_getter():
#TODO double check this!
from InDetRecExample.TrackingCommon import getInDetTrigPRDtoTrackMapToolGangedPixels
- return getInDetTrigPRDtoTrackMapToolGangedPixels()
+ return getInDetTrigPRDtoTrackMapToolGangedPixels()
def trackFitterTool_getter(config):
#For now load from RecLoadTools where the config is based on: InDetTrigFlags.trackFitterType() (gaussian, kalman, globalChi2, ...)
@@ -216,7 +214,7 @@ def trackFitterTool_getter(config):
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackFitterCosmics
return InDetTrigTrackFitterCosmics
else:
- from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackFitter
+ from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackFitter
return InDetTrigTrackFitter
def trackSelectionTool_getter(config):
@@ -288,7 +286,7 @@ def ambiguityProcessorTool_builder( name, config):
#Return configured tool
from TrkAmbiguityProcessor.TrkAmbiguityProcessorConf import Trk__SimpleAmbiguityProcessorTool
- return Trk__SimpleAmbiguityProcessorTool( name = name,
+ return Trk__SimpleAmbiguityProcessorTool( name = name,
**kwargs
#**setDefaults(kwargs,
# Fitter = trackFitterTool,
@@ -299,12 +297,12 @@ def ambiguityProcessorTool_builder( name, config):
# )
)
-
+
#Need to differentiate between "standard" precision tracking code seeded by FTF and EFID-like/offline pattern recognition seeding configured here:
#https://gitlab.cern.ch/atlas/athena/blob/master/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py#L499
-
+
from TrkAmbiguitySolver.TrkAmbiguitySolverConf import Trk__TrkAmbiguitySolver
def ambiguitySolverAlg_builder(name, config):
@@ -321,20 +319,20 @@ def ambiguitySolverAlg_builder(name, config):
#-----------------------
#Set/Get subtools
ambiguityProcessor = ambiguityProcessorTool_builder( name = get_full_name( 'AmbiguityProcessor', config.name),
- config = config )
+ config = config )
return Trk__TrkAmbiguitySolver( name = name,
TrackInput = get_scoredmap( get_name_suffix(config.name )),
TrackOutput = getTrackOutput(),
AmbiguityProcessor = ambiguityProcessor
)
-
+
#--------------------------------------------------------------------------
# Track Ambiguity Score algs/tools
@makePublicTool
def ambiguityScoreProcessorTool_builder( name, config):
- # Tool contains backend functions for calculating score of a provided track
+ # Tool contains backend functions for calculating score of a provided track
# Score of each track is based on track parameters such as hits in the ID, higher score -> more likely to survive ambiguity resolving between tracks
#-----------------------
@@ -351,7 +349,7 @@ def ambiguityScoreProcessorTool_builder( name, config):
ScoringTool = scoringTool,
AssociationTool = associationTool,
SelectionTool = trackSelectionTool
- )
+ )
@@ -365,10 +363,10 @@ def ambiguityScoreAlg_builder(name, config):
# config = config )
return Trk__TrkAmbiguityScore( name = name,
- TrackInput = [ config.FT.trkTracksFTF() ],
+ TrackInput = [ config.FT.trkTracksFTF() ],
TrackOutput = get_scoredmap( get_name_suffix( config.name ) ),
#Disable processor, see: https://gitlab.cern.ch/atlas/athena/-/merge_requests/36431
- AmbiguityScoreProcessor = None, #ambiguityScoreProcessor,
+ AmbiguityScoreProcessor = None, #ambiguityScoreProcessor,
)
-
+
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index d6c9cd216d4ef8bf63c26e64dcf3b0cc84adf238..4a6a2afa5c24b8c4e7f8e7c69e96b7e028ef065d 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -660,7 +660,6 @@ def trackConverterCfg(flags, signature, signatureName):
acc.merge( TrackSummaryToolCfg(flags, name="InDetTrigFastTrackSummaryTool") )
creatorTool = CompFactory.Trk.TrackParticleCreatorTool( name = "InDetTrigParticleCreatorToolFTF",
- Extrapolator = acc.getPublicTool( "InDetTrigExtrapolator" ),
TrackSummaryTool = acc.getPublicTool( "InDetTrigFastTrackSummaryTool" ),
KeepParameters = True,
ComputeAdditionalInfo = True,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py
index 0f3e3789730449a0404ffc117fe2d395647562d0..0b0a7b20a34986301f81f475a0b0a04edea88d6c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py
@@ -9,8 +9,7 @@ from AthenaCommon.Logging import logging
# import base class
from egammaAlgs import egammaAlgsConf
from egammaRec.Factories import AlgFactory
-from egammaTools.egammaExtrapolators import (AtlasPublicExtrapolator,
- egammaExtrapolator)
+from egammaTools.egammaExtrapolators import egammaExtrapolator
# default configuration of the EMBremCollectionBuilder
from InDetRecExample.InDetJobProperties import InDetFlags
@@ -113,7 +112,6 @@ class TrigEgammaBremCollectionBuilder (egammaAlgsConf.EMBremCollectionBuilder):
GSFBuildInDetParticleCreatorTool = Trk__TrackParticleCreatorTool(
name="GSFBuildInDetParticleCreatorTool",
KeepParameters=True,
- Extrapolator=AtlasPublicExtrapolator(),
UseTrackSummaryTool=False)
#
# Track slimming (private not in ToolSvc)