Skip to content

Commit 6e15068

Browse files
author
Marcello Di Costanzo
committed
Remove coordinates from Cluster struct
1 parent 3cbae3d commit 6e15068

4 files changed

Lines changed: 0 additions & 42 deletions

File tree

Detectors/Upgrades/ALICE3/IOTOF/DataFormatsIOTOF/include/DataFormatsIOTOF/Cluster.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ struct Cluster {
2727
int16_t subDetID = -1;
2828
int16_t layer = -1;
2929
int16_t disk = -1;
30-
float xCoord = 0.f;
31-
float yCoord = 0.f;
32-
float zCoord = 0.f;
3330
float time = 0.f;
3431

3532
std::string asString() const;

Detectors/Upgrades/ALICE3/IOTOF/macros/CheckClustersIOTOF.C

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ void CheckClustersIOTOF(std::string digiFilePath = "tf3digits.root", std::string
157157
histYCoordCls->Fill(globalClsCoords.y());
158158
histZCoordCls->Fill(globalClsCoords.z());
159159
} // end loop on clusters array
160-
161160
} // end loop on ROFRecords
162161

163162
std::cout << "Cluster array size: " << clsTuple->GetEntries() << std::endl;

Detectors/Upgrades/ALICE3/IOTOF/reconstruction/include/IOTOFReconstruction/Clusterer.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,6 @@ class Clusterer
8989
gsl::span<const DigMC2ROFRecord> digMC2ROFs = {},
9090
std::vector<o2::itsmft::MC2ROFRecord>* clusterMC2ROFs = nullptr);
9191

92-
static o2::math_utils::Point3D<float> getClusterLocalCoordinates(const Cluster& cluster,
93-
math_utils::Point3D<float>& localClsCoords) noexcept;
94-
95-
static o2::math_utils::Point3D<float> getClusterGlobalCoordinates(const Cluster& cluster,
96-
math_utils::Point3D<float>& localClsCoords) noexcept;
97-
9892
protected:
9993
std::unique_ptr<ClustererThread> mThread;
10094
std::vector<int> mSortIdx; ///< reusable per-ROF sort buffer

Detectors/Upgrades/ALICE3/IOTOF/reconstruction/src/Clusterer.cxx

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,6 @@
2222
namespace o2::iotof
2323
{
2424

25-
//__________________________________________________
26-
o2::math_utils::Point3D<float> Clusterer::getClusterGlobalCoordinates(const Cluster& cluster, math_utils::Point3D<float>& coords) noexcept
27-
{
28-
LOG(info) << "[Clusterer] getClusterGlobalCoordinates() called for cluster at chipID " << cluster.chipID
29-
<< ", row " << cluster.row << ", col " << cluster.col;
30-
31-
Segmentation::Instance()->detectorToLocal(cluster.row, cluster.col, coords, cluster.subDetID);
32-
LOG(info) << "[Clusterer] Cluster local coordinates: x=" << coords.x() << ", y=" << coords.y() << ", z=" << coords.z();
33-
GeometryTGeo::Instance()->getMatrixL2G(cluster.chipID)(coords);
34-
35-
LOG(info) << "[Clusterer] Cluster global coordinates: x=" << coords.x() << ", y=" << coords.y() << ", z=" << coords.z();
36-
return coords;
37-
}
38-
39-
//__________________________________________________
40-
o2::math_utils::Point3D<float> Clusterer::getClusterLocalCoordinates(const Cluster& cluster, math_utils::Point3D<float>& coords) noexcept
41-
{
42-
LOG(info) << "[Clusterer] getClusterLocalCoordinates() called for cluster at chipID " << cluster.chipID
43-
<< ", row " << cluster.row << ", col " << cluster.col;
44-
45-
Segmentation::Instance()->detectorToLocal(cluster.row, cluster.col, coords, cluster.subDetID);
46-
47-
LOG(info) << "[Clusterer] Cluster local coordinates: x=" << coords.x() << ", y=" << coords.y() << ", z=" << coords.z();
48-
return coords;
49-
}
50-
5125
//__________________________________________________
5226
void Clusterer::process(gsl::span<const Digit> digits,
5327
gsl::span<const DigROFRecord> digitROFs,
@@ -211,12 +185,6 @@ void Clusterer::ClustererThread::finishChipSingleHitFast(gsl::span<const Digit>
211185
if (geom) {
212186
cluster.subDetID = geom->getIOTOFLayer(chipID);
213187
}
214-
math_utils::Point3D<float> localClsCoords{0.f, 0.f, 0.f};
215-
getClusterLocalCoordinates(cluster, localClsCoords);
216-
// getClusterGlobalCoordinates(cluster, localClsCoords);
217-
cluster.xCoord = localClsCoords.x();
218-
cluster.yCoord = localClsCoords.y();
219-
cluster.zCoord = localClsCoords.z();
220188
cluster.time = time;
221189
clusters.emplace_back(cluster);
222190
}

0 commit comments

Comments
 (0)