Adapt to new (v00-15) podio generated class names

- Replace some dedicated types with and rename others (Cluster -> MutableCluster, ConstCluster -> Cluster) to adapt to the new naming scheme introduced in AIDASoft/podio#205.
vvolkl · Feb 2, 2022 · 101e343 · 101e343
1 parent dd2489a
commit 101e343
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/k4Gen/src/components/HepEVTReader.cpp b/k4Gen/src/components/HepEVTReader.cpp
@@ -87,7 +87,7 @@ StatusCode HepEVTReader::execute()
 	  return StatusCode::FAILURE;
 	}
 
-      edm4hep::MCParticle particle = particles->create();
+      auto particle = particles->create();
 
       particle.setPDG(IDHEP);
       particle.setGeneratorStatus(ISTHEP); 

diff --git a/k4Gen/src/components/HepMCToEDMConverter.cpp b/k4Gen/src/components/HepMCToEDMConverter.cpp
@@ -6,8 +6,8 @@
 DECLARE_COMPONENT(HepMCToEDMConverter)
 
 
-edm4hep::MCParticle HepMCToEDMConverter::convert(std::shared_ptr<const HepMC3::GenParticle> hepmcParticle) {
-  edm4hep::MCParticle edm_particle;
+edm4hep::MutableMCParticle HepMCToEDMConverter::convert(std::shared_ptr<const HepMC3::GenParticle> hepmcParticle) {
+  edm4hep::MutableMCParticle edm_particle;
   edm_particle.setPDG(hepmcParticle->pdg_id());
   edm_particle.setGeneratorStatus(hepmcParticle->status());
   // look up charge from pdg_id
@@ -42,19 +42,19 @@ StatusCode HepMCToEDMConverter::execute() {
   edm4hep::MCParticleCollection* particles = new edm4hep::MCParticleCollection();
 
 
-  std::unordered_map<unsigned int, edm4hep::MCParticle> _map;
+  std::unordered_map<unsigned int, edm4hep::MutableMCParticle> _map;
   for (auto _p:evt->particles()) {
     debug() << "Converting hepmc particle with Pdg_ID \t" << _p->pdg_id() << "and id \t" <<  _p->id() << endmsg;
     if (_map.find(_p->id()) == _map.end()) {
-      edm4hep::MCParticle edm_particle = convert(_p);
+      edm4hep::MutableMCParticle edm_particle = convert(_p);
       _map.insert({_p->id(), edm_particle});
     }
     // mother/daughter links
     auto prodvertex = _p->production_vertex();
     if (nullptr != prodvertex) {
       for (auto particle_mother: prodvertex->particles_in()) {
         if (_map.find(particle_mother->id()) == _map.end()) {
-          edm4hep::MCParticle edm_particle = convert(particle_mother);
+          edm4hep::MutableMCParticle edm_particle = convert(particle_mother);
           _map.insert({particle_mother->id(), edm_particle});
         }
         _map[_p->id()].addToParents(_map[particle_mother->id()]);

diff --git a/k4Gen/src/components/HepMCToEDMConverter.h b/k4Gen/src/components/HepMCToEDMConverter.h
@@ -11,6 +11,7 @@
 namespace edm4hep {
 class MCParticleCollection;
 class MCParticle;
+class MutableMCParticle;
 }
 
 class HepMCToEDMConverter : public GaudiAlgorithm {
@@ -34,6 +35,6 @@ class HepMCToEDMConverter : public GaudiAlgorithm {
   /// Handle for the genparticles to be written
   DataHandle<edm4hep::MCParticleCollection> m_genphandle{"GenParticles", Gaudi::DataHandle::Writer, this};
 
-  edm4hep::MCParticle convert(std::shared_ptr<const HepMC3::GenParticle> hepmcParticle);
+  edm4hep::MutableMCParticle convert(std::shared_ptr<const HepMC3::GenParticle> hepmcParticle);
 };
 #endif