ITS: cleanup Road

Author: f3sch

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

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

@@ -16,32 +16,24 @@
 #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(); }
+  GPUhd() 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;
+  GPUhdi() int 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 +53,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;
-}
+} // namespace o2::its
 
-template <unsigned char maxRoadSize>
-GPUhdi() int& Road<maxRoadSize>::operator[](const int& i)
-{
-  return mCellIds[i];
-}
-
-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