rename method

Author: AuroraPerego

SimDataFormats/Track/interface/SimTrack.h

@@ -68,7 +68,7 @@ class SimTrack : public CoreSimTrack {
 
   void setIsPrimary() { trackInfo_ |= (1 << 1); }
   void setGenParticleID(const int idx) { igenpart = idx; }
-  int getPrimaryID() const { return igenpart; }
+  int getPrimaryOrLastStoredID() const { return igenpart; }
   uint8_t getTrackInfo() const { return trackInfo_; }
 
 private:

SimG4Core/Application/plugins/OscarMTProducer.cc

@@ -268,7 +268,7 @@ void OscarMTProducer::produce(edm::Event& e, const edm::EventSetup& es) {
         edm::LogVerbatim("Track") << " " << i << ". " << (*p1)[i].trackId() << ", " << (*p1)[i] << ", "
                                   << (*p1)[i].crossedBoundary() << "-> " << (*p1)[i].getIDAtBoundary() << ", "
                                   << (*p1)[i].isFromBackScattering() << ", " << (*p1)[i].isPrimary() << "-> "
-                                  << (*p1)[i].getPrimaryID();
+                                  << (*p1)[i].getPrimaryOrLastStoredID();
       }
     }
   }

SimGeneral/Debugging/plugins/CaloParticleDebugger.cc

@@ -164,7 +164,7 @@ void CaloParticleDebugger::analyze(const edm::Event& iEvent, const edm::EventSet
     LogVerbatim("CaloParticleDebuggerSimTracks")
         << i << "\t" << t.trackId() << "\t" << t << "  Crossed  Boundary: " << t.crossedBoundary()
         << "  Vtx: " << t.vertIndex() << " isFromBackScattering: " << t.isFromBackScattering()
-        << " isPrimary: " << t.isPrimary() << " ParentID: " << t.getPrimaryID()
+        << " isPrimary: " << t.isPrimary() << " ParentID: " << t.getPrimaryOrLastStoredID()
         << "  Position Boundary: " << t.getPositionAtBoundary() << "  Momentum Boundary: " << t.getMomentumAtBoundary()
         << "  Momemtum Origin:   " << t.momentum();
     trackid_to_track_index[t.trackId()] = i;
@@ -232,10 +232,11 @@ void CaloParticleDebugger::analyze(const edm::Event& iEvent, const edm::EventSet
         << "\n\n"
         << i << "\tType: " << simcl.pdgId() << "\tEnergy: " << simcl.energy() << "\tKey: " << i;  // << simcl ;
     auto const& simtrack = simcl.g4Tracks()[0];
-    LogVerbatim("CaloParticleDebuggerSimClusters") << "\n  Primary GenParticleID: " << simtrack.getPrimaryID()
-                                                   << "\n  Crossed  Boundary:     " << simtrack.crossedBoundary()
-                                                   << "\n  Position Boundary:     " << simtrack.getPositionAtBoundary()
-                                                   << "\n  Momentum Boundary:     " << simtrack.getMomentumAtBoundary();
+    LogVerbatim("CaloParticleDebuggerSimClusters")
+        << "\n  GenParticleID/ancestor: " << simtrack.getPrimaryOrLastStoredID()
+        << "\n  Crossed  Boundary:      " << simtrack.crossedBoundary()
+        << "\n  Position Boundary:      " << simtrack.getPositionAtBoundary()
+        << "\n  Momentum Boundary:      " << simtrack.getMomentumAtBoundary();
     if (simClusters_in_CaloParticles.find(simcl.g4Tracks()[0].trackId()) == simClusters_in_CaloParticles.end()) {
       LogVerbatim("CaloParticleDebuggerSimClusters") << "  Orphan SimCluster: " << simtrack.trackId();
     }