ITS: include cleaning

Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>

Author: f3sch

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

@@ -16,17 +16,12 @@
 #ifndef TRACKINGITSU_INCLUDE_CACLUSTER_H_
 #define TRACKINGITSU_INCLUDE_CACLUSTER_H_
 
-#include "GPUCommonRtypes.h"
-#include "ITStracking/Definitions.h"
-#include "ITStracking/MathUtils.h"
-
-#ifndef GPUCA_GPUCODE_DEVICE
 #include <array>
-#endif
 
-namespace o2
-{
-namespace its
+#include "GPUCommonRtypes.h"
+#include "GPUCommonArray.h"
+
+namespace o2::its
 {
 
 class IndexTableUtils;
@@ -40,13 +35,13 @@ struct Cluster final {
   bool operator==(const Cluster&) const;
   GPUhd() void print() const;
 
-  float xCoordinate;      // = -999.f;
-  float yCoordinate;      // = -999.f;
-  float zCoordinate;      // = -999.f;
-  float phi;              // = -999.f;
-  float radius;           // = -999.f;
-  int clusterId;          // = -1;
-  int indexTableBinIndex; // = -1;
+  float xCoordinate{-999.f};
+  float yCoordinate{-999.f};
+  float zCoordinate{-999.f};
+  float phi{-999.f};
+  float radius{-999.f};
+  int clusterId{-1};
+  int indexTableBinIndex{-1};
 
   ClassDefNV(Cluster, 1);
 };
@@ -62,11 +57,11 @@ 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);
 
-  float xCoordinate;
-  float yCoordinate;
-  float zCoordinate;
-  float xTrackingFrame;
-  float alphaTrackingFrame;
+  float xCoordinate{-999.f};
+  float yCoordinate{-999.f};
+  float zCoordinate{-999.f};
+  float xTrackingFrame{-999.f};
+  float alphaTrackingFrame{-999.f};
   std::array<float, 2> positionTrackingFrame = {-1., -1.};
   std::array<float, 3> covarianceTrackingFrame = {999., 999., 999.};
   GPUdi() void print() const
@@ -78,10 +73,8 @@ struct TrackingFrameInfo {
            covarianceTrackingFrame[0], covarianceTrackingFrame[1], covarianceTrackingFrame[2]);
 #endif
   }
-
-  ClassDefNV(TrackingFrameInfo, 1);
 };
-} // namespace its
-} // namespace o2
+
+} // namespace o2::its
 
 #endif /* TRACKINGITSU_INCLUDE_CACLUSTER_H_ */

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

@@ -28,6 +28,7 @@
 #include "ITStracking/IndexTableUtils.h"
 #include "ITStracking/TimeFrame.h"
 #include "ITStracking/Tracklet.h"
+#include "ITStracking/MathUtils.h"
 
 #include "GPUCommonDef.h"
 #include "GPUCommonMath.h"

Detectors/ITSMFT/ITS/tracking/src/Cluster.cxx

@@ -12,19 +12,15 @@
 /// \file Cluster.cxx
 /// \brief
 ///
+#include "GPUCommonMath.h"
+#include "GPUCommonArray.h"
 
 #include "ITStracking/Cluster.h"
+#include "ITStracking/Definitions.h"
 #include "ITStracking/MathUtils.h"
 #include "ITStracking/IndexTableUtils.h"
 
-#ifndef GPUCA_GPUCODE_DEVICE
-#include <array>
-#endif
-
-namespace o2
-{
-namespace its
-{
+using namespace o2::its;
 
 using math_utils::computePhi;
 using math_utils::getNormalizedPhi;
@@ -35,7 +31,7 @@ Cluster::Cluster(const float x, const float y, const float z, const int index)
     yCoordinate{y},
     zCoordinate{z},
     phi{getNormalizedPhi(computePhi(x, y))},
-    radius{hypot(x, y)},
+    radius{o2::gpu::GPUCommonMath::Hypot(x, y)},
     clusterId{index},
     indexTableBinIndex{0}
 {
@@ -47,7 +43,7 @@ Cluster::Cluster(const int layerIndex, const IndexTableUtils& utils, const Clust
     yCoordinate{other.yCoordinate},
     zCoordinate{other.zCoordinate},
     phi{getNormalizedPhi(computePhi(other.xCoordinate, other.yCoordinate))},
-    radius{hypot(other.xCoordinate, other.yCoordinate)},
+    radius{o2::gpu::GPUCommonMath::Hypot(other.xCoordinate, other.yCoordinate)},
     clusterId{other.clusterId},
     indexTableBinIndex{utils.getBinIndex(utils.getZBinIndex(layerIndex, zCoordinate),
                                          utils.getPhiBinIndex(phi))}
@@ -62,7 +58,7 @@ Cluster::Cluster(const int layerIndex, const float3& primaryVertex, const IndexT
     zCoordinate{other.zCoordinate},
     phi{getNormalizedPhi(
       computePhi(xCoordinate - primaryVertex.x, yCoordinate - primaryVertex.y))},
-    radius{hypot(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))}
@@ -77,7 +73,7 @@ void Cluster::Init(const int layerIndex, const float3& primaryVertex, const Inde
   zCoordinate = other.zCoordinate;
   phi = getNormalizedPhi(
     computePhi(xCoordinate - primaryVertex.x, yCoordinate - primaryVertex.y));
-  radius = hypot(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));
@@ -100,6 +96,3 @@ TrackingFrameInfo::TrackingFrameInfo(float x, float y, float z, float xTF, float
 {
   // Nothing to do
 }
-
-} // namespace its
-} // namespace o2

Detectors/ITSMFT/ITS/tracking/src/TimeFrame.cxx

@@ -14,6 +14,7 @@
 ///
 
 #include "ITStracking/TimeFrame.h"
+#include "ITStracking/MathUtils.h"
 #include "DataFormatsITSMFT/Cluster.h"
 #include "DataFormatsITSMFT/CompCluster.h"
 #include "DataFormatsITSMFT/ROFRecord.h"