Fixed hit merging

Author: pkurash

Detectors/Upgrades/ALICE3/FD/base/include/FDBase/Constants.h

@@ -22,15 +22,15 @@ namespace o2
 namespace fd
 {
 struct Constants {
-  static constexpr int nsect = 8;
-  static constexpr int nringsA = 3;
-  static constexpr int nringsC = 6;
+  static constexpr unsigned int nsect = 8;
+  static constexpr unsigned int nringsA = 3;
+  static constexpr unsigned int nringsC = 6;
 
   static constexpr float etaMax = 7.0f;
   static constexpr float etaMinC = 4.0f;
   static constexpr float etaMinA = 5.0f;
 
-  static constexpr int nringsA_noFCT = 5;
+  static constexpr unsigned int nringsA_noFCT = 5;
   static constexpr float etaMinA_noFCT = 4.0f;
 };
 

Detectors/Upgrades/ALICE3/FD/simulation/include/FDSimulation/Detector.h

@@ -100,9 +100,9 @@ class Detector : public o2::base::DetImpl<Detector>
 
   float ringRadius(float zmod, float eta);
 
-  int mNumberOfSectors;
-  int mNumberOfRingsA;
-  int mNumberOfRingsC;
+  unsigned int mNumberOfSectors;
+  unsigned int mNumberOfRingsA;
+  unsigned int mNumberOfRingsC;
   float mDzScint;
 
   std::vector<float> mRingRadiiA = {};
@@ -115,7 +115,7 @@ class Detector : public o2::base::DetImpl<Detector>
 
   void defineSensitiveVolumes();
 
-  int getChannelId(TVector3 vec);
+  unsigned int getChannelId(TVector3 vec);
 
   /// Transient data about track passing the sensor, needed by ProcessHits()
   struct TrackData {               // this is transient

Detectors/Upgrades/ALICE3/FD/simulation/src/Detector.cxx

@@ -138,9 +138,6 @@ bool Detector::ProcessHits(FairVolume* vol)
   // Check track status to define when hit is started and when it is stopped
   bool startHit = false, stopHit = false;
   unsigned char status = 0;
-
-  int currVolId, offId;
-
   if (fMC->IsTrackEntering()) {
     status |= Hit::kTrackEntering;
   }
@@ -186,8 +183,8 @@ bool Detector::ProcessHits(FairVolume* vol)
   if (stopHit) {
     TLorentzVector positionStop;
     fMC->TrackPosition(positionStop);
-    int trackId = fMC->GetStack()->GetCurrentTrackNumber();
-    int chId = getChannelId(mTrackData.mPositionStart.Vect());
+    int trackId = stack->GetCurrentTrackNumber();
+    unsigned int chId = getChannelId(mTrackData.mPositionStart.Vect());
 
     Hit* p = addHit(trackId, chId /*cellId*/, mTrackData.mPositionStart.Vect(), positionStop.Vect(),
                     mTrackData.mMomentumStart.Vect(), mTrackData.mMomentumStart.E(),
@@ -374,7 +371,7 @@ void Detector::defineSensitiveVolumes()
   }
 }
 
-int Detector::getChannelId(TVector3 vec)
+unsigned int Detector::getChannelId(TVector3 vec)
 {
   float phi = vec.Phi();
   if (phi < 0) {
@@ -384,7 +381,7 @@ int Detector::getChannelId(TVector3 vec)
   float r = vec.Perp();
   float z = vec.Z();
 
-  int isect = int(phi / (TMath::Pi() / 4));
+  int isect = int(phi / (TMath::TwoPi() / mNumberOfSectors));
 
   std::vector<float> rd = z > 0 ? mRingRadiiA : mRingRadiiC;
   int noff = z > 0 ? 0 : mNumberOfRingsA * mNumberOfSectors;

run/O2HitMerger.h

@@ -78,6 +78,7 @@
 #include <RICHSimulation/Detector.h>
 #include <ECalSimulation/Detector.h>
 #include <MI3Simulation/Detector.h>
+#include <FDSimulation/Detector.h>
 #endif
 
 #include <tbb/concurrent_unordered_map.h>
@@ -1020,6 +1021,10 @@ void O2HitMerger::initDetInstances()
       mDetectorInstances[i] = std::move(std::make_unique<o2::ecal::Detector>(true));
       counter++;
     }
+    if (i == DetID::FD) {
+      mDetectorInstances[i] = std::move(std::make_unique<o2::fd::Detector>(true));
+      counter++;
+    }
 #endif
   }
   if (counter != DetID::nDetectors) {