From 8fff76ffb39fbc4af15dd0f1b32a8cbd1357918f Mon Sep 17 00:00:00 2001
From: Andrii Verbytskyi <averbyts@cern.ch>
Date: Fri, 24 Apr 2020 16:34:21 +0200
Subject: [PATCH] Cleanup after the migration of the AthSimulation to
AtlasHepMC
---
Simulation/BeamEffects/src/BeamEffectsAlg.cxx | 3 ++-
.../FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h | 2 --
.../G4UserActions/src/AthenaDebugStackingAction.cxx | 4 ++--
.../G4Utilities/G4UserActions/src/AthenaStackingAction.cxx | 2 +-
Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt | 2 +-
.../src/NativeFastCaloSimSvc.cxx | 6 +++---
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Simulation/BeamEffects/src/BeamEffectsAlg.cxx b/Simulation/BeamEffects/src/BeamEffectsAlg.cxx
index 3c51ff94dbe..6f583965b5a 100644
--- a/Simulation/BeamEffects/src/BeamEffectsAlg.cxx
+++ b/Simulation/BeamEffects/src/BeamEffectsAlg.cxx
@@ -11,7 +11,8 @@
#include "StoreGate/WriteHandle.h"
// HepMC includes
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenVertex.h"
// CLHEP includes
#include "CLHEP/Vector/LorentzVector.h"
diff --git a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
index 91e0b289f4c..d9a5fb4bdbd 100755
--- a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
+++ b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
@@ -160,8 +160,6 @@ private:
ParticleEnergyParametrization* findEupper(int id,double E,double eta) const;
const TShape_Result* findShape (int id,int calosample,double E,double eta,double dist,double distrange) const;
- //void sum_par(const HepMC::GenParticle* par,MsgStream& log,std::vector<double>& sums,int level=0);
- //void print_par(const HepMC::GenParticle* par,MsgStream& log,int level=0);
public:
diff --git a/Simulation/G4Utilities/G4UserActions/src/AthenaDebugStackingAction.cxx b/Simulation/G4Utilities/G4UserActions/src/AthenaDebugStackingAction.cxx
index fde0d3d0614..143d735401c 100644
--- a/Simulation/G4Utilities/G4UserActions/src/AthenaDebugStackingAction.cxx
+++ b/Simulation/G4Utilities/G4UserActions/src/AthenaDebugStackingAction.cxx
@@ -111,7 +111,7 @@ namespace G4UA
if(ppi) {
if (!m_config.isISFJob) {
// don't do anything
- const HepMC::GenParticle* part = ppi->GetHepMCParticle();
+ auto part = ppi->GetHepMCParticle();
if(part) {
// OK, we got back to HepMC
std::unique_ptr<TrackInformation> ti = std::make_unique<TrackInformation>(part);
@@ -143,4 +143,4 @@ namespace G4UA
return fUrgent;
}
-} // namespace G4UA
\ No newline at end of file
+} // namespace G4UA
diff --git a/Simulation/G4Utilities/G4UserActions/src/AthenaStackingAction.cxx b/Simulation/G4Utilities/G4UserActions/src/AthenaStackingAction.cxx
index 49c400a79fa..058bc922760 100644
--- a/Simulation/G4Utilities/G4UserActions/src/AthenaStackingAction.cxx
+++ b/Simulation/G4Utilities/G4UserActions/src/AthenaStackingAction.cxx
@@ -111,7 +111,7 @@ namespace G4UA
if(ppi) {
if (!m_config.isISFJob) {
// don't do anything
- const HepMC::GenParticle* part = ppi->GetHepMCParticle();
+ auto part = ppi->GetHepMCParticle();
if(part) {
// OK, we got back to HepMC
std::unique_ptr<TrackInformation> ti = std::make_unique<TrackInformation>(part);
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt
index 8dc7cb1a101..d31bed16612 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Services/CMakeLists.txt
@@ -93,7 +93,7 @@ atlas_add_test( TruthSvc_test
${GMOCK_LIBRARIES}
${ROOT_LIBRARIES}
${GEANT4_LIBRARIES}
- ${HEPMC_LIBRARIES}
+ AtlasHepMCLib
${CLHEP_LIBRARIES}
${HEPPDT_LIBRARIES}
GaudiKernel
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/NativeFastCaloSimSvc.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/NativeFastCaloSimSvc.cxx
index 0b19bb1a2a8..b88ed7d1b99 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/NativeFastCaloSimSvc.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/NativeFastCaloSimSvc.cxx
@@ -18,9 +18,9 @@
#include "ISF_Event/ISFParticleContainer.h"
// HepMC include needed for FastCaloSim
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/SimpleVector.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
#include "CLHEP/Units/SystemOfUnits.h"
// McEventCollection
#include "GeneratorObjects/McEventCollection.h"
--
GitLab