From 3cb187eafaec1e556088f52db691df30d2f39e0a Mon Sep 17 00:00:00 2001
From: Andreas Salzburger <Andreas.Salzburger@cern.ch>
Date: Wed, 11 Oct 2017 16:16:46 +0200
Subject: [PATCH] Fix Geant4 and PYTHIA8 related compilation problems closes
and fixes ACTSFW-90
---
Algorithms/MaterialMapping/src/GeantinoRecording.cpp | 4 ++--
Plugins/Geant4/src/MMPrimaryGeneratorAction.cpp | 2 +-
Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.cpp | 2 --
Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.hpp | 3 +--
Plugins/Pythia8/CMakeLists.txt | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Algorithms/MaterialMapping/src/GeantinoRecording.cpp b/Algorithms/MaterialMapping/src/GeantinoRecording.cpp
index bdab5aa4..58bccd93 100644
--- a/Algorithms/MaterialMapping/src/GeantinoRecording.cpp
+++ b/Algorithms/MaterialMapping/src/GeantinoRecording.cpp
@@ -14,8 +14,8 @@
FW::GeantinoRecording::GeantinoRecording(
const FW::GeantinoRecording::Config& cnf,
- std::unique_ptr<const Acts::Logger> logger)
- : FW::BareAlgorithm("GeantinoRecording", level),
+ Acts::Logging::Level level)
+ : FW::BareAlgorithm("GeantinoRecording", level)
, m_cfg(cnf)
, m_runManager(std::make_unique<G4RunManager>())
{
diff --git a/Plugins/Geant4/src/MMPrimaryGeneratorAction.cpp b/Plugins/Geant4/src/MMPrimaryGeneratorAction.cpp
index 0a4aae5a..b078401c 100644
--- a/Plugins/Geant4/src/MMPrimaryGeneratorAction.cpp
+++ b/Plugins/Geant4/src/MMPrimaryGeneratorAction.cpp
@@ -17,7 +17,7 @@ FW::G4::MMPrimaryGeneratorAction::MMPrimaryGeneratorAction(
G4int randomSeed1,
G4int randomSeed2)
: G4VUserPrimaryGeneratorAction()
- , fParticleGun(0)
+ , fParticleGun(nullptr)
{
// configure the run
if(fgInstance) {
diff --git a/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.cpp b/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.cpp
index 02b1d4cc..a6d0c77c 100644
--- a/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.cpp
+++ b/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.cpp
@@ -1,9 +1,7 @@
#include "ACTFW/Plugins/Pythia8/TPythia8Generator.hpp"
-
#include <TClonesArray.h>
#include <TDatabasePDG.h>
#include <TParticle.h>
-#include <TPythia8.h>
#include <TSystem.h>
#include <ACTS/Utilities/Units.hpp>
diff --git a/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.hpp b/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.hpp
index b181e7c6..4278e7c6 100644
--- a/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.hpp
+++ b/Plugins/Pythia8/ACTFW/Plugins/Pythia8/TPythia8Generator.hpp
@@ -12,8 +12,7 @@
#include "ACTS/EventData/ParticleDefinitions.hpp"
#include "ACTS/Utilities/Logger.hpp"
#include "ACTFW/Readers/IReaderT.hpp"
-
-class TPythia8;
+#include <TPythia8.h>
namespace FW {
namespace Pythia8 {
diff --git a/Plugins/Pythia8/CMakeLists.txt b/Plugins/Pythia8/CMakeLists.txt
index 47f86e98..7081107c 100644
--- a/Plugins/Pythia8/CMakeLists.txt
+++ b/Plugins/Pythia8/CMakeLists.txt
@@ -1,7 +1,7 @@
add_library(ACTFWPluginPythia8 SHARED ACTFW/Plugins/Pythia8/TPythia8Generator.cpp)
target_include_directories(ACTFWPluginPythia8 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
target_include_directories(ACTFWPluginPythia8 PUBLIC ${ROOT_INCLUDE_DIRS})
-target_include_directories(ACTFWPluginPythia8 PRIVATE ${PYTHIA8_INCLUDEDIR})
+target_include_directories(ACTFWPluginPythia8 PUBLIC ${PYTHIA8_INCLUDEDIR})
target_link_libraries(ACTFWPluginPythia8 PUBLIC ACTS::ACTSCore ACTFramework)
target_link_libraries(ACTFWPluginPythia8 PUBLIC ${ROOT_LIBRARIES})
target_link_libraries(ACTFWPluginPythia8 PRIVATE -L${PYTHIA8_LIBRARYDIR})
--
GitLab