ITS: allow cluster classes to be trivially moveable

f3sch · f3sch · commit 23d54242ed6d · 2025-06-01T18:35:36.000+02:00
diff --git a/Detectors/ITSMFT/ITS/tracking/CMakeLists.txt b/Detectors/ITSMFT/ITS/tracking/CMakeLists.txt
@@ -19,7 +19,6 @@ o2_add_library(ITStracking
                        src/TimeFrame.cxx
                        src/IOUtils.cxx
                        src/Label.cxx
-                       src/Road.cxx
                        src/Tracker.cxx
                        src/TrackerTraits.cxx
                        src/TrackingConfigParam.cxx
diff --git a/Detectors/ITSMFT/ITS/tracking/include/ITStracking/Cell.h b/Detectors/ITSMFT/ITS/tracking/include/ITStracking/Cell.h
@@ -23,16 +23,27 @@
 
 #include "GPUCommonDef.h"
 
-namespace o2
-{
-namespace its
+namespace o2::its
 {
 
 class Cell final
 {
  public:
-  GPUhd() Cell();
-  GPUd() Cell(const int, const int, const int, const int, const int);
+  GPUhdDefault() Cell() = default;
+  GPUhd() Cell(const int firstClusterIndex, const int secondClusterIndex, const int thirdClusterIndex,
+               const int firstTrackletIndex, const int secondTrackletIndex)
+    : mFirstClusterIndex(firstClusterIndex),
+      mSecondClusterIndex(secondClusterIndex),
+      mThirdClusterIndex(thirdClusterIndex),
+      mFirstTrackletIndex(firstTrackletIndex),
+      mSecondTrackletIndex(secondTrackletIndex),
+      mLevel(1) {}
+  GPUhdDefault() Cell(const Cell&) = default;
+  GPUhdDefault() Cell(Cell&&) = default;
+  GPUhdDefault() ~Cell() = default;
+
+  GPUhdDefault() Cell& operator=(const Cell&) = default;
+  GPUhdDefault() Cell& operator=(Cell&&) noexcept = default;
 
   GPUhd() int getFirstClusterIndex() const { return mFirstClusterIndex; };
   GPUhd() int getSecondClusterIndex() const { return mSecondClusterIndex; };
@@ -44,44 +55,19 @@ class Cell final
   GPUhd() int* getLevelPtr() { return &mLevel; }
 
  private:
-  const int mFirstClusterIndex;
-  const int mSecondClusterIndex;
-  const int mThirdClusterIndex;
-  const int mFirstTrackletIndex;
-  const int mSecondTrackletIndex;
-  int mLevel;
+  int mFirstClusterIndex{0};
+  int mSecondClusterIndex{0};
+  int mThirdClusterIndex{0};
+  int mFirstTrackletIndex{0};
+  int mSecondTrackletIndex{0};
+  int mLevel{0};
 };
 
-GPUhdi() Cell::Cell()
-  : mFirstClusterIndex{0},
-    mSecondClusterIndex{0},
-    mThirdClusterIndex{0},
-    mFirstTrackletIndex{0},
-    mSecondTrackletIndex{0},
-    mLevel{0}
-{
-  // Nothing to do
-}
-
-GPUdi() Cell::Cell(const int firstClusterIndex, const int secondClusterIndex, const int thirdClusterIndex,
-                   const int firstTrackletIndex, const int secondTrackletIndex)
-  : mFirstClusterIndex{firstClusterIndex},
-    mSecondClusterIndex{secondClusterIndex},
-    mThirdClusterIndex{thirdClusterIndex},
-    mFirstTrackletIndex{firstTrackletIndex},
-    mSecondTrackletIndex{secondTrackletIndex},
-    mLevel{1}
-{
-  // Nothing to do
-}
-
 class CellSeed final : public o2::track::TrackParCovF
 {
  public:
   GPUhdDefault() CellSeed() = default;
-  GPUhdDefault() CellSeed(const CellSeed&) = default;
-  GPUhdDefault() ~CellSeed() = default;
-  GPUd() CellSeed(int innerL, int cl0, int cl1, int cl2, int trkl0, int trkl1, o2::track::TrackParCovF& tpc, float chi2) : o2::track::TrackParCovF{tpc}, mLevel{1}, mChi2{chi2}
+  GPUhd() CellSeed(int innerL, int cl0, int cl1, int cl2, int trkl0, int trkl1, o2::track::TrackParCovF& tpc, float chi2) : o2::track::TrackParCovF{tpc}, mLevel{1}, mChi2{chi2}
   {
     setUserField(innerL);
     mClusters[innerL + 0] = cl0;
@@ -90,6 +76,12 @@ class CellSeed final : public o2::track::TrackParCovF
     mTracklets[0] = trkl0;
     mTracklets[1] = trkl1;
   }
+  GPUhdDefault() CellSeed(const CellSeed&) = default;
+  GPUhdDefault() ~CellSeed() = default;
+  GPUhdDefault() CellSeed(CellSeed&&) = default;
+  GPUhdDefault() CellSeed& operator=(const CellSeed&) = default;
+  GPUhdDefault() CellSeed& operator=(CellSeed&&) = default;
+
   GPUhd() int getFirstClusterIndex() const { return mClusters[getUserField()]; };
   GPUhd() int getSecondClusterIndex() const { return mClusters[getUserField() + 1]; };
   GPUhd() int getThirdClusterIndex() const { return mClusters[getUserField() + 2]; };
@@ -104,20 +96,18 @@ class CellSeed final : public o2::track::TrackParCovF
   GPUhd() int* getLevelPtr() { return &mLevel; }
   GPUhd() int* getClusters() { return mClusters; }
   GPUhd() int getCluster(int i) const { return mClusters[i]; }
-  GPUhdi() void printCell() const;
+  GPUhd() void printCell() const
+  {
+    printf("trkl: %d, %d\t lvl: %d\t chi2: %f\n", mTracklets[0], mTracklets[1], mLevel, mChi2);
+  }
 
  private:
-  int mClusters[7] = {-1, -1, -1, -1, -1, -1, -1};
-  int mTracklets[2] = {-1, -1};
-  int mLevel = 0;
   float mChi2 = 0.f;
+  int mLevel = 0;
+  int mTracklets[2] = {-1, -1};
+  int mClusters[7] = {-1, -1, -1, -1, -1, -1, -1};
 };
 
-GPUhdi() void CellSeed::printCell() const
-{
-  printf("trkl: %d, %d\t lvl: %d\t chi2: %f\n", mTracklets[0], mTracklets[1], mLevel, mChi2);
-}
+} // namespace o2::its
 
-} // namespace its
-} // namespace o2
 #endif /* TRACKINGITSU_INCLUDE_CACELL_H_ */
diff --git a/Detectors/ITSMFT/ITS/tracking/include/ITStracking/Cluster.h b/Detectors/ITSMFT/ITS/tracking/include/ITStracking/Cluster.h
@@ -16,8 +16,6 @@
 #ifndef TRACKINGITSU_INCLUDE_CACLUSTER_H_
 #define TRACKINGITSU_INCLUDE_CACLUSTER_H_
 
-#include <array>
-
 #include "GPUCommonRtypes.h"
 #include "GPUCommonArray.h"
 
@@ -27,12 +25,30 @@ namespace o2::its
 class IndexTableUtils;
 
 struct Cluster final {
-  Cluster() = default;
-  Cluster(const float x, const float y, const float z, const int idx);
-  Cluster(const int, const IndexTableUtils& utils, const Cluster&);
-  Cluster(const int, const float3&, const IndexTableUtils& utils, const Cluster&);
-  void Init(const int, const float3&, const IndexTableUtils& utils, const Cluster&);
-  bool operator==(const Cluster&) const;
+  GPUhdDefault() Cluster() = default;
+  GPUhd() Cluster(const float x, const float y, const float z, const int idx);
+  GPUhd() Cluster(const int, const IndexTableUtils& utils, const Cluster&);
+  GPUhd() Cluster(const int, const float3&, const IndexTableUtils& utils, const Cluster&);
+  GPUhdDefault() Cluster(const Cluster&) = default;
+  GPUhdDefault() Cluster(Cluster&&) noexcept = default;
+  GPUhdDefault() ~Cluster() = default;
+
+  GPUhdDefault() Cluster& operator=(const Cluster&) = default;
+  GPUhdDefault() Cluster& operator=(Cluster&&) noexcept = default;
+
+  // TODO
+  /*GPUhdDefault() bool operator==(const Cluster&) const = default;*/
+  GPUhd() bool operator==(const Cluster& other) const
+  {
+    return xCoordinate == other.xCoordinate &&
+           yCoordinate == other.yCoordinate &&
+           zCoordinate == other.zCoordinate &&
+           phi == other.phi &&
+           radius == other.radius &&
+           clusterId == other.clusterId &&
+           indexTableBinIndex == other.indexTableBinIndex;
+  }
+
   GPUhd() void print() const;
 
   float xCoordinate{-999.f};
@@ -42,20 +58,19 @@ struct Cluster final {
   float radius{-999.f};
   int clusterId{-1};
   int indexTableBinIndex{-1};
-
-  ClassDefNV(Cluster, 1);
 };
 
-GPUhdi() void Cluster::print() const
-{
-#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
-  printf("Cluster: %f %f %f %f %f %d %d\n", xCoordinate, yCoordinate, zCoordinate, phi, radius, clusterId, indexTableBinIndex);
-#endif
-}
+struct TrackingFrameInfo final {
+  GPUhdDefault() TrackingFrameInfo() = default;
+  GPUhd() TrackingFrameInfo(float x, float y, float z, float xTF, float alpha, std::array<float, 2>&& posTF, std::array<float, 3>&& covTF);
+  GPUhdDefault() TrackingFrameInfo(const TrackingFrameInfo&) = default;
+  GPUhdDefault() TrackingFrameInfo(TrackingFrameInfo&&) noexcept = default;
+  GPUhdDefault() ~TrackingFrameInfo() = default;
+
+  GPUhdDefault() TrackingFrameInfo& operator=(const TrackingFrameInfo&) = default;
+  GPUhdDefault() TrackingFrameInfo& operator=(TrackingFrameInfo&&) = default;
 
-struct TrackingFrameInfo {
-  TrackingFrameInfo() = default;
-  TrackingFrameInfo(float x, float y, float z, float xTF, float alpha, std::array<float, 2>&& posTF, std::array<float, 3>&& covTF);
+  GPUhd() void print() const;
 
   float xCoordinate{-999.f};
   float yCoordinate{-999.f};
@@ -64,15 +79,6 @@ struct TrackingFrameInfo {
   float alphaTrackingFrame{-999.f};
   std::array<float, 2> positionTrackingFrame = {-1., -1.};
   std::array<float, 3> covarianceTrackingFrame = {999., 999., 999.};
-  GPUdi() void print() const
-  {
-#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
-    printf("x: %f y: %f z: %f xTF: %f alphaTF: %f posTF: %f %f covTF: %f %f %f\n",
-           xCoordinate, yCoordinate, zCoordinate, xTrackingFrame, alphaTrackingFrame,
-           positionTrackingFrame[0], positionTrackingFrame[1],
-           covarianceTrackingFrame[0], covarianceTrackingFrame[1], covarianceTrackingFrame[2]);
-#endif
-  }
 };
 
 } // namespace o2::its
diff --git a/Detectors/ITSMFT/ITS/tracking/include/ITStracking/Road.h b/Detectors/ITSMFT/ITS/tracking/include/ITStracking/Road.h
@@ -16,32 +16,31 @@
 #ifndef TRACKINGCA_INCLUDE_ROAD_H
 #define TRACKINGCA_INCLUDE_ROAD_H
 
-#ifndef GPUCA_GPUCODE_DEVICE
-#include <array>
-#endif
-
 #include "ITStracking/Constants.h"
 #include "GPUCommonDef.h"
 
-namespace o2
-{
-namespace its
+namespace o2::its
 {
 
 template <unsigned char maxRoadSize = 5>
 class Road final
 {
  public:
-  GPUhd() Road() : mCellIds{}, mRoadSize{}, mIsFakeRoad{} { resetRoad(); }
+  GPUhdDefault() Road() = default;
   GPUhd() Road(int cellLayer, int cellId) : Road() { addCell(cellLayer, cellId); }
 
-  GPUhd() int getRoadSize() const;
-  int getLabel() const;
-  void setLabel(const int);
-  GPUhd() bool isFakeRoad() const;
-  void setFakeRoad(const bool);
-  GPUhd() int& operator[](const int&);
-  GPUhd() int operator[](const int&) const;
+  GPUhdDefault() Road(const Road&) = default;
+  GPUhdDefault() Road(Road&&) noexcept = default;
+  GPUhdDefault() ~Road() = default;
+
+  GPUhdDefault() Road& operator=(const Road&) = default;
+  GPUhdDefault() Road& operator=(Road&&) noexcept = default;
+
+  GPUhdi() uint8_t getRoadSize() const { return mRoadSize; }
+  GPUhdi() bool isFakeRoad() const { return mIsFakeRoad; }
+  GPUhdi() void setFakeRoad(const bool fake) { mIsFakeRoad = fake; }
+  GPUhdi() int& operator[](const int& i) { return mCellIds[i]; }
+  GPUhdi() int operator[](const int& i) const { return mCellIds[i]; }
 
   GPUhd() void resetRoad()
   {
@@ -61,42 +60,12 @@ class Road final
   }
 
  private:
-  int mCellIds[maxRoadSize];
+  int mCellIds[maxRoadSize]{constants::its::UnusedIndex};
   // int mLabel;
-  unsigned char mRoadSize;
-  bool mIsFakeRoad;
+  unsigned char mRoadSize{0};
+  bool mIsFakeRoad{false};
 };
 
-template <unsigned char maxRoadSize>
-GPUhdi() int Road<maxRoadSize>::getRoadSize() const
-{
-  return mRoadSize;
-}
-
-template <unsigned char maxRoadSize>
-GPUhdi() int& Road<maxRoadSize>::operator[](const int& i)
-{
-  return mCellIds[i];
-}
+} // namespace o2::its
 
-template <unsigned char maxRoadSize>
-GPUhdi() int Road<maxRoadSize>::operator[](const int& i) const
-{
-  return mCellIds[i];
-}
-
-template <unsigned char maxRoadSize>
-GPUhdi() bool Road<maxRoadSize>::isFakeRoad() const
-{
-  return mIsFakeRoad;
-}
-
-template <unsigned char maxRoadSize>
-inline void Road<maxRoadSize>::setFakeRoad(const bool isFakeRoad)
-{
-  mIsFakeRoad = isFakeRoad;
-}
-} // namespace its
-} // namespace o2
-
-#endif
+#endif
diff --git a/Detectors/ITSMFT/ITS/tracking/src/Cluster.cxx b/Detectors/ITSMFT/ITS/tracking/src/Cluster.cxx
@@ -66,28 +66,11 @@ Cluster::Cluster(const int layerIndex, const float3& primaryVertex, const IndexT
   // Nothing to do
 }
 
-void Cluster::Init(const int layerIndex, const float3& primaryVertex, const IndexTableUtils& utils, const Cluster& other)
+GPUhd() void Cluster::print() const
 {
-  xCoordinate = other.xCoordinate;
-  yCoordinate = other.yCoordinate;
-  zCoordinate = other.zCoordinate;
-  phi = getNormalizedPhi(
-    computePhi(xCoordinate - primaryVertex.x, yCoordinate - primaryVertex.y));
-  radius = o2::gpu::GPUCommonMath::Hypot(xCoordinate - primaryVertex.x, yCoordinate - primaryVertex.y);
-  clusterId = other.clusterId;
-  indexTableBinIndex = utils.getBinIndex(utils.getZBinIndex(layerIndex, zCoordinate),
-                                         utils.getPhiBinIndex(phi));
-}
-
-bool Cluster::operator==(const Cluster& rhs) const
-{
-  return this->xCoordinate == rhs.xCoordinate &&
-         this->yCoordinate == rhs.yCoordinate &&
-         this->zCoordinate == rhs.zCoordinate &&
-         this->phi == rhs.phi &&
-         this->radius == rhs.radius &&
-         this->clusterId == rhs.clusterId &&
-         this->indexTableBinIndex == rhs.indexTableBinIndex;
+#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
+  printf("Cluster: %f %f %f %f %f %d %d\n", xCoordinate, yCoordinate, zCoordinate, phi, radius, clusterId, indexTableBinIndex);
+#endif
 }
 
 TrackingFrameInfo::TrackingFrameInfo(float x, float y, float z, float xTF, float alpha, std::array<float, 2>&& posTF,
@@ -96,3 +79,13 @@ TrackingFrameInfo::TrackingFrameInfo(float x, float y, float z, float xTF, float
 {
   // Nothing to do
 }
+
+GPUhd() void TrackingFrameInfo::print() const
+{
+#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
+  printf("x: %f y: %f z: %f xTF: %f alphaTF: %f posTF: %f %f covTF: %f %f %f\n",
+         xCoordinate, yCoordinate, zCoordinate, xTrackingFrame, alphaTrackingFrame,
+         positionTrackingFrame[0], positionTrackingFrame[1],
+         covarianceTrackingFrame[0], covarianceTrackingFrame[1], covarianceTrackingFrame[2]);
+#endif
+}
diff --git a/Detectors/ITSMFT/ITS/tracking/src/Road.cxx b/Detectors/ITSMFT/ITS/tracking/src/Road.cxx
diff --git a/Detectors/ITSMFT/ITS/tracking/src/TrackingLinkDef.h b/Detectors/ITSMFT/ITS/tracking/src/TrackingLinkDef.h
@@ -20,8 +20,6 @@
 #pragma link C++ class o2::its::Line + ;
 #pragma link C++ class std::vector < o2::its::Tracklet> + ;
 #pragma link C++ class std::vector < o2::its::Line> + ;
-#pragma link C++ class o2::its::Cluster + ;
-#pragma link C++ class std::vector < o2::its::Cluster> + ;
 #pragma link C++ class std::vector < o2::its::ClusterLines> + ;
 
 #pragma link C++ class o2::its::VertexerParamConfig + ;
