fix genParticle index

Author: AuroraPerego

SimDataFormats/Track/src/classes_def.xml

@@ -9,6 +9,22 @@
    <version ClassVersion="12" checksum="3470347245"/>
    <version ClassVersion="11" checksum="1785575744"/>
    <version ClassVersion="10" checksum="1430205451"/>
+   <ioread sourceClass = "SimTrack" version="[-12]" targetClass="SimTrack" source="" target="">
+    <![CDATA[
+        SimTrack tmp(newObj->type(), newObj->momentum(), newObj->vertIndex(), newObj->genpartIndex(), newObj->trackerSurfacePosition(), newObj->trackerSurfaceMomentum());
+        tmp.setTrackId(newObj->trackId());
+        tmp.setEventId(newObj->eventId());
+        tmp.setCrossedBoundaryVars(
+            newObj->crossedBoundary(), newObj->getIDAtBoundary(), newObj->getPositionAtBoundary(), newObj->getMomentumAtBoundary());
+        if (newObj->isFromBackScattering()) {
+          tmp.setFromBackScattering();
+        }
+        if (newObj->genpartIndex() != -1) {
+          tmp.setIsPrimary();
+        }
+        *newObj=tmp;
+    ]]>
+   </ioread>
   </class>
   <class name="edm::Wrapper<std::vector<SimTrack> >" />
   <class name="edm::RefProd<std::vector<SimTrack> >"/>

SimG4Core/Application/plugins/OscarMTProducer.cc

@@ -260,14 +260,14 @@ void OscarMTProducer::produce(edm::Event& e, const edm::EventSetup& es) {
     }
     edm::LogVerbatim("SimG4CoreApplication")
         << "Produced " << p1->size()
-        << " SimTracks: G4 Id, pdg, 4-momentum(GeV), vertexID, mcTruthID, crossedBoundary, trackID at boundary, from "
-           "backscattering, isPrimary, getPrimary";
+        << " SimTracks: G4 Id, pdg, 4-momentum(GeV), vertexID, mcTruthID, crossedBoundary -> trackID at boundary, from "
+           "backscattering, isPrimary -> getPrimary";
     if (1 < m_verbose) {
       int nn = p1->size();
       for (int i = 0; i < nn; ++i) {
-        edm::LogVerbatim("Track") << " " << i << ". " << (*p1)[i].trackId() << " " << (*p1)[i] << " "
-                                  << (*p1)[i].crossedBoundary() << " " << (*p1)[i].getIDAtBoundary() << " "
-                                  << (*p1)[i].isFromBackScattering() << " " << (*p1)[i].isPrimary() << " "
+        edm::LogVerbatim("Track") << " " << i << ". " << (*p1)[i].trackId() << ", " << (*p1)[i] << ", "
+                                  << (*p1)[i].crossedBoundary() << "-> " << (*p1)[i].getIDAtBoundary() << ", "
+                                  << (*p1)[i].isFromBackScattering() << ", " << (*p1)[i].isPrimary() << "-> "
                                   << (*p1)[i].getPrimaryID();
       }
     }

SimG4Core/Notification/src/SimTrackManager.cc

@@ -76,10 +76,12 @@ void SimTrackManager::addTrack(TrackWithHistory* iTrack, const G4Track* track, b
     auto info = static_cast<const TrackInformation*>(track->GetUserInformation());
     if (info->isInTrkFromBackscattering())
       iTrack->setFromBackScattering();
-    // set there *for all the tracks* the genParticle ID associated with the G4Track
-    // in the constructor of TrackWithHistory the info isPrimary is saved and used
-    // to give -1 if the track is not a primary
-    iTrack->setGenParticleID(info->mcTruthID());
+    // set there for the *non-primary* tracks the genParticle ID associated with the G4Track
+    // for the primaries this is done in the TrackWithHistory constructor.
+    // In the constructor of TrackWithHistory the info isPrimary is saved and used
+    // to give -1 if the track is not a primary.
+    if (not iTrack->isPrimary())
+      iTrack->setGenParticleID(info->mcTruthID());
     m_trackContainer.push_back(iTrack);
     const auto& v = track->GetStep()->GetPostStepPoint()->GetPosition();
     std::pair<int, math::XYZVectorD> p(iTrack->trackID(),

SimG4Core/Notification/src/TmpSimEvent.cc

@@ -53,7 +53,8 @@ void TmpSimEvent::load(edm::SimTrackContainer& c) const {
       t.setFromBackScattering();
     if (isPrimary)
       t.setIsPrimary();
-    t.setGenParticleID(primaryGenPartId);
+    else
+      t.setGenParticleID(primaryGenPartId);
     c.push_back(t);
   }
   std::stable_sort(c.begin(), c.end(), IdSort());