[ALICE3] Refactor TRK Hit class to rely on ITSMFT

Detectors/Upgrades/ALICE3/TRK/reconstruction/include/TRKReconstruction/TimeFrame.h

@@ -33,7 +33,6 @@ namespace o2
 {
 namespace trk
 {
-class Hit;
 class GeometryTGeo;
 
 /// TRK TimeFrame class that extends ITS TimeFrame functionality

Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/Hit.h

@@ -12,138 +12,14 @@
 /// \file Hit.h
 /// \brief Definition of the TRK Hit class
 
-#ifndef ALICEO2_TRK_POINT_H_
-#define ALICEO2_TRK_POINT_H_
+#ifndef ALICEO2_TRK_HIT_H_
+#define ALICEO2_TRK_HIT_H_
 
-#include "SimulationDataFormat/BaseHits.h" // for BasicXYZEHit
-#include "Rtypes.h"                        // for Bool_t, Double_t, Int_t, Double32_t, etc
-#include "TVector3.h"                      // for TVector3
-#include <iosfwd>
-#include "CommonUtils/ShmAllocator.h"
+#include "ITSMFTSimulation/Hit.h"
 
-namespace o2
+namespace o2::trk
 {
-namespace trk
-{
-
-class Hit : public o2::BasicXYZEHit<Float_t, Float_t>
-{
-
- public:
-  enum HitStatus_t {
-    kTrackEntering = 0x1,
-    kTrackInside = 0x1 << 1,
-    kTrackExiting = 0x1 << 2,
-    kTrackOut = 0x1 << 3,
-    kTrackStopped = 0x1 << 4,
-    kTrackAlive = 0x1 << 5
-  };
-
-  /// Default constructor
-  Hit() = default;
-
-  /// Class Constructor
-  /// \param trackID Index of MCTrack
-  /// \param detID Detector ID
-  /// \param startPos Coordinates at entrance to active volume [cm]
-  /// \param pos Coordinates to active volume [cm]
-  /// \param mom Momentum of track at entrance [GeV]
-  /// \param endTime Time at entrance [ns]
-  /// \param time Time since event start [ns]
-  /// \param eLoss Energy deposit [GeV]
-  /// \param startStatus: status at entrance
-  /// \param endStatus: status at exit
-  inline Hit(int trackID, unsigned short detID, const TVector3& startPos, const TVector3& pos, const TVector3& mom, double startE,
-             double endTime, double eLoss, unsigned char statusStart, unsigned char status);
-
-  // Entrance position getters
-  math_utils::Point3D<Float_t> GetPosStart() const { return mPosStart; }
-  Float_t GetStartX() const { return mPosStart.X(); }
-  Float_t GetStartY() const { return mPosStart.Y(); }
-  Float_t GetStartZ() const { return mPosStart.Z(); }
-  template <typename F>
-  void GetStartPosition(F& x, F& y, F& z) const
-  {
-    x = GetStartX();
-    y = GetStartY();
-    z = GetStartZ();
-  }
-  // momentum getters
-  math_utils::Vector3D<Float_t> GetMomentum() const { return mMomentum; }
-  math_utils::Vector3D<Float_t>& GetMomentum() { return mMomentum; }
-  Float_t GetPx() const { return mMomentum.X(); }
-  Float_t GetPy() const { return mMomentum.Y(); }
-  Float_t GetPz() const { return mMomentum.Z(); }
-  Float_t GetE() const { return mE; }
-  Float_t GetTotalEnergy() const { return GetE(); }
-
-  UChar_t GetStatusEnd() const { return mTrackStatusEnd; }
-  UChar_t GetStatusStart() const { return mTrackStatusStart; }
-
-  Bool_t IsEntering() const { return mTrackStatusEnd & kTrackEntering; }
-  Bool_t IsInside() const { return mTrackStatusEnd & kTrackInside; }
-  Bool_t IsExiting() const { return mTrackStatusEnd & kTrackExiting; }
-  Bool_t IsOut() const { return mTrackStatusEnd & kTrackOut; }
-  Bool_t IsStopped() const { return mTrackStatusEnd & kTrackStopped; }
-  Bool_t IsAlive() const { return mTrackStatusEnd & kTrackAlive; }
-
-  Bool_t IsEnteringStart() const { return mTrackStatusStart & kTrackEntering; }
-  Bool_t IsInsideStart() const { return mTrackStatusStart & kTrackInside; }
-  Bool_t IsExitingStart() const { return mTrackStatusStart & kTrackExiting; }
-  Bool_t IsOutStart() const { return mTrackStatusStart & kTrackOut; }
-  Bool_t IsStoppedStart() const { return mTrackStatusStart & kTrackStopped; }
-  Bool_t IsAliveStart() const { return mTrackStatusStart & kTrackAlive; }
-
-  // Entrance position setter
-  void SetPosStart(const math_utils::Point3D<Float_t>& p) { mPosStart = p; }
-
-  /// Output to screen
-  void Print(const Option_t* opt) const;
-  friend std::ostream& operator<<(std::ostream& of, const Hit& point)
-  {
-    of << "-I- Hit: O2its point for track " << point.GetTrackID() << " in detector " << point.GetDetectorID() << std::endl;
-    /*
-      of << "    Position (" << point.fX << ", " << point.fY << ", " << point.fZ << ") cm" << std::endl;
-      of << "    Momentum (" << point.fPx << ", " << point.fPy << ", " << point.fPz << ") GeV" << std::endl;
-      of << "    Time " << point.fTime << " ns,  Length " << point.fLength << " cm,  Energy loss "
-      << point.fELoss * 1.0e06 << " keV" << std::endl;
-      */
-    return of;
-  }
-
- private:
-  math_utils::Vector3D<Float_t> mMomentum; ///< momentum at entrance
-  math_utils::Point3D<Float_t> mPosStart;  ///< position at entrance (base mPos give position on exit)
-  Float_t mE;                              ///< total energy at entrance
-  UChar_t mTrackStatusEnd;                 ///< MC status flag at exit
-  UChar_t mTrackStatusStart;               ///< MC status at starting point
-
-  ClassDefNV(Hit, 1);
-};
-
-Hit::Hit(int trackID, unsigned short detID, const TVector3& startPos, const TVector3& endPos, const TVector3& startMom,
-         double startE, double endTime, double eLoss, unsigned char startStatus, unsigned char endStatus)
-  : BasicXYZEHit(endPos.X(), endPos.Y(), endPos.Z(), endTime, eLoss, trackID, detID),
-    mMomentum(startMom.Px(), startMom.Py(), startMom.Pz()),
-    mPosStart(startPos.X(), startPos.Y(), startPos.Z()),
-    mE(startE),
-    mTrackStatusEnd(endStatus),
-    mTrackStatusStart(startStatus)
-{
-}
-
-} // namespace trk
-} // namespace o2
-
-#ifdef USESHM
-namespace std
-{
-template <>
-class allocator<o2::trk::Hit> : public o2::utils::ShmAllocator<o2::trk::Hit>
-{
-};
-} // namespace std
-
-#endif
+using Hit = o2::itsmft::Hit; // For now we rely on the same Hit class as ITSMFT, but we can extend it with TRK-specific information if needed in the future
+} // namespace o2::trk
 
 #endif

Detectors/Upgrades/ALICE3/TRK/simulation/src/Hit.cxx

@@ -13,22 +13,3 @@
 /// \brief Implementation of the Hit class
 
 #include "TRKSimulation/Hit.h"
-
-#include <iostream>
-#include <iostream>
-
-ClassImp(o2::trk::Hit);
-
-using std::cout;
-using std::endl;
-using namespace o2::trk;
-using namespace o2; //::base;
-
-void Hit::Print(const Option_t* opt) const
-{
-  printf(
-    "Det: %5d Track: %6d E.loss: %.3e P: %+.3e %+.3e %+.3e\n"
-    "PosIn: %+.3e %+.3e %+.3e PosOut: %+.3e %+.3e %+.3e\n",
-    GetDetectorID(), GetTrackID(), GetEnergyLoss(), GetPx(), GetPy(), GetPz(),
-    GetStartX(), GetStartY(), GetStartZ(), GetX(), GetY(), GetZ());
-}