Extending track references

Author: tubagundem

Detectors/CPV/simulation/include/CPVSimulation/Detector.h

@@ -157,6 +157,7 @@ class Detector : public o2::base::DetImpl<Detector>
 
   // Simulation
   std::vector<Hit>* mHits = nullptr; //! Collection of CPV hits
+  int mTrackRefLastTrackID = -1;     //! last track that received a TrackReference in the current event
 
   template <typename Det>
   friend class o2::base::DetImpl;

Detectors/CPV/simulation/src/Detector.cxx

@@ -106,6 +106,7 @@ void Detector::Reset()
   if (!o2::utils::ShmManager::Instance().isOperational()) {
     mHits->clear();
   }
+  mTrackRefLastTrackID = -1;
 }
 
 void Detector::Register() { FairRootManager::Instance()->RegisterAny(addNameTo("Hit").data(), mHits, kTRUE); }
@@ -123,6 +124,13 @@ Bool_t Detector::ProcessHits(FairVolume* v)
   // ported from AliRoot 2019
   // ------------------------------------------------------------------------
 
+  if (fMC->IsTrackEntering() && !fMC->IsNewTrack() && fMC->TrackCharge() != 0) { // one reference per charged particle, first entry from outside
+    auto o2stack = static_cast<o2::data::Stack*>(fMC->GetStack());
+    if (o2stack->GetCurrentTrackNumber() != mTrackRefLastTrackID) {
+      mTrackRefLastTrackID = o2stack->GetCurrentTrackNumber();
+      o2stack->addTrackReference(o2::TrackReference(*fMC, GetDetId()));
+    }
+  }
   // analyze only charged
   if (fMC->TrackCharge() == 0) {
     fMC->SetMaxStep(1.e10);

Detectors/FIT/FDD/simulation/include/FDDSimulation/Detector.h

@@ -71,6 +71,7 @@ class Detector : public o2::base::DetImpl<Detector>
 
   /// Container for data points
   std::vector<o2::fdd::Hit>* mHits = nullptr;
+  int mTrackRefLastTrackID = -1; //! last track that received a TrackReference in the current event
 
   Detector& operator=(const Detector&);
 

Detectors/FIT/FDD/simulation/src/Detector.cxx

@@ -103,6 +103,13 @@ void Detector::InitializeO2Detector()
 Bool_t Detector::ProcessHits(FairVolume* vol)
 {
   // This is step manager
+  if (fMC->IsTrackEntering() && !fMC->IsNewTrack() && fMC->TrackCharge() != 0) { // one reference per charged particle, first entry from outside
+    auto o2stack = static_cast<o2::data::Stack*>(fMC->GetStack());
+    if (o2stack->GetCurrentTrackNumber() != mTrackRefLastTrackID) {
+      mTrackRefLastTrackID = o2stack->GetCurrentTrackNumber();
+      o2stack->addTrackReference(o2::TrackReference(*fMC, GetDetId()));
+    }
+  }
   // do not track neutral particles
   if (!(fMC->TrackCharge())) {
     return kFALSE;
@@ -138,7 +145,7 @@ Bool_t Detector::ProcessHits(FairVolume* vol)
   // FDA 3  =  12-15
 
   Float_t fFDDLightYield(12.8e6);
-  //BC420 yield is 0.64 of antracene which is 20k photons/MeV = 12800/MeV = 12.8e6/GeV
+  // BC420 yield is 0.64 of antracene which is 20k photons/MeV = 12800/MeV = 12.8e6/GeV
 
   Float_t destep_ad = fMC->Edep();
   Int_t nPhotonsInStep_ad = Int_t(fFDDLightYield * destep_ad);
@@ -164,7 +171,7 @@ Bool_t Detector::ProcessHits(FairVolume* vol)
   if (fMC->IsTrackExiting() || fMC->IsTrackStop() || fMC->IsTrackDisappeared()) {
     Int_t trackID = fMC->GetStack()->GetCurrentTrackNumber();
 
-    Float_t time = fMC->TrackTime() * 1.0e9; //time from seconds to ns
+    Float_t time = fMC->TrackTime() * 1.0e9; // time from seconds to ns
 
     addHit(trackID, ADsector, vPos, time, eloss_ad, nPhotons_ad);
     return kTRUE;
@@ -176,7 +183,7 @@ Bool_t Detector::ProcessHits(FairVolume* vol)
 //_____________________________________________________________________________
 Hit* Detector::addHit(int trackID, unsigned short detID, const TVector3& Pos, double Time, double eLoss, int nPhot)
 {
-  //LOG(info) << "FDD hit "<<trackID<<" "<<detID<<" "<<Time<<" "<<eLoss<<" "<<nPhot;
+  // LOG(info) << "FDD hit "<<trackID<<" "<<detID<<" "<<Time<<" "<<eLoss<<" "<<nPhot;
   mHits->emplace_back(trackID, detID, Pos, Time, eLoss, nPhot);
   auto stack = (o2::data::Stack*)fMC->GetStack();
   stack->addHit(GetDetId());
@@ -373,4 +380,5 @@ void Detector::Reset()
   if (!o2::utils::ShmManager::Instance().isOperational()) {
     mHits->clear();
   }
+  mTrackRefLastTrackID = -1;
 }

Detectors/FIT/FT0/simulation/include/FT0Simulation/Detector.h

@@ -149,8 +149,8 @@ class Detector : public o2::base::DetImpl<Detector>
   std::vector<Double_t> mRindexFrontWindow;
 
   // Define the aluminium frame for the detector
-  TGeoVolume* constructFrameAGeometry(); //A-side
-  TGeoVolume* constructFrameCGeometry(); //C-side
+  TGeoVolume* constructFrameAGeometry(); // A-side
+  TGeoVolume* constructFrameCGeometry(); // C-side
   std::string cPlateShapeString();
 
   // BEGIN: Support structure constants
@@ -179,6 +179,7 @@ class Detector : public o2::base::DetImpl<Detector>
 
   /// Container for data points
   std::vector<o2::ft0::HitType>* mHits = nullptr;
+  int mTrackRefLastTrackID = -1; //! last track that received a TrackReference in the current event
 
   // Define volume IDs
   int mREGVolID = -1;