Skip to content

Commit 3b22b74

Browse files
committed
ITS: fix stray array include Cluster
1 parent 87bbde8 commit 3b22b74

File tree

2 files changed

+16
-27
lines changed

2 files changed

+16
-27
lines changed

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

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
#ifndef TRACKINGITSU_INCLUDE_CACLUSTER_H_
1717
#define TRACKINGITSU_INCLUDE_CACLUSTER_H_
1818

19-
#include <array>
20-
2119
#include "GPUCommonRtypes.h"
2220
#include "GPUCommonArray.h"
2321

@@ -32,7 +30,7 @@ struct Cluster final {
3230
Cluster(const int, const IndexTableUtils& utils, const Cluster&);
3331
Cluster(const int, const float3&, const IndexTableUtils& utils, const Cluster&);
3432
void Init(const int, const float3&, const IndexTableUtils& utils, const Cluster&);
35-
bool operator==(const Cluster&) const;
33+
bool operator==(const Cluster&) const = default;
3634
GPUhd() void print() const;
3735

3836
float xCoordinate{-999.f};
@@ -46,13 +44,6 @@ struct Cluster final {
4644
ClassDefNV(Cluster, 1);
4745
};
4846

49-
GPUhdi() void Cluster::print() const
50-
{
51-
#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
52-
printf("Cluster: %f %f %f %f %f %d %d\n", xCoordinate, yCoordinate, zCoordinate, phi, radius, clusterId, indexTableBinIndex);
53-
#endif
54-
}
55-
5647
struct TrackingFrameInfo {
5748
TrackingFrameInfo() = default;
5849
TrackingFrameInfo(float x, float y, float z, float xTF, float alpha, std::array<float, 2>&& posTF, std::array<float, 3>&& covTF);
@@ -64,15 +55,7 @@ struct TrackingFrameInfo {
6455
float alphaTrackingFrame{-999.f};
6556
std::array<float, 2> positionTrackingFrame = {-1., -1.};
6657
std::array<float, 3> covarianceTrackingFrame = {999., 999., 999.};
67-
GPUdi() void print() const
68-
{
69-
#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
70-
printf("x: %f y: %f z: %f xTF: %f alphaTF: %f posTF: %f %f covTF: %f %f %f\n",
71-
xCoordinate, yCoordinate, zCoordinate, xTrackingFrame, alphaTrackingFrame,
72-
positionTrackingFrame[0], positionTrackingFrame[1],
73-
covarianceTrackingFrame[0], covarianceTrackingFrame[1], covarianceTrackingFrame[2]);
74-
#endif
75-
}
58+
GPUdi() void print() const;
7659
};
7760

7861
} // namespace o2::its

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,11 @@ void Cluster::Init(const int layerIndex, const float3& primaryVertex, const Inde
7979
utils.getPhiBinIndex(phi));
8080
}
8181

82-
bool Cluster::operator==(const Cluster& rhs) const
82+
GPUhd() void Cluster::print() const
8383
{
84-
return this->xCoordinate == rhs.xCoordinate &&
85-
this->yCoordinate == rhs.yCoordinate &&
86-
this->zCoordinate == rhs.zCoordinate &&
87-
this->phi == rhs.phi &&
88-
this->radius == rhs.radius &&
89-
this->clusterId == rhs.clusterId &&
90-
this->indexTableBinIndex == rhs.indexTableBinIndex;
84+
#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
85+
printf("Cluster: %f %f %f %f %f %d %d\n", xCoordinate, yCoordinate, zCoordinate, phi, radius, clusterId, indexTableBinIndex);
86+
#endif
9187
}
9288

9389
TrackingFrameInfo::TrackingFrameInfo(float x, float y, float z, float xTF, float alpha, std::array<float, 2>&& posTF,
@@ -96,3 +92,13 @@ TrackingFrameInfo::TrackingFrameInfo(float x, float y, float z, float xTF, float
9692
{
9793
// Nothing to do
9894
}
95+
96+
GPUdi() void TrackingFrameInfo::print() const
97+
{
98+
#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
99+
printf("x: %f y: %f z: %f xTF: %f alphaTF: %f posTF: %f %f covTF: %f %f %f\n",
100+
xCoordinate, yCoordinate, zCoordinate, xTrackingFrame, alphaTrackingFrame,
101+
positionTrackingFrame[0], positionTrackingFrame[1],
102+
covarianceTrackingFrame[0], covarianceTrackingFrame[1], covarianceTrackingFrame[2]);
103+
#endif
104+
}

0 commit comments

Comments
 (0)