Skip to content
Snippets Groups Projects
Commit dbc86b3f authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (TrkVxEdmCnv-00-01-09)

parent 35dd6eec
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Tracking/TrkVertexFitter/TrkVxEdmCnv/CMakeLists.txt 0 → 100644
+ 31
− 0
View file @ dbc86b3f
################################################################################
# Package: TrkVxEdmCnv
################################################################################
# Declare the package name:
atlas_subdir( TrkVxEdmCnv )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Event/xAOD/xAODTracking
GaudiKernel
PRIVATE
Control/StoreGate
Tracking/TrkEvent/TrkLinks
Tracking/TrkEvent/TrkTrackLink
Tracking/TrkEvent/VxVertex
Tracking/TrkVertexFitter/TrkVertexFitterInterfaces )
# Component(s) in the package:
atlas_add_library( TrkVxEdmCnvLib
src/*.cxx
src/components/*.cxx
PUBLIC_HEADERS TrkVxEdmCnv
LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES TrkLinks VxVertex TrkVertexFitterInterfaces )
atlas_add_component( TrkVxEdmCnv
src/components/*.cxx
LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel StoreGateLib SGtests TrkLinks VxVertex TrkVertexFitterInterfaces TrkVxEdmCnvLib )
Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/IVxCandidateXAODVertex.h
+ 4
− 4
View file @ dbc86b3f
......@@ -64,7 +64,7 @@ class IVxCandidateXAODVertex
* @param xAODVx input object
* @param vxVertex return object, owned by the clients.
*/
virtual StatusCode createVxCandidate(xAOD::Vertex &xAODVx, Trk::VxCandidate* &vxVertex) = 0;
virtual StatusCode createVxCandidate(const xAOD::Vertex &xAODVx, Trk::VxCandidate* &vxVertex) = 0;
/**
* Convert a VxCandidate to a VxVertex. Return object is own by the clients.
......@@ -73,7 +73,7 @@ class IVxCandidateXAODVertex
* @param vxVertex input object
* @param xAODVx return object, owned by the clients
*/
virtual StatusCode createXAODVertex(Trk::VxCandidate &vxVertex, xAOD::Vertex* &xAODVx) = 0;
virtual StatusCode createXAODVertex(const Trk::VxCandidate &vxVertex, xAOD::Vertex* &xAODVx) = 0;
/**
* Convert a xAOD::VertexContainer to a VxContainer
......@@ -81,7 +81,7 @@ class IVxCandidateXAODVertex
* @param vxContainer output container of Trk::VxCandidate objects
* @param vxCandidateContainerName register output to storegate if different from null string
*/
virtual StatusCode createVxContainer(xAOD::VertexContainer &xAODVxContainer, VxContainer* &vxContainer, std::string vxCandidateContainerName="") = 0;
virtual StatusCode createVxContainer(const xAOD::VertexContainer &xAODVxContainer, VxContainer* &vxContainer, std::string vxCandidateContainerName="") = 0;
/** Convert a VxContainer to a xAOD::VertexContainer with its own aux store.
* @param vxContainer input @c VxContainer object
......@@ -89,7 +89,7 @@ class IVxCandidateXAODVertex
* @param xAODAuxContainer output @c xAOD::VertexAuxContainer object
* @param xAODContainerName output container key, will be used to store it in StoreGate if provided
*/
virtual StatusCode createXAODVertexContainer(VxContainer &vxContainer,
virtual StatusCode createXAODVertexContainer(const VxContainer &vxContainer,
xAOD::VertexContainer* &xAODVxContainer, xAOD::VertexAuxContainer* &xAODVxAuxContainer,
std::string xAODContainerName="") = 0;
......
Tracking/TrkVertexFitter/TrkVxEdmCnv/TrkVxEdmCnv/VxCandidateXAODVertex.h
+ 4
− 4
View file @ dbc86b3f
......@@ -59,12 +59,12 @@ class VxCandidateXAODVertex
/**
* Convert xAOD::Vertex to a VxCandidate. Return object is own by the clients.
*/
virtual StatusCode createVxCandidate(xAOD::Vertex &xAODVx, Trk::VxCandidate* &vxVertex);
virtual StatusCode createVxCandidate(const xAOD::Vertex &xAODVx, Trk::VxCandidate* &vxVertex);
/**
* Convert a VxCandidate to a VxVertex. Return object is own by the clients.
*/
virtual StatusCode createXAODVertex(Trk::VxCandidate &vxVertex, xAOD::Vertex* &xAODVx);
virtual StatusCode createXAODVertex(const Trk::VxCandidate &vxVertex, xAOD::Vertex* &xAODVx);
/** Convert a VxContainer to a xAOD::VertexContainer with its own aux store.
* @param vxContainer input @c VxContainer object
......@@ -72,14 +72,14 @@ class VxCandidateXAODVertex
* @param xAODAuxContainer output @c xAOD::VertexAuxContainer object
* @param xAODContainerName output container key, will be used to store it in StoreGate if provided
*/
virtual StatusCode createXAODVertexContainer(VxContainer &vxContainer,
virtual StatusCode createXAODVertexContainer(const VxContainer &vxContainer,
xAOD::VertexContainer* &xAODVxContainer, xAOD::VertexAuxContainer* &xAODVxAuxContainer,
std::string xAODContainerName="");
/**
* Convert a xAOD::VertexContainer to a VxContainer
*/
virtual StatusCode createVxContainer(xAOD::VertexContainer &xAODVxContainer, VxContainer* &vxContainer, std::string vxCandidateContainerName="");
virtual StatusCode createVxContainer(const xAOD::VertexContainer &xAODVxContainer, VxContainer* &vxContainer, std::string vxCandidateContainerName="");
///////////////////////////////////////////////////////////////////
// Private data:
......
Tracking/TrkVertexFitter/TrkVxEdmCnv/src/VxCandidateXAODVertex.cxx
+ 34
− 30
View file @ dbc86b3f
......@@ -66,20 +66,18 @@ VxCandidateXAODVertex::~VxCandidateXAODVertex()
////////////////////////////
StatusCode VxCandidateXAODVertex::initialize()
{
ATH_MSG_INFO ("Initializing " << name() << "...");
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;
}
StatusCode VxCandidateXAODVertex::finalize()
{
ATH_MSG_INFO ("Finalizing " << name() << "...");
ATH_MSG_VERBOSE ("Finalizing " << name() << "...");
return StatusCode::SUCCESS;
}
......@@ -92,16 +90,13 @@ StatusCode VxCandidateXAODVertex::finalize()
// Protected methods:
///////////////////////////////////////////////////////////////////
StatusCode VxCandidateXAODVertex::createVxCandidate(xAOD::Vertex &xAODVx, Trk::VxCandidate* &vxVertex)
StatusCode VxCandidateXAODVertex::createVxCandidate(const xAOD::Vertex &xAODVx, Trk::VxCandidate* &vxVertex)
{
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
......@@ -116,7 +111,6 @@ StatusCode VxCandidateXAODVertex::finalize()
xaod_no_tracks = false;
}//end of the VxTrackAtVertex conversion
#endif
......@@ -173,7 +167,7 @@ StatusCode VxCandidateXAODVertex::finalize()
return StatusCode::SUCCESS;
}
StatusCode VxCandidateXAODVertex::createXAODVertex(Trk::VxCandidate &vxVertex, xAOD::Vertex* &xAODVx)
StatusCode VxCandidateXAODVertex::createXAODVertex(const Trk::VxCandidate &vxVertex, xAOD::Vertex* &xAODVx)
{
ATH_MSG_DEBUG("Creating new xAOD vertex from VxCandidate ");
......@@ -195,25 +189,27 @@ StatusCode VxCandidateXAODVertex::finalize()
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
if(VTAV) xAODVx->vxTrackAtVertex().push_back(*VTAV);
else ATH_MSG_WARNING (" Trying to convert to xAOD::Vertex a Trk::VxCandidate. The VxTrackAtVertex is not found");
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());
//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());
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
......@@ -221,7 +217,7 @@ StatusCode VxCandidateXAODVertex::finalize()
return StatusCode::SUCCESS;
}
StatusCode VxCandidateXAODVertex::createXAODVertexContainer(VxContainer &vxContainer,
StatusCode VxCandidateXAODVertex::createXAODVertexContainer(const VxContainer &vxContainer,
xAOD::VertexContainer* &xAODVxContainer, xAOD::VertexAuxContainer* &xAODVxAuxContainer,
std::string xAODContainerName)
{
......@@ -234,7 +230,20 @@ StatusCode VxCandidateXAODVertex::finalize()
xAODVxContainer = new xAOD::VertexContainer();
xAODVxAuxContainer = new xAOD::VertexAuxContainer();
xAODVxContainer->setStore( xAODVxAuxContainer );
if (not xAODContainerName.empty()) {
if (evtStore()->contains<xAOD::VertexContainer>(xAODContainerName)) {
CHECK( evtStore()->overwrite( xAODVxAuxContainer, xAODContainerName + "Aux.",true,false) );
CHECK( evtStore()->overwrite( xAODVxContainer, xAODContainerName,true,false) );
ATH_MSG_DEBUG( "Overwrote Vertices with key: " << xAODContainerName);
}
else{
CHECK( evtStore()->record( xAODVxAuxContainer, xAODContainerName + "Aux." ) );
CHECK( evtStore()->record( xAODVxContainer,xAODContainerName ) );
ATH_MSG_DEBUG( "Recorded Vertices with key: " << xAODContainerName );
}
}
ATH_MSG_VERBOSE("Filling new xAOD container");
VxContainer::const_iterator vxCand;
for (vxCand = vxContainer.begin(); vxCand != vxContainer.end(); ++vxCand) {
......@@ -247,16 +256,11 @@ StatusCode VxCandidateXAODVertex::finalize()
//if (msgLvl(MSG::DEBUG)) {
// xAODVxAuxContainer->dump();
//}
if (not xAODContainerName.empty()) {
ATH_MSG_DEBUG("Storing new xAOD containers to StoreGate with name prefix: " << xAODContainerName);
CHECK( evtStore()->record( xAODVxContainer, xAODContainerName ) );
CHECK( evtStore()->record( xAODVxAuxContainer, xAODContainerName + "Aux." ) );
}
return StatusCode::SUCCESS;
}
StatusCode VxCandidateXAODVertex::createVxContainer(xAOD::VertexContainer &xAODVxContainer, VxContainer* &vxContainer, std::string vxCandidateContainerName)
StatusCode VxCandidateXAODVertex::createVxContainer(const xAOD::VertexContainer &xAODVxContainer, VxContainer* &vxContainer, std::string vxCandidateContainerName)
{
ATH_MSG_DEBUG("Creating new VxCandidate container from xAOD vertex container.");
if (vxContainer) {
......
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