Skip to content

Fix codechecker violations #15800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 1 commit into from
Sep 16, 2026
+18 −9
Merged

Fix codechecker violations #15800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions Detectors/Upgrades/ALICE3/TRKFT3/FT3/base/src/GeometryTGeo.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ void GeometryTGeo::Build(int loadTrans)
LOG(fatal) << getName() << " volume " << getFT3VolPattern() << " is not in the geometry";
}
auto layerNode = ft3V->GetNode(Form("%s_1", composeSymNameLayer(iDir, iDisc)));
if (layerNode == nullptr)
if (layerNode == nullptr) {
LOG(fatal) << "Could not find layer node " << Form("%s_1", composeSymNameLayer(iDir, iDisc));
}
auto layerVol = layerNode->GetVolume();
if (layerVol == nullptr)
LOG(fatal) << "Could not find layer volume " << Form("%s_1", composeSymNameLayer(iDir, iDisc));
Expand Down Expand Up @@ -137,20 +138,23 @@ void GeometryTGeo::Build(int loadTrans)
}
LOG(info) << "direction " << iDir << " disc " << iDisc << " has " << nNodes << " nodes of which " << nSensor << " sensors in " << chipsPerStave.size() << " staves";

if (nStaves != chipsPerStave.size())
if (nStaves != chipsPerStave.size()) {
LOG(info) << "Inconsistency in stave count " << nStaves << " " << chipsPerStave.size();
}
mChipIdxStave.resize(absStaveIdx + chipsPerStave.size() + 1);
mNumberOfStavesPerDisc.push_back(chipsPerStave.size()); // TODO: remove this? Or remove StaveIdxDisc
int totSensor = 0;
for (int nChips : chipsPerStave) {
LOG(debug) << "Absolute Stave ID " << absStaveIdx << " : " << nChips << " sensors";
totSensor += nChips;
if (absStaveIdx)
if (absStaveIdx) {
mChipIdxStave[absStaveIdx + 1] = mChipIdxStave[absStaveIdx] + nChips;
}
absStaveIdx++;
}
if (totSensor != nSensor)
if (totSensor != nSensor) {
LOG(info) << "Inconsistency in sensor count " << nSensor << " " << totSensor;
}
LOG(debug) << " adding stave Idx " << absStaveIdx << " to disc array; element " << mStaveIdxDisc.size();
mStaveIdxDisc.push_back(absStaveIdx);
mNumberOfChipsPerDisc.push_back(totSensor);
Expand Down Expand Up @@ -256,8 +260,9 @@ void GeometryTGeo::extractChipIds(std::string const volName, int& direction, int
int GeometryTGeo::getChipIndex(int dir, int layer, int stave, int chip) const
{
int absDisc = layer;
if (dir == 1)
if (dir == 1) {
absDisc += mNumberOfDiscs[0];
}
return mChipIdxStave[mStaveIdxDisc[absDisc] + stave] + chip;
}

Expand Down Expand Up @@ -352,21 +357,25 @@ void GeometryTGeo::fillMatrixCache(int mask)
layer = absDisc - mNumberOfDiscs[0];
}
LOG(info) << "Direction " << direction << " layer " << layer;
if (absDisc >= mNumberOfStavesPerDisc.size())
if (absDisc >= mNumberOfStavesPerDisc.size()) {
LOG(fatal) << "Not enough entries in mNumberOfStavesPerDisc " << absDisc << " " << mNumberOfStavesPerDisc.size();
}
for (int stave = 0; stave < mNumberOfStavesPerDisc[absDisc]; stave++) {
int absStave = mStaveIdxDisc[absDisc] + stave;
if (absStave + 1 >= mChipIdxStave.size())
if (absStave + 1 >= mChipIdxStave.size()) {
LOG(fatal) << "Attempting to get absStave + 1 from index array size " << mChipIdxStave.size();
}
int nChip = mChipIdxStave[absStave + 1] - mChipIdxStave[absStave]; // TODO: this is too often == 0
LOG(debug) << "Getting matrices for direction " << direction << " layer " << layer << " stave " << stave << " : " << nChip << " chips";
for (int chip = 0; chip < nChip; chip++) {
int chipIdx = getChipIndex(direction, layer, stave, chip);
if (!gGeoManager->cd(getMatrixPath(direction, layer, stave, chip).c_str()))
if (!gGeoManager->cd(getMatrixPath(direction, layer, stave, chip).c_str())) {
LOG(fatal) << "Geometry path not found " << getMatrixPath(direction, layer, stave, chip);
}
const TGeoHMatrix* matL2G = gGeoManager->GetCurrentMatrix();
if (chipIdx >= mSize)
if (chipIdx >= mSize) {
LOG(fatal) << "ChipIdx " << chipIdx << " out of range " << mSize;
}
cacheL2G.setMatrix(Mat3D(*matL2G), chipIdx);

matL2G->LocalToMaster(locA, gloA);
Expand Down