Cleanup after the migration of the AthSimulation to AtlasHepMC

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"

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:

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

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);

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

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"