ITS: Artefacts fix defaulted

Author: f3sch

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Cell.h

@@ -29,7 +29,7 @@ namespace o2::its
 class Cell final
 {
  public:
-  GPUhd() Cell() = default;
+  GPUhdDefault() Cell() = default;
   GPUhd() Cell(const int firstClusterIndex, const int secondClusterIndex, const int thirdClusterIndex,
                const int firstTrackletIndex, const int secondTrackletIndex)
     : mFirstClusterIndex(firstClusterIndex),
@@ -38,11 +38,12 @@ class Cell final
       mFirstTrackletIndex(firstTrackletIndex),
       mSecondTrackletIndex(secondTrackletIndex),
       mLevel(1) {}
-  GPUhd() ~Cell() = default;
-  GPUhd() Cell(const Cell&) = default;
-  GPUhd() Cell(Cell&&) = default;
-  GPUhd() Cell& operator=(const Cell&) = default;
-  GPUhd() Cell& operator=(Cell&&) = default;
+  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; };
@@ -66,9 +67,7 @@ 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;
@@ -77,6 +76,11 @@ 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]; };

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Cluster.h

@@ -25,11 +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&);
-  bool operator==(const Cluster&) const = default;
+  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,8 +61,15 @@ struct Cluster final {
 };
 
 struct TrackingFrameInfo final {
-  TrackingFrameInfo() = default;
-  TrackingFrameInfo(float x, float y, float z, float xTF, float alpha, std::array<float, 2>&& posTF, std::array<float, 3>&& covTF);
+  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;
+
   GPUhd() void print() const;
 
   float xCoordinate{-999.f};

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Road.h

@@ -26,10 +26,17 @@ template <unsigned char maxRoadSize = 5>
 class Road final
 {
  public:
-  GPUhd() Road() = default;
+  GPUhdDefault() Road() = default;
   GPUhd() Road(int cellLayer, int cellId) : Road() { addCell(cellLayer, cellId); }
 
-  GPUhdi() int getRoadSize() const { return mRoadSize; }
+  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]; }
@@ -54,8 +61,7 @@ class Road final
 
  private:
   int mCellIds[maxRoadSize]{constants::UnusedIndex};
-  // int mLabel;
-  unsigned char mRoadSize{0};
+  uint8_t mRoadSize{0};
   bool mIsFakeRoad{false};
 };