Skip to content

Commit dd60584

Browse files
Andrea Sofia Trioloatriolo
authored andcommitted
[ALICE3] VD: adapted digitization and clusterization codes to support variable VD petal lenghts according to the simulated geometry
1 parent 8fe6537 commit dd60584

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎Detectors/Upgrades/ALICE3/TRKFT3/common/macros/CheckTopologyDictionary.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ void forEachCluster(const std::string& directory, F&& f)
190190
const auto* pattern = candidate.pattern;
191191
// Left out: at the matrix's edge, or one of several pieces of a crossing.
192192
const bool vd = cluster.subDetID == 0;
193-
const int nRows = vd ? o2::trk::constants::VD::petal::layer::nRows[cluster.layer] : o2::trk::constants::moduleMLOT::chip::nRows;
193+
const int nRows = vd ? o2::trk::SegmentationChip::getNRowsVD(cluster.layer) : o2::trk::constants::moduleMLOT::chip::nRows;
194194
const int nCols = vd ? o2::trk::constants::VD::petal::layer::nCols : o2::trk::constants::moduleMLOT::chip::nCols;
195195
if (cluster.row == 0 || cluster.col == 0 || cluster.row + pattern[0] >= nRows || cluster.col + pattern[1] >= nCols ||
196196
nClusters[candidate.key] > static_cast<int>(candidate.segments.size())) {

‎Detectors/Upgrades/ALICE3/TRKFT3/common/reconstruction/src/Clusterer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void Clusterer<DetID>::ClustererThread::initChip(gsl::span<const Digit> digits,
181181
if (geom) {
182182
if (geom->getSubDetID(chipID) == 0) { // VD
183183
const int layer = geom->getLayer(chipID);
184-
size = constants::VD::petal::layer::nRows[layer] + 2;
184+
size = SegmentationChip::getNRowsVD(layer) + 2;
185185
}
186186
}
187187

‎Detectors/Upgrades/ALICE3/TRKFT3/common/simulation/include/TRKFT3Simulation/ChipDigitsContainer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void o2::trkft3::ChipDigitsContainer::addNoise(UInt_t rofMin, UInt_t rofMax, con
9696
int maxCols = 0;
9797

9898
if (subDetID == 0) {
99-
maxRows = o2::trk::constants::VD::petal::layer::nRows[layer];
99+
maxRows = o2::trk::SegmentationChip::getNRowsVD(layer);
100100
maxCols = o2::trk::constants::VD::petal::layer::nCols;
101101
} else {
102102
maxRows = o2::trk::constants::moduleMLOT::chip::nRows;

‎Detectors/Upgrades/ALICE3/TRKFT3/common/simulation/include/TRKFT3Simulation/Digitizer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class Digitizer
130130
int getNRows(int subDetID, int layer)
131131
{
132132
if (subDetID == 0) { // VD
133-
return o2::trk::constants::VD::petal::layer::nRows[layer];
133+
return o2::trk::SegmentationChip::getNRowsVD(layer);
134134
} else if (subDetID == 1 || subDetID == 2) { // ML/OT
135135
return o2::trk::constants::moduleMLOT::chip::nRows;
136136
}

0 commit comments

Comments
 (0)