diff --git a/InnerDetector/InDetRecAlgs/InDetSecVtxFinder/CMakeLists.txt b/InnerDetector/InDetRecAlgs/InDetSecVtxFinder/CMakeLists.txt
index ce7c87723be9eaa30d1c67242feb5c9864077787..3e058809212c265d7d935856494ee750c1f64a10 100644
--- a/InnerDetector/InDetRecAlgs/InDetSecVtxFinder/CMakeLists.txt
+++ b/InnerDetector/InDetRecAlgs/InDetSecVtxFinder/CMakeLists.txt
@@ -8,6 +8,7 @@ atlas_subdir( InDetSecVtxFinder )
atlas_add_component( InDetSecVtxFinder
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces TrkTrack TrkParticleBase TrkVertexFitterInterfaces VxSecVertex TrkVxEdmCnvLib )
+ LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces TrkTrack
+ TrkParticleBase TrkVertexFitterInterfaces VxSecVertex)
atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8})
diff --git a/InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool/CMakeLists.txt
index 8e40083c1cffbb389aac7a1d5db0c15eb8e9b3a4..102231d28a541d2a001666e2417b749c709c5f1a 100644
--- a/InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool/CMakeLists.txt
@@ -15,5 +15,8 @@ atlas_add_component( InDetAdaptiveMultiSecVtxFinderTool
Root/InDetAdaptiveMultiSecVtxFinderTool.h
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthContainers CxxUtils xAODTracking GaudiKernel InDetRecToolInterfaces GeoPrimitives TrkTrack TrkParticleBase TrkParameters TrkEventPrimitives VxVertex VxMultiVertex TrkLinks TrkTrack TrkSurfaces TrkVertexFitterInterfaces TrkVxEdmCnvLib TrkVertexAnalysisUtilsLib EventPrimitives TrkVertexFittersLib InDetTrackSelectionToolLib TrkVertexSeedFinderUtilsLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthContainers CxxUtils xAODTracking
+ GaudiKernel InDetRecToolInterfaces GeoPrimitives TrkTrack TrkParticleBase TrkParameters TrkEventPrimitives
+ VxVertex VxMultiVertex TrkLinks TrkTrack TrkSurfaces TrkVertexFitterInterfaces TrkVertexAnalysisUtilsLib
+ EventPrimitives TrkVertexFittersLib InDetTrackSelectionToolLib TrkVertexSeedFinderUtilsLib )
diff --git a/InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool/src/InDetAdaptiveMultiSecVtxFinderTool.h b/InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool/src/InDetAdaptiveMultiSecVtxFinderTool.h
index e3e1d30a9b4eeace8f8688c6ae18e0b38772925e..e220699bc6d960c8274f1fbeb061787526d6fc43 100644
--- a/InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool/src/InDetAdaptiveMultiSecVtxFinderTool.h
+++ b/InnerDetector/InDetRecTools/InDetAdaptiveMultiSecVtxFinderTool/src/InDetAdaptiveMultiSecVtxFinderTool.h
@@ -43,9 +43,7 @@ namespace Trk {
class ITrackLink;
class IVertexSeedFinder;
class IImpactPoint3dEstimator;
-
class IVertexLinearizedTrackFactory;
- class IVxCandidateXAODVertex;
} // namespace Trk
//
//
diff --git a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.h b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.h
index f487c022a6d261e483e70672923a6673258e1e77..62e55be72f325a30a8e3bbe9c5ea2412284cf9b0 100755
--- a/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.h
+++ b/InnerDetector/InDetRecTools/InDetIncSecVxFinderTool/src/InDetIterativeSecVtxFinderTool.h
@@ -53,7 +53,6 @@ namespace Trk
class IVertexSeedFinder;
class IImpactPoint3dEstimator;
class IVertexLinearizedTrackFactory;
- class IVxCandidateXAODVertex;
}
//
//
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/InDetPriVxFinderTool/InDetAdaptiveMultiPriVxFinderTool.h b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/InDetPriVxFinderTool/InDetAdaptiveMultiPriVxFinderTool.h
index 1a11f778df8c7182787896f943e3887ea7c2157a..fc13d75322bea20810caec61188eb6a2b04db8f1 100755
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/InDetPriVxFinderTool/InDetAdaptiveMultiPriVxFinderTool.h
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/InDetPriVxFinderTool/InDetAdaptiveMultiPriVxFinderTool.h
@@ -111,7 +111,6 @@ namespace Trk {
class Track;
class ITrackLink;
class TrkQuality;
-class IVxCandidateXAODVertex;
}
namespace InDet {
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/InDetPriVxFinderTool/InDetIterativePriVxFinderTool.h b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/InDetPriVxFinderTool/InDetIterativePriVxFinderTool.h
index 177d3bbb7367128eb48b39db09d406cf0b2c3292..d67c4357f88d5ea55c836d8f743b816622b9d8c0 100755
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/InDetPriVxFinderTool/InDetIterativePriVxFinderTool.h
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/InDetPriVxFinderTool/InDetIterativePriVxFinderTool.h
@@ -61,8 +61,6 @@
namespace Trk {
class Track;
class ITrackLink;
-
-class IVxCandidateXAODVertex;
}
namespace InDet {
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/CMakeLists.txt b/Tracking/TrkVertexFitter/TrkVxEdmCnv/CMakeLists.txt
deleted file mode 100644
index b8d430b16a95901c0b6808c0d6d4de042919eddb..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( TrkVxEdmCnv )
-
-# Component(s) in the package:
-atlas_add_library( TrkVxEdmCnvLib
- src/*.cxx
- PUBLIC_HEADERS TrkVxEdmCnv
- LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel TrkVertexFitterInterfaces
- PRIVATE_LINK_LIBRARIES TrkLinks TrkTrackLink VxVertex )
-
-atlas_add_component( TrkVxEdmCnv
- src/components/*.cxx
- LINK_LIBRARIES TrkVxEdmCnvLib )
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/ATLAS_CHECK_THREAD_SAFETY b/Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/ATLAS_CHECK_THREAD_SAFETY
deleted file mode 100644
index 926c82d7734fb75326ea7ea1f41f1b9bf5445cc5..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/ATLAS_CHECK_THREAD_SAFETY
+++ /dev/null
@@ -1 +0,0 @@
-Tracking/TrkVertexFitter/TrkVxEdmCnv
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/IVxCandidateXAODVertex.h b/Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/IVxCandidateXAODVertex.h
deleted file mode 100644
index 9b6eba7255af3401c78ad93ea58bf95c4e3276ad..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/IVxCandidateXAODVertex.h
+++ /dev/null
@@ -1,79 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// IVxCandidateXAODVertex.h
-// Header file for class IVxCandidateXAODVertex
-// Author: S.Pagan Griso <simone.pagan.griso@cern.ch>
-///////////////////////////////////////////////////////////////////
-#ifndef TRKVXEDMCVN_IVXCANDIDATEXAODVERTEX_H
-#define TRKVXEDMCVN_IVXCANDIDATEXAODVERTEX_H
-
-// FrameWork includes
-#include "GaudiKernel/IAlgTool.h"
-
-// Forward declaration
-#include "xAODTracking/Vertex.h"
-#include "xAODTracking/TrackParticle.h"
-namespace Trk {
- class VxCandidate;
-}
-class VxContainer;
-
-
-namespace Trk {
-static const InterfaceID IID_IVxCandidateXAODVertex("IVxCandidateXAODVertex", 1, 0);
-
-/**
- * @class Trk::IVxCandidateXAODVertex
- *
- * Interface class to hold conversion of xAOD EDM to/from vertex internal EDM.
- *
- * @author: S. Pagan Griso <simone.pagan.griso@cern.ch>
- */
-
-
-class IVxCandidateXAODVertex
- : virtual public ::IAlgTool
-{
-
- public:
-
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
- static const InterfaceID& interfaceID() { return IID_IVxCandidateXAODVertex; };
-
-
- /*
- * Virtual destructor.
- */
- virtual ~IVxCandidateXAODVertex()=default;
-
- ///////////////////////////////////////////////////////////////////
- // Non-const methods:
- ///////////////////////////////////////////////////////////////////
- /**
- * Convert xAOD::Vertex to a VxCandidate.
- * @param xAODVx input object
- * @param vxVertex return object, owned by the clients.
- */
- virtual StatusCode createVxCandidate(const xAOD::Vertex& xAODVx,
- Trk::VxCandidate*& vxVertex) const = 0;
-
- /**
- * Convert a VxCandidate to a VxVertex. Return object is own by the clients.
- * If a null pointer is given as output, then a new object is created with its
- * own AuxStore. Otherwise pass a new xAOD::Vertex object already attached to
- * an aux store (preferred).
- * @param vxVertex input object
- * @param xAODVx return object, owned by the clients
- */
- virtual StatusCode createXAODVertex(const Trk::VxCandidate& vxVertex,
- xAOD::Vertex*& xAODVx) const = 0;
-};
-
-} //namespace Trk
-#endif //> !TRKVXEDMCVN_IVXCANDIDATEXAODVERTEX_H
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/VxCandidateXAODVertex.h b/Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/VxCandidateXAODVertex.h
deleted file mode 100644
index d341182a68cc2c665684c8646f9bdeadcaff97c1..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/VxCandidateXAODVertex.h
+++ /dev/null
@@ -1,83 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// VxCandidateXAODVertex.h
-// Header file for class VxCandidateXAODVertex
-// Author: S.Binet<binet@cern.ch>
-///////////////////////////////////////////////////////////////////
-#ifndef VXEDMXAODCNV_VXCANDIDATEXAODVERTEX_H
-#define VXEDMXAODCNV_VXCANDIDATEXAODVERTEX_H
-
-
-#include "IVxCandidateXAODVertex.h"
-#include "TrkVertexFitterInterfaces/IVertexLinearizedTrackFactory.h"
-
-// STL includes
-#include <string>
-
-// FrameWork includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
-
-
-namespace Trk {
-
-class VxCandidateXAODVertex
- : virtual public IVxCandidateXAODVertex,
- public ::AthAlgTool
-{
-
- ///////////////////////////////////////////////////////////////////
- // Public methods:
- ///////////////////////////////////////////////////////////////////
- public:
-
-
- // Copy constructor:
-
- /// Constructor with parameters:
- VxCandidateXAODVertex( const std::string& type,
- const std::string& name,
- const IInterface* parent );
-
- /// Destructor:
- virtual ~VxCandidateXAODVertex() = default;
-
- // Athena algtool's Hooks
- virtual StatusCode initialize() override;
-
- ///////////////////////////////////////////////////////////////////
- // Non-const methods:
- ///////////////////////////////////////////////////////////////////
- /**
- * Convert xAOD::Vertex to a VxCandidate. Return object is own by the clients.
- */
- virtual StatusCode createVxCandidate(
- const xAOD::Vertex& xAODVx,
- Trk::VxCandidate*& vxVertex) const override;
-
- /**
- * Convert a VxCandidate to a VxVertex. Return object is own by the clients.
- */
- virtual StatusCode createXAODVertex(const Trk::VxCandidate& vxVertex,
- xAOD::Vertex*& xAODVx) const override;
-
- ///////////////////////////////////////////////////////////////////
- // Private data:
- ///////////////////////////////////////////////////////////////////
-private:
-
- /// Default constructor:
- VxCandidateXAODVertex();
-
- ToolHandle<Trk::IVertexLinearizedTrackFactory> m_LinearizedTrackFactory;
-
-};
-
-} // end namespace Trk
-
-#endif //> !VXEDMXAODCNV_VXCANDIDATEXAODVERTEX_H
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/VxCandidateXAODVertex.cxx b/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/VxCandidateXAODVertex.cxx
deleted file mode 100644
index 52e2889c857c0539ae8cbd3584130599db5e8e6b..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/VxCandidateXAODVertex.cxx
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-
-///////////////////////// -*- C++ -*- /////////////////////////////
-// VxCandidateXAODVertex.cxx
-// Implementation file for class VxCandidateXAODVertex
-// Author: S.Binet<binet@cern.ch>
-///////////////////////////////////////////////////////////////////
-
-// VxEdmXAODCnv includes
-#include "TrkVxEdmCnv/VxCandidateXAODVertex.h"
-
-// STL includes
-
-// FrameWork includes
-#include "GaudiKernel/IToolSvc.h"
-
-#include "xAODTracking/Vertex.h"
-#include "xAODTracking/TrackParticle.h"
-
-#include "VxVertex/VxCandidate.h"
-#include "VxVertex/VxContainer.h"
-#include "VxVertex/VxTrackAtVertex.h"
-#include "TrkTrackLink/ITrackLink.h"
-#include "TrkLinks/LinkToXAODTrackParticle.h"
-#include "TrkLinks/LinkToXAODNeutralParticle.h"
-
-
-
-namespace Trk{
-///////////////////////////////////////////////////////////////////
-// Public methods:
-///////////////////////////////////////////////////////////////////
-
-// Constructors
-////////////////
-VxCandidateXAODVertex::VxCandidateXAODVertex( const std::string& type,
- const std::string& name,
- const IInterface* parent ) :
- ::AthAlgTool ( type, name, parent ),
- m_LinearizedTrackFactory("Trk::InDetFullLinearizedTrackFactory", this)
-{
- declareInterface< IVxCandidateXAODVertex >(this);
- //
- // Property declaration
- //
- declareProperty("LinearizedTrackFactory",m_LinearizedTrackFactory);
-
-}
-
-
-// Athena algtool's Hooks
-////////////////////////////
-StatusCode VxCandidateXAODVertex::initialize()
-{
- ATH_MSG_VERBOSE ("Initializing " << name() << "...");
-
- // initialize Linearized Track Factory for VxTrackAtVertex creation
- if ( m_LinearizedTrackFactory.retrieve().isFailure() ) {
- ATH_MSG_WARNING("Failed to retrieve tool " << m_LinearizedTrackFactory << ". Creation of VxCandidate from xAOD::Vertex only partially possible.");
- }
- return StatusCode::SUCCESS;
-}
-
-
-///////////////////////////////////////////////////////////////////
-// Public methods:
-///////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////
-// Protected methods:
-///////////////////////////////////////////////////////////////////
-
- StatusCode VxCandidateXAODVertex::createVxCandidate(const xAOD::Vertex &xAODVx, Trk::VxCandidate* &vxVertex) const
- {
- if (vxVertex) {
- ATH_MSG_WARNING("Passed a valid pointer as return object. It will be overwritten: potential memory leak!");
- }
- //create vxTrackAtVertex linearizing with respect to vertex
- std::vector <Trk::VxTrackAtVertex*> tavCollection;
- bool xaod_no_tracks = true;
-//check whether there are already VxTracksAtVertex here
-#ifndef XAOD_STANDALONE
- if(xAODVx.vxTrackAtVertexAvailable())
- {
-//ok there are some, let us convert them
-// remember that the VxCandidate takes over the ownership, so it needs a copy..
-
- const std::vector< Trk::VxTrackAtVertex >& vtv = xAODVx.vxTrackAtVertex();
- unsigned int vtv_size = vtv.size();
- for(unsigned int i = 0;i<vtv_size;++i) tavCollection.push_back(vtv.at(i).clone());
- xaod_no_tracks = false;
- }//end of the VxTrackAtVertex conversion
-
-#endif
-
-
- //if they were not coming from xAOD, let us create them on the spot
- if(xaod_no_tracks)
- {
- // This is really ugly! This will make a copy of each ElementLink object
- // during the loop. But because Trk::LinkToXAODTrackParticle expects a
- // non-const reference (why???), we can't use "const auto&" as the type.
- for (auto t : xAODVx.trackParticleLinks())
- {
- Trk::VxTrackAtVertex *tav = new VxTrackAtVertex();
-
- //create ITrackLink to xAOD::TrackParticle
- Trk::LinkToXAODTrackParticle *elTrackParticle = new Trk::LinkToXAODTrackParticle( t );
- tav->setOrigTrack(elTrackParticle);
-
- //linearize with respect to given vertex (do we need/want it here?)
- Trk::LinearizedTrack* myLinearizedTrack=m_LinearizedTrackFactory->linearizedTrack(elTrackParticle->parameters(),xAODVx.position());
- tav->setLinTrack(myLinearizedTrack);
-
- //TODO: do we need/want to calculate other quantities?
- // - *m_initialPerigee
- // - m_perigeeAtVertex
- // - m_ImpactPoint3dAtaPlane
- // - m_VertexCompatibility
- // - m_trkWeight
- // - *m_fitQuality
-
- //push back into collection
- tavCollection.push_back(tav);
- }//end of loop over all tracks
- //Same for neutrals
- for (auto t : xAODVx.neutralParticleLinks()) {
- Trk::VxTrackAtVertex *tav = new VxTrackAtVertex();
- //create ITrackLink to xAOD::NeutralParticle
- Trk::LinkToXAODNeutralParticle *elNeutralParticle = new Trk::LinkToXAODNeutralParticle( t );
- tav->setOrigTrack(elNeutralParticle);
- //linearize with respect to given vertex (do we need/want it here?)
- Trk::LinearizedTrack* myLinearizedTrack=m_LinearizedTrackFactory->linearizedTrack(elNeutralParticle->neutralParameters(),xAODVx.position());
- tav->setLinTrack(myLinearizedTrack);
- //push back into collection
- tavCollection.push_back(tav);
- }//end of loop over all neutrals
- }//end of the xod check
-
- RecVertex recVtx(xAODVx.position(), xAODVx.covariancePosition(), xAODVx.numberDoF(), xAODVx.chiSquared());
- vxVertex = new VxCandidate(recVtx, tavCollection);
- //TODO: only one enum should survive!
- vxVertex->setVertexType((Trk::VertexType)xAODVx.vertexType());
-
- return StatusCode::SUCCESS;
- }
-
- StatusCode VxCandidateXAODVertex::createXAODVertex(const Trk::VxCandidate &vxVertex, xAOD::Vertex* &xAODVx) const
- {
-
- ATH_MSG_DEBUG("Creating new xAOD vertex from VxCandidate ");
- ATH_MSG_VERBOSE(vxVertex);
- if (!xAODVx) {
- xAODVx = new xAOD::Vertex();
- xAODVx->makePrivateStore();
- ATH_MSG_VERBOSE("Internal Aux store implicitly associated to the new VxVertex object. Pass a valid xAODVx pointer for output for optimal performance.");
- }
-
- // set type, position, covariance and fit quality
- xAODVx->setVertexType((xAOD::VxType::VertexType)vxVertex.vertexType());
- xAODVx->setPosition(vxVertex.recVertex().position());
- xAODVx->setCovariancePosition(vxVertex.recVertex().covariancePosition());
- xAODVx->setFitQuality(vxVertex.recVertex().fitQuality().chiSquared(), static_cast<float>(vxVertex.recVertex().fitQuality().doubleNumberDoF ()));
-
- //now set links to xAOD::TrackParticles
- unsigned int VTAVsize = vxVertex.vxTrackAtVertex()->size();
- for (unsigned int i = 0 ; i < VTAVsize ; ++i)
- {
- Trk::VxTrackAtVertex* VTAV = vxVertex.vxTrackAtVertex()->at(i);
- if (not VTAV){ //added check on VTAV here, instead of inside the ifndef sroe 4 March 2015
- ATH_MSG_WARNING (" Trying to convert to xAOD::Vertex a Trk::VxCandidate. The VxTrackAtVertex is not found");
- continue;
- }
-#ifndef XAOD_STANDALONE
- xAODVx->vxTrackAtVertex().push_back(*VTAV);
-#endif
-
- Trk::ITrackLink* trklink = VTAV->trackOrParticleLink();
- Trk::LinkToXAODTrackParticle* linkToXAODTP = dynamic_cast<Trk::LinkToXAODTrackParticle*>(trklink);
- if (linkToXAODTP)
- {
- //Now set the newlink to the new xAOD vertex
- xAODVx->addTrackAtVertex(*linkToXAODTP, VTAV->weight());
- } else {
- Trk::LinkToXAODNeutralParticle* linkToXAODTPneutral = dynamic_cast<Trk::LinkToXAODNeutralParticle*>(trklink);
- if (!linkToXAODTPneutral)
- ATH_MSG_WARNING ("Skipping track. Trying to convert to xAOD::Vertex a Trk::VxCandidate with links to something else than xAOD::TrackParticle or xAOD::NeutralParticle.");
- else
- //Now set the newlink to the new xAOD vertex
- xAODVx->addNeutralAtVertex(*linkToXAODTPneutral, VTAV->weight());
- }
- }//end of loop
-
- ATH_MSG_DEBUG("Successfully created new xAOD::Vertex " << xAODVx);
- return StatusCode::SUCCESS;
- }
-
-} //end namespace Trk
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx b/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx
deleted file mode 100644
index e70485a87f1e03c92553af362654358cac93558a..0000000000000000000000000000000000000000
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "TrkVxEdmCnv/VxCandidateXAODVertex.h"
-
-using namespace Trk;
-
-DECLARE_COMPONENT( VxCandidateXAODVertex )
-