Skip to content

Commit af16e0e

Browse files
committed
ALICE3: adapt cluster finding to separated streams per layer
Fix CheckCluster macro
1 parent c5b2f4f commit af16e0e

16 files changed

Lines changed: 473 additions & 896 deletions

File tree

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/AlmiraParam.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ struct AlmiraParam : public o2::conf::ConfigurableParamHelper<AlmiraParam> {
3131
int roFrameLengthInBCPerLayer[kNLayers] = {0}; ///< ROF length in BC per layer
3232
float strobeDelayPerLayer[kNLayers] = {0}; ///< strobe delay in ns per layer
3333
float strobeLengthContPerLayer[kNLayers] = {0}; ///< strobe length in ns per layer
34-
int roFrameBiasInBCPerLayer[kNLayers] = {0}; ///< ROF start bias in BC per layer
35-
int roFrameDelayInBCPerLayer[kNLayers] = {0}; ///< extra ROF delay in BC per layer
34+
int roFrameBiasInBCPerLayer[kNLayers] = {0}; ///< ROF start bias in BC per layer
35+
int roFrameDelayInBCPerLayer[kNLayers] = {0}; ///< extra ROF delay in BC per layer
3636

37-
int getROFLengthInBC(int layer) const {
37+
int getROFLengthInBC(int layer) const
38+
{
3839
if (roFrameLengthInBCPerLayer[layer] > 0) {
3940
return roFrameLengthInBCPerLayer[layer];
4041
} else {
@@ -46,7 +47,6 @@ struct AlmiraParam : public o2::conf::ConfigurableParamHelper<AlmiraParam> {
4647
int getROFBiasInBC(int layer) const { return roFrameBiasInBCPerLayer[layer]; }
4748
int getROFDelayInBC(int layer) const { return roFrameDelayInBCPerLayer[layer]; }
4849

49-
5050
O2ParamDef(AlmiraParam, "TRKAlmiraParam");
5151
};
5252

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/GeometryTGeo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
8989
int getSubDetID(int index) const;
9090
int getPetalCase(int index) const;
9191
int getDisk(int index) const;
92-
int getLayer(int index) const; ///< local layer index within the sub-detector (0-based per VD/MLOT)
93-
int getLayerTRK(int index) const; ///< global layer index across the full TRK (VD layers 0..nVD-1, MLOT layers nVD..nTotal-1)
92+
int getLayer(int index) const; ///< local layer index within the sub-detector (0-based per VD/MLOT)
93+
int getLayerTRK(int index) const; ///< global layer index across the full TRK (VD layers 0..nVD-1, MLOT layers nVD..nTotal-1)
9494
int getStave(int index) const;
9595
int getHalfStave(int index) const;
9696
int getModule(int index) const;

Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/Specs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ constexpr int nCols{static_cast<int>(length / chip::pitchZ)};
100100

101101
namespace ML
102102
{
103-
constexpr int nLayers{3}; // number of layers in the ML
103+
constexpr int nLayers{3}; // number of layers in the ML
104104
constexpr double width{constants::moduleMLOT::width * 1}; // width of the stave
105105
// constexpr double length{constants::moduleMLOT::length * 10}; // length of the stave
106106
constexpr double length{124 * cm}; // length of the stave, hardcoded to fit the implemented geometry
@@ -118,7 +118,7 @@ constexpr double length{258 * cm}; // len
118118
constexpr int nRows{static_cast<int>(width / moduleMLOT::chip::pitchX)}; // number of rows in the halfstave
119119
constexpr int nCols{static_cast<int>(length / moduleMLOT::chip::pitchZ)}; // number of columns in the halfstave
120120
} // namespace halfstave
121-
constexpr int nLayers{5}; // number of layers in the OT
121+
constexpr int nLayers{5}; // number of layers in the OT
122122
constexpr double width{halfstave::width * 2}; // width of the stave
123123
constexpr double length{halfstave::length}; // length of the stave
124124
constexpr int nRows{static_cast<int>(width / moduleMLOT::chip::pitchX)}; // number of rows in the stave

Detectors/Upgrades/ALICE3/TRK/macros/test/CheckBandwidth.C

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ void CheckBandwidth(std::string digifile = "trkdigits.root", std::string inputGe
193193
rofLengthBC[iLayer] = (*rofRecords[iLayer])[1].getBCData().bc - (*rofRecords[iLayer])[0].getBCData().bc;
194194
}
195195

196-
197196
// --- Collision context ---
198197

199198
TFile* ccFile = TFile::Open(collContextFile.data());
@@ -229,7 +228,6 @@ void CheckBandwidth(std::string digifile = "trkdigits.root", std::string inputGe
229228

230229
// --- Accumulate per-chip digit counts across all ROFs ---
231230

232-
233231
std::vector<unsigned long long> digitsPerChip(nChips, 0ull);
234232
std::vector<unsigned int> maxDigitsPerROFPerChip(nChips, 0u);
235233
std::vector<unsigned int> digitsInCurrentROFPerChip(nChips, 0u);

Detectors/Upgrades/ALICE3/TRK/macros/test/CheckClusters.C

Lines changed: 196 additions & 184 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)