Skip to content

ALICE3-TRK: Fix readability-braces-around-statements errors #14778

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
mconcas merged 2 commits into from
Oct 30, 2025
Merged

ALICE3-TRK: Fix readability-braces-around-statements errors #14778

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31f703f
Refactor conditionals for clarity in VDGeometryBuilder
mconcas Oct 30, 2025
578dd92
Fix while loop syntax for shape name generation
mconcas Oct 30, 2025
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
45 changes: 30 additions & 15 deletions Detectors/Upgrades/ALICE3/TRK/simulation/src/VDGeometryBuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,28 @@ inline bool isSolidToCut(const TGeoVolume* v)
const char* nm = v->GetName();
const char* med = v->GetMedium() ? v->GetMedium()->GetName() : "";
// silicon sensors (barrel + disks)
if (med && strcmp(med, "TRK_SILICON$") == 0)
if (med && strcmp(med, "TRK_SILICON$") == 0) {
return true;
}
// walls, sidewalls, cold-plate, service rings (names from your builders)
if (TString(nm).BeginsWith("VD_InnerWallArc"))
if (TString(nm).BeginsWith("VD_InnerWallArc")) {
return true;
if (TString(nm).BeginsWith("VD_OuterWallArc"))
}
if (TString(nm).BeginsWith("VD_OuterWallArc")) {
return true;
if (TString(nm).BeginsWith("VD_SideWall"))
}
if (TString(nm).BeginsWith("VD_SideWall")) {
return true;
if (TString(nm).Contains("_Coldplate"))
}
if (TString(nm).Contains("_Coldplate")) {
return true;
if (TString(nm).BeginsWith("IRIS_Service_Neg"))
}
if (TString(nm).BeginsWith("IRIS_Service_Neg")) {
return true;
if (TString(nm).BeginsWith("IRIS_Service_Pos_InVac"))
}
if (TString(nm).BeginsWith("IRIS_Service_Pos_InVac")) {
return true;
}
return false;
}

Expand All @@ -83,11 +90,13 @@ inline const char* ensureShapeName(TGeoVolume* v)
int k = 0;
TString cand = wanted;
auto* shapes = gGeoManager ? gGeoManager->GetListOfShapes() : nullptr;
while (shapes && shapes->FindObject(cand))
while (shapes && shapes->FindObject(cand)) {
cand = Form("%s_%d", wanted.Data(), ++k);
}
sh->SetName(cand);
if (shapes && !shapes->FindObject(cand))
if (shapes && !shapes->FindObject(cand)) {
shapes->Add(sh);
}
}
return sh->GetName();
}
Expand All @@ -102,23 +111,26 @@ inline void appendLocalTerm(const char* shapeName, const TGeoHMatrix& H)
auto* ct = new TGeoCombiTrans(H);
ct->SetName(Form("IRIS_LOC_TR_%d", gLocalTrIdx++));
ct->RegisterYourself();
if (!gPetalSolidsFormula.IsNull())
if (!gPetalSolidsFormula.IsNull()) {
gPetalSolidsFormula += "+";
}
gPetalSolidsFormula += TString::Format("%s:%s", shapeName, ct->GetName());
}

// DFS: compose LOCAL transforms only (identity prefix), to capture the petal contents
void traversePetalLocal(TGeoVolume* vol, const TGeoHMatrix& prefix)
{
auto* nodes = vol->GetNodes();
if (!nodes)
if (!nodes) {
return;
}
for (int i = 0; i < nodes->GetEntriesFast(); ++i) {
auto* node = (TGeoNode*)nodes->At(i);
auto* childV = node->GetVolume();
TGeoHMatrix H(prefix);
if (auto* m = node->GetMatrix())
if (auto* m = node->GetMatrix()) {
H.Multiply(m);
}

if (isSolidToCut(childV)) {
const char* shapeName = ensureShapeName(childV);
Expand All @@ -132,8 +144,9 @@ void traversePetalLocal(TGeoVolume* vol, const TGeoHMatrix& prefix)
inline void buildPetalSolidsComposite(TGeoVolume* petalAsm)
{
// If it already exists, skip
if (gGeoManager && gGeoManager->GetListOfShapes() && gGeoManager->GetListOfShapes()->FindObject("IRIS_PETAL_SOLIDSsh"))
if (gGeoManager && gGeoManager->GetListOfShapes() && gGeoManager->GetListOfShapes()->FindObject("IRIS_PETAL_SOLIDSsh")) {
return;
}

gPetalSolidsFormula.Clear();
gLocalTrIdx = 0;
Expand Down Expand Up @@ -162,8 +175,9 @@ inline void buildIrisCutoutFromPetalSolid(int nPetals)
auto* RT = new TGeoCombiTrans(0, 0, 0, R);
RT->SetName(Form("IRIS_PETAL_ROT_%d", p));
RT->RegisterYourself();
if (p)
if (p) {
cutFormula += "+";
}
cutFormula += Form("IRIS_PETAL_SOLIDSsh:%s", RT->GetName());
}
LOGP(info, "IRIS_CUTOUTsh formula: {}", cutFormula.Data());
Expand Down Expand Up @@ -257,8 +271,9 @@ inline double degFromArc(double arc, double radius)
*/
inline double phiSpanFromGap(int nPetals, double gap, double radius)
{
if (nPetals <= 0 || radius <= 0.f)
if (nPetals <= 0 || radius <= 0.f) {
return 0.f;
}
const double petalPhiDeg = 360.f / nPetals;
const double phi = petalPhiDeg - degFromArc(gap, radius);
return phi > 0.f ? phi : 0.f;
Expand Down