Merge branch 'hepmc3_nightly_fixes_04122020_part_5' into 'master'

Use HepMC3 compatible types for the recently created interfaces

See merge request atlas/athena!38873

Generators/GenInterfaces/GenInterfaces/IxAODtoHepMCTool.h

@@ -25,13 +25,10 @@
 #include "xAODEventInfo/EventInfo.h"
 #include "xAODTruth/TruthEventContainer.h"
 
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
 
-namespace HepMC {
-  class GenEvent;
-  class GenParticle;
-  class GenVertex;
-}
 
 class IxAODtoHepMCTool : public virtual asg::IAsgTool {
  public:

Generators/TruthConverters/TruthConverters/xAODtoHepMCTool.h

@@ -33,9 +33,9 @@ class xAODtoHepMCTool: public asg::AsgTool, public virtual IxAODtoHepMCTool {
 
  private:
    HepMC::GenEvent createHepMCEvent(const xAOD::TruthEvent* xEvt, const xAOD::EventInfo* eventInfo) const;
-   HepMC::GenVertex* vertexHelper(const xAOD::TruthVertex*,std::map<const xAOD::TruthVertex*,HepMC::GenVertex*>&,bool&) const;
-   HepMC::GenParticle* createHepMCParticle(const xAOD::TruthParticle*) const;
-   HepMC::GenVertex* createHepMCVertex(const xAOD::TruthVertex*) const;
+   HepMC::GenVertexPtr vertexHelper(const xAOD::TruthVertex*,std::map<const xAOD::TruthVertex*,HepMC::GenVertexPtr>&,bool&) const;
+   HepMC::GenParticlePtr createHepMCParticle(const xAOD::TruthParticle*) const;
+   HepMC::GenVertexPtr createHepMCVertex(const xAOD::TruthVertex*) const;
    void printxAODEvent(const xAOD::TruthEvent* event, const xAOD::EventInfo* eventInfo) const;
    
  private: