From 651da5cb8d9ebdb3ae603c7936285098dbabd02c Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Wed, 25 Mar 2020 09:39:07 +0100
Subject: [PATCH] Updated VP1AODSystems to only depend on xAODRootAccess when
it really needs to.
At the same time simplified the CMake configuration a tiny bit as well.
---
graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt | 5 ++---
graphics/VP1/VP1Systems/VP1AODSystems/src/VP1AODSystem.cxx | 7 +------
.../VP1/VP1Systems/VP1AODSystems/src/VertexCollHandle.h | 2 --
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt
index 6ca48abd8e5..ff40e66988c 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt
@@ -48,8 +48,7 @@ if(NOT BUILDVP1LIGHT)
PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} GeoPrimitives EventPrimitives
xAODBase xAODCaloEvent xAODJet xAODMissingET PathResolver TrkExInterfaces
VP1HEPVis VP1Utils Qt5::Gui )
-endif()
-if(BUILDVP1LIGHT)
+else()
# Component(s) in the package:
atlas_add_library( VP1AODSystems
src/*.h VP1AODSystems/*.h src/*cxx
@@ -59,7 +58,7 @@ if(BUILDVP1LIGHT)
Qt5::Core Qt5::Gui
PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} GeoPrimitives EventPrimitives
xAODBase xAODCaloEvent xAODJet xAODMissingET PathResolver xAODEventInfo
- VP1HEPVis VP1Utils Qt5::Gui )
+ VP1HEPVis VP1Utils xAODRootAccess Qt5::Gui )
endif()
# Install files from the package:
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/VP1AODSystem.cxx b/graphics/VP1/VP1Systems/VP1AODSystems/src/VP1AODSystem.cxx
index 11116056829..cb336c30e83 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/VP1AODSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/VP1AODSystem.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -67,11 +67,6 @@
#include <QTreeWidget>
// XAOD
-#include "xAODRootAccess/Init.h"
-#include "xAODRootAccess/TEvent.h"
-#include "xAODRootAccess/TStore.h"
-#include "xAODRootAccess/tools/Message.h"
-#include "xAODRootAccess/TAuxStore.h"
#include "xAODCore/AuxContainerBase.h"
#include "xAODCore/tools/ReadStats.h"
#include "xAODCore/tools/IOStats.h"
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/src/VertexCollHandle.h b/graphics/VP1/VP1Systems/VP1AODSystems/src/VertexCollHandle.h
index 2e36aba5ddf..f1b8f96140b 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/src/VertexCollHandle.h
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/src/VertexCollHandle.h
@@ -26,8 +26,6 @@
//xAOD
#include "xAODBase/IParticle.h"
-#include "xAODRootAccess/TEvent.h"
-#include "xAODRootAccessInterfaces/TVirtualEvent.h"
// Qt
#include <QtGui/QColor>
--
GitLab