Skip to content

Commit 94eb37a

Browse files
author
Marcello Di Costanzo
committed
Update IOTOF cluster finder
1 parent 4914deb commit 94eb37a

9 files changed

Lines changed: 499 additions & 1339 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ struct ClusterInfo {
5959
constexpr ClusterInfo(uint64_t d) : data(d) {}
6060

6161
// Static packer
62-
static constexpr uint64_t pack(uint32_t row, uint32_t col, uint32_t rowSpan,
63-
uint32_t colSpan, uint32_t pattern, uint32_t topology)
62+
static constexpr uint64_t pack(uint32_t row, uint32_t col, uint8_t rowSpan,
63+
uint8_t colSpan, uint32_t pattern, uint32_t topology)
6464
{
6565
return ((static_cast<uint64_t>(row) & MaskRow) << ShiftRow) |
6666
((static_cast<uint64_t>(col) & MaskCol) << ShiftCol) |
@@ -73,8 +73,8 @@ struct ClusterInfo {
7373
// Getters
7474
constexpr uint32_t getRow() const { return (data >> ShiftRow) & MaskRow; }
7575
constexpr uint32_t getCol() const { return (data >> ShiftCol) & MaskCol; }
76-
constexpr uint32_t getRowSpan() const { return (data >> ShiftRowSpan) & MaskRowSpan; }
77-
constexpr uint32_t getColSpan() const { return (data >> ShiftColSpan) & MaskColSpan; }
76+
constexpr uint8_t getRowSpan() const { return (data >> ShiftRowSpan) & MaskRowSpan; }
77+
constexpr uint8_t getColSpan() const { return (data >> ShiftColSpan) & MaskColSpan; }
7878
constexpr uint32_t getPattern() const { return (data >> ShiftPattern) & MaskPattern; }
7979
constexpr uint32_t getTopology() const { return (data >> ShiftTopology) & MaskTopology; }
8080

@@ -87,11 +87,11 @@ struct ClusterInfo {
8787
{
8888
data = (data & ~(MaskCol << ShiftCol)) | ((static_cast<uint64_t>(c) & MaskCol) << ShiftCol);
8989
}
90-
constexpr void setRowSpan(uint32_t rs)
90+
constexpr void setRowSpan(uint8_t rs)
9191
{
9292
data = (data & ~(MaskRowSpan << ShiftRowSpan)) | ((static_cast<uint64_t>(rs) & MaskRowSpan) << ShiftRowSpan);
9393
}
94-
constexpr void setColSpan(uint32_t cs)
94+
constexpr void setColSpan(uint8_t cs)
9595
{
9696
data = (data & ~(MaskColSpan << ShiftColSpan)) | ((static_cast<uint64_t>(cs) & MaskColSpan) << ShiftColSpan);
9797
}
@@ -129,8 +129,8 @@ class Cluster
129129
// Unpack Getters
130130
uint32_t getRow() const { return mClusterInfo.getRow(); }
131131
uint32_t getCol() const { return mClusterInfo.getCol(); }
132-
uint32_t getRowSpan() const { return mClusterInfo.getRowSpan(); }
133-
uint32_t getColSpan() const { return mClusterInfo.getColSpan(); }
132+
uint8_t getRowSpan() const { return mClusterInfo.getRowSpan(); }
133+
uint8_t getColSpan() const { return mClusterInfo.getColSpan(); }
134134
uint32_t getPattern() const { return mClusterInfo.getPattern(); }
135135
uint32_t getTopology() const { return mClusterInfo.getTopology(); }
136136
int getSize() const

0 commit comments

Comments
 (0)