overwrite lastStoredAncestor only when parent is in history

Author: AuroraPerego

SimG4CMS/Calo/src/CaloSD.cc

@@ -574,7 +574,8 @@ unsigned int CaloSD::findBoundaryCrossingParent(const G4Track* track, bool markA
 #endif
     boundaryCrossingParentMap_[id] = id;
     trkInfo->setStoreTrack();
-    trkInfo->setIdLastStoredAncestor(id);
+    if (trkInfo->idLastStoredAncestor() == track->GetParentID())
+      trkInfo->setIdLastStoredAncestor(id);
     return id;
   }
   // Else, traverse the history of the track
@@ -683,7 +684,8 @@ CaloG4Hit* CaloSD::createNewHit(const G4Step* aStep, const G4Track* theTrack, in
 #endif
       if (etrack >= energyCut || forceSave) {
         trkInfo->setStoreTrack();
-        trkInfo->setIdLastStoredAncestor(theTrack->GetTrackID());
+        if (trkInfo->idLastStoredAncestor() == theTrack->GetParentID())
+          trkInfo->setIdLastStoredAncestor(theTrack->GetTrackID());
       }
     } else {
       TrackWithHistory* trkh = tkMap[currentID[k].trackID()];

SimG4CMS/Forward/src/TimingSD.cc

@@ -163,7 +163,8 @@ void TimingSD::getStepInfo(const G4Step* aStep) {
     if (incidentEnergy > energyCut) {
       info = cmsTrackInformation(theTrack);
       info->setStoreTrack();
-      info->setIdLastStoredAncestor(theTrack->GetTrackID());
+      if (info->idLastStoredAncestor() == theTrack->GetParentID())
+        info->setIdLastStoredAncestor(theTrack->GetTrackID());
     }
     if (incidentEnergy > energyHistoryCut) {
       if (nullptr == info) {

SimG4CMS/Muon/src/MuonSensitiveDetector.cc

@@ -249,7 +249,8 @@ void MuonSensitiveDetector::createHit(const G4Step* aStep) {
   if (thePabs > ePersistentCutGeV_ || (thePID == 13 && allMuonsPersistent_)) {
     TrackInformation* info = cmsTrackInformation(theTrack);
     info->setStoreTrack();
-    info->setIdLastStoredAncestor(theTrack->GetTrackID());
+    if (info->idLastStoredAncestor() == theTrack->GetParentID())
+      info->setIdLastStoredAncestor(theTrack->GetTrackID());
   }
 
 #ifdef EDM_ML_DEBUG

SimG4CMS/Tracker/src/TkAccumulatingSensitiveDetector.cc

@@ -153,7 +153,8 @@ void TkAccumulatingSensitiveDetector::update(const BeginOfTrack* bot) {
     if (gTrack->GetKineticEnergy() > energyCut) {
       info = cmsTrackInformation(gTrack);
       info->setStoreTrack();
-      info->setIdLastStoredAncestor(gTrack->GetTrackID());
+      if (info->idLastStoredAncestor() == gTrack->GetParentID())
+        info->setIdLastStoredAncestor(gTrack->GetTrackID());
     }
     //
     // Save History?

SimG4Core/CustomPhysics/plugins/DBremWatcher.cc

@@ -105,7 +105,8 @@ void DBremWatcher::update(const BeginOfTrack* trk) {
     if (std::find(pdgs_.begin(), pdgs_.end(), pdg) != pdgs_.end()) {
       //Found an A'
       trkInfo->setStoreTrack();
-      trkInfo->setIdLastStoredAncestor(theTrack->GetTrackID());
+      if (trkInfo->idLastStoredAncestor() == theTrack->GetParentID())
+        trkInfo->setIdLastStoredAncestor(theTrack->GetTrackID());
       VertexPos = Vpos;
       aPrimeTraj = theTrack->GetMomentum();
       LogDebug("DBremWatcher") << "Save SimTrack the Track " << theTrack->GetTrackID() << " Type "
@@ -137,7 +138,8 @@ void DBremWatcher::update(const EndOfTrack* trk) {
     if (std::find(pdgs_.begin(), pdgs_.end(), pdg) == pdgs_.end() &&
         (theTrack->GetCreatorProcess()->GetProcessName()) == "muDBrem") {
       trkInfo->setStoreTrack();
-      trkInfo->setIdLastStoredAncestor(theTrack->GetTrackID());
+      if (trkInfo->idLastStoredAncestor() == theTrack->GetParentID())
+        trkInfo->setIdLastStoredAncestor(theTrack->GetTrackID());
     }
   }
 }