From 885bfd1d2486d41e6ea770f698e9f81ea47dfec5 Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 17:13:05 +0200
Subject: [PATCH] 'CMakeLists.txt' (VxJetVertex-00-04-03)
* Fix Coverity issues 13164,12359,12360
* tag as VxJetVertex-00-04-03
---
Tracking/TrkEvent/VxJetVertex/CMakeLists.txt | 36 +++++++++++++++++++
.../VxJetVertex/src/VertexPositions.cxx | 2 +-
.../VxJetVertex/src/VxJetCandidate.cxx | 8 +++--
3 files changed, 43 insertions(+), 3 deletions(-)
create mode 100644 Tracking/TrkEvent/VxJetVertex/CMakeLists.txt
diff --git a/Tracking/TrkEvent/VxJetVertex/CMakeLists.txt b/Tracking/TrkEvent/VxJetVertex/CMakeLists.txt
new file mode 100644
index 000000000000..dbf1011b46e7
--- /dev/null
+++ b/Tracking/TrkEvent/VxJetVertex/CMakeLists.txt
@@ -0,0 +1,36 @@
+################################################################################
+# Package: VxJetVertex
+################################################################################
+
+# Declare the package name:
+atlas_subdir( VxJetVertex )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Event/EventPrimitives
+ GaudiKernel
+ Tracking/TrkEvent/TrkEventPrimitives
+ Tracking/TrkEvent/TrkParticleBase
+ Tracking/TrkEvent/TrkTrack
+ Tracking/TrkEvent/TrkTrackLink
+ Tracking/TrkEvent/VxVertex
+ PRIVATE
+ Control/DataModel )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_library( VxJetVertex
+ src/*.cxx
+ PUBLIC_HEADERS VxJetVertex
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES EventPrimitives GaudiKernel TrkEventPrimitives TrkParticleBase TrkTrack VxVertex
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel )
+
+atlas_add_dictionary( VxJetVertexDict
+ VxJetVertex/VxJetVertexDict.h
+ VxJetVertex/selection.xml
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} EventPrimitives GaudiKernel TrkEventPrimitives TrkParticleBase TrkTrack VxVertex DataModel VxJetVertex )
+
diff --git a/Tracking/TrkEvent/VxJetVertex/src/VertexPositions.cxx b/Tracking/TrkEvent/VxJetVertex/src/VertexPositions.cxx
index 0ef511448d6c..3cae3a2ee8a9 100755
--- a/Tracking/TrkEvent/VxJetVertex/src/VertexPositions.cxx
+++ b/Tracking/TrkEvent/VxJetVertex/src/VertexPositions.cxx
@@ -105,7 +105,7 @@ namespace Trk {
std::cout << "FATAL: VertexPositions is not able to return a valid position " <<
" as a const object: need to go from Update to Use mode. Unrecovered Bug!" << std::endl;
throw;
- return m_position;
+ // return m_position;
}
diff --git a/Tracking/TrkEvent/VxJetVertex/src/VxJetCandidate.cxx b/Tracking/TrkEvent/VxJetVertex/src/VxJetCandidate.cxx
index 6cfb9d90f8c8..9fd5a871bc32 100755
--- a/Tracking/TrkEvent/VxJetVertex/src/VxJetCandidate.cxx
+++ b/Tracking/TrkEvent/VxJetVertex/src/VxJetCandidate.cxx
@@ -198,7 +198,9 @@ namespace Trk {
ITrackLink* IlinkTT=(*tracksIter)->trackOrParticleLink();
LinkToTrack* linkTT=dynamic_cast<LinkToTrack*>(IlinkTT);
- linkTT->setStorableObject(*trackTES);
+ if(linkTT) {
+ linkTT->setStorableObject(*trackTES);
+ }
(*tracksIter)->setOrigTrack(linkTT);
}
@@ -215,7 +217,9 @@ namespace Trk {
ITrackLink* IlinkTT=(*tracksIter)->trackOrParticleLink();
LinkToTrackParticleBase* linkTT=dynamic_cast<LinkToTrackParticleBase*>(IlinkTT);
- linkTT->setStorableObject(*trackParticleTES);
+ if(linkTT) {
+ linkTT->setStorableObject(*trackParticleTES);
+ }
(*tracksIter)->setOrigTrack(linkTT);
}
--
GitLab