Merge branch 'indet.JetTagD3PDMaker-20181201' into 'master'

JetTagD3PDMaker: Adjust for components moved from TrackD3PDMaker to InDetD3PDMaker.

See merge request atlas/athena!16399

Former-commit-id: bf19de8c

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/BTaggingD3PD.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # $Id$
 #
@@ -172,7 +172,7 @@ def BTaggingD3PD(alg = None,
 
 ### add beam spot object
     if JetTagD3PDFlags.AddBeamSpotObject():
-        from TrackD3PDMaker.BeamSpotD3PDObject import BeamSpotD3PDObject
+        from InDetD3PDMaker.BeamSpotD3PDObject import BeamSpotD3PDObject
         alg += BeamSpotD3PDObject(10)
 
 ### add muid object

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagClustersD3PDObject.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 #
 ## @file JetTagD3PDMaker/python/JetTagClustersD3PDObject.py
@@ -8,7 +8,6 @@
 ##
 import D3PDMakerCoreComps
 from D3PDMakerConfig.D3PDMakerFlags  import D3PDMakerFlags
-from TrackD3PDMaker.PixelClusterD3PDObject import PixelClusterD3PDObject
 
 def getJetTagClusterD3PDObject(level=0, **kw):
 
@@ -16,5 +15,6 @@ def getJetTagClusterD3PDObject(level=0, **kw):
     ### 1. add link to track and gen particle
     ### 2. configure selection blayer/all pix
 
+    from InDetD3PDMaker.PixelClusterD3PDObject import PixelClusterD3PDObject
     return PixelClusterD3PDObject(level=level, **kw)
 

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagMuonInJetD3PDObject.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 #
 ## @file JetTagD3PDMaker/python/JetTagMuonInJetD3PDObject.py
@@ -10,6 +10,7 @@
 
 import JetTagD3PDMaker
 import TrackD3PDMaker
+import InDetD3PDMaker
 import MuonD3PDMaker
 import EventCommonD3PDMaker
 
@@ -104,11 +105,11 @@ MuonPrimaryTrackAssoc = SimpleAssociation(JetTagMuonInJetD3PDObject,
 
 
 MuonFitQualityAssoc = SimpleAssociation (MuonPrimaryTrackAssoc,
-                                         TrackD3PDMaker.TrackParticleFitQualityAssociationTool,
+                                         InDetD3PDMaker.TrackParticleFitQualityAssociationTool,
                                          level = 0)
 
 MuonFitQualityAssoc.defineBlock (0, 'TrkFitQuality',
-                                 TrackD3PDMaker.TrackFitQualityFillerTool)
+                                 InDetD3PDMaker.TrackFitQualityFillerTool)
 
 MuonExtrapolatedTrackAssoc = SimpleAssociation(JetTagMuonInJetD3PDObject,
                                                MuonD3PDMaker.MuonTrackParticleAssociationTool,

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagPrimaryVertexD3PDObject.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 #
 ## @file JetTagD3PDMaker/python/JetTagPrimaryVertexD3PDObject.py
@@ -8,7 +8,7 @@
 ##
 import D3PDMakerCoreComps
 from D3PDMakerConfig.D3PDMakerFlags  import D3PDMakerFlags
-from TrackD3PDMaker.VertexD3PDObject import BuildVertexD3PDObject
+from TrackD3PDMaker.xAODVertexD3PDObject import BuildxAODVertexD3PDObject
 from TrackD3PDMaker.TrackD3PDMakerFlags import TrackD3PDFlags
 
 from JetTagD3PDMaker.JetTagD3PDMakerFlags import JetTagD3PDKeys
@@ -31,13 +31,12 @@ def getJetTagPrimaryVertexD3PDObject(level=10, **kw):
     if JetTagD3PDFlags.TrackAssocLabel() == "":
         TrackD3PDFlags.storeVertexTrackIndexAssociation=False
 
-    JetTagPrimaryVertexD3PDObject = BuildVertexD3PDObject(_prefix=JetTagD3PDKeys.PrimaryVertexPrefix(),
-                                                          _label=JetTagD3PDKeys.PrimaryVertexGetterLabel(),
-                                                          _sgkey=JetTagD3PDFlags.PrimaryVertexSGKey(),
-                                                          #_object_name='JetTagPrimaryVertexD3PDObject',
-                                                          trackTarget=JetTagD3PDFlags.TrackAssocLabel(),
-                                                          trackPrefix='trk_',
-                                                          trackType='Rec::TrackParticleContainer')
+    JetTagPrimaryVertexD3PDObject = \
+        BuildxAODVertexD3PDObject(_prefix=JetTagD3PDKeys.PrimaryVertexPrefix(),
+                                  _label=JetTagD3PDKeys.PrimaryVertexGetterLabel(),
+                                  _sgkey=JetTagD3PDFlags.PrimaryVertexSGKey(),
+                                  trackTarget=JetTagD3PDFlags.TrackAssocLabel(),
+                                  trackPrefix='trk_')
 
     return JetTagPrimaryVertexD3PDObject(level=level, **kw)
 

PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTrackD3PDObject.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 #
 ## @file JetTagD3PDMaker/python/JetTagTrackD3PDObject.py
@@ -9,7 +9,7 @@
 import D3PDMakerCoreComps
 from D3PDMakerConfig.D3PDMakerFlags  import D3PDMakerFlags
 from TrackD3PDMaker.TrackD3PDMakerFlags import TrackD3PDFlags
-from TrackD3PDMaker.TrackD3PDObject import TrackD3PDObject
+from TrackD3PDMaker.xAODTrackD3PDObject import xAODTrackD3PDObject
 from RecExConfig.RecFlags import rec
 
 from JetTagD3PDMaker.JetTagD3PDMakerKeys import JetTagD3PDKeys
@@ -49,19 +49,13 @@ def getJetTagTrackD3PDObject(level=20, **kw):
         TrackD3PDFlags.doTruth = False
         
  
-    JetTagTrackParticleD3PDObject = TrackD3PDObject(_label=JetTagD3PDKeys.TrackGetterLabel(),
-                                                    _prefix=JetTagD3PDKeys.TrackPrefix(),
-                                                    _sgkey=JetTagD3PDFlags.TrackParticleSGKey(),
-                                                    typeName='Rec::TrackParticleContainer',
-                                                    vertexSGKey=JetTagD3PDFlags.PrimaryVertexSGKey(),
-                                                    vertexTarget=JetTagD3PDKeys.PrimaryVertexGetterLabel(),
-                                                    vertexPrefix=JetTagD3PDKeys.PrimaryVertexPrefix(),
-                                                    truthTarget=TruthD3PDFlags.GenParticleAssocLabel(),
-                                                    truthPrefix=TruthD3PDKeys.GenParticlePrefix(),
-                                                    truthMapKey=JetTagD3PDFlags.TruthTrackParticleSGKey(),
-                                                    detailedTruthMapKey='',#'DetailedTrackTruth',
-                                                    SGKeyForTruth=JetTagD3PDFlags.TrackParticleSGKey(),
-                                                    flags=TrackD3PDFlags)
+    JetTagTrackParticleD3PDObject = xAODTrackD3PDObject(_label=JetTagD3PDKeys.TrackGetterLabel(),
+                                                        _prefix=JetTagD3PDKeys.TrackPrefix(),
+                                                        _sgkey=JetTagD3PDFlags.TrackParticleSGKey(),
+                                                        vertexSGKey=JetTagD3PDFlags.PrimaryVertexSGKey(),
+                                                        vertexTarget=JetTagD3PDKeys.PrimaryVertexGetterLabel(),
+                                                        vertexPrefix=JetTagD3PDKeys.PrimaryVertexPrefix(),
+                                                        flags=TrackD3PDFlags)
 
     from AthenaCommon.AppMgr import ToolSvc
     from InDetTrackSelectorTool.InDetTrackSelectorToolConf import InDet__InDetTrackSelectorTool
@@ -77,7 +71,7 @@ def getJetTagTrackD3PDObject(level=20, **kw):
     jetTagD3PDInDetTrackSelectorTool.TrackSummaryTool = ToolSvc.InDetTrackSummaryTool
     ToolSvc+=jetTagD3PDInDetTrackSelectorTool
 
-    from TrackD3PDMaker import TrackParticleGetterTool
+    from InDetD3PDMaker import TrackParticleGetterTool
     jetTagD3PDTrackGetterTool = TrackParticleGetterTool("jetTagD3PDTrackGetterTool")
     jetTagD3PDTrackGetterTool.VertexSGKey = JetTagD3PDFlags.PrimaryVertexSGKey() ## no need to resolve for now 
     jetTagD3PDTrackGetterTool.TrackSelector = jetTagD3PDInDetTrackSelectorTool