Skip to content

Commit 5189d08

Browse files
ekryshenekryshen
committed
Add braces in if statements
1 parent 33f4a4c commit 5189d08

File tree

4 files changed

+48
-32
lines changed

4 files changed

+48
-32
lines changed

‎Detectors/Upgrades/ALICE3/ECal/base/src/Geometry.cxx‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ double Geometry::getFrontFaceMaxEta(int i)
8282
//==============================================================================
8383
void Geometry::fillFrontFaceCenterCoordinates()
8484
{
85-
if (mFrontFaceCenterR.size() > 0)
85+
if (mFrontFaceCenterR.size() > 0) {
8686
return;
87+
}
8788
mFrontFaceCenterTheta.resize(mNCrystalModulesZ + mNSamplingModulesZ);
8889
mFrontFaceZatMinR.resize(mNCrystalModulesZ + mNSamplingModulesZ);
8990
mFrontFaceCenterR.resize(mNCrystalModulesZ + mNSamplingModulesZ);
@@ -232,40 +233,45 @@ int Geometry::areNeighboursVertex(int detId1, int detId2) const
232233
int ch2, sector2, iphi2, iz2;
233234
detIdToRelIndex(detId1, ch1, sector1, iphi1, iz1);
234235
detIdToRelIndex(detId2, ch2, sector2, iphi2, iz2);
235-
if (sector1 != sector2 || ch1 != ch2)
236+
if (sector1 != sector2 || ch1 != ch2) {
236237
return 0;
237-
if (std::abs(iphi1 - iphi2) <= 1 && std::abs(iz1 - iz2) <= 1)
238+
}
239+
if (std::abs(iphi1 - iphi2) <= 1 && std::abs(iz1 - iz2) <= 1) {
238240
return 1;
241+
}
239242
return 0;
240243
}
241244

242245
//==============================================================================
243246
bool Geometry::isAtTheEdge(int cellId)
244247
{
245248
auto [row, col] = globalRowColFromIndex(cellId);
246-
if (col == 0)
249+
if (col == 0) {
247250
return 1;
248-
if (col == mNSamplingModulesZ)
251+
} else if (col == mNSamplingModulesZ) {
249252
return 1;
250-
if (col == mNSamplingModulesZ - 1)
253+
} else if (col == mNSamplingModulesZ - 1) {
251254
return 1;
252-
if (col == mNSamplingModulesZ + 2 * mNCrystalModulesZ)
255+
} else if (col == mNSamplingModulesZ + 2 * mNCrystalModulesZ) {
253256
return 1;
254-
if (col == mNSamplingModulesZ + 2 * mNCrystalModulesZ - 1)
257+
} else if (col == mNSamplingModulesZ + 2 * mNCrystalModulesZ - 1) {
255258
return 1;
256-
if (col == mNModulesZ - 1)
259+
} else if (col == mNModulesZ - 1) {
257260
return 1;
261+
}
258262
for (int m = 0; m <= mNSuperModules; m++) {
259263
if (isCrystal(cellId)) {
260-
if (row == m * mNCrystalModulesPhi)
264+
if (row == m * mNCrystalModulesPhi) {
261265
return 1;
262-
if (row == m * mNCrystalModulesPhi - 1)
266+
} else if (row == m * mNCrystalModulesPhi - 1) {
263267
return 1;
268+
}
264269
} else {
265-
if (row == m * mNSamplingModulesPhi)
270+
if (row == m * mNSamplingModulesPhi) {
266271
return 1;
267-
if (row == m * mNSamplingModulesPhi - 1)
272+
} else if (row == m * mNSamplingModulesPhi - 1) {
268273
return 1;
274+
}
269275
}
270276
}
271277
return 0;

‎Detectors/Upgrades/ALICE3/ECal/reconstruction/src/Clusterizer.cxx‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,24 @@ void Clusterizer::findClusters(const gsl::span<const Digit>& digits, std::vector
133133
void Clusterizer::addDigitToCluster(Cluster& cluster, int row, int col, const gsl::span<const Digit>& digits)
134134
{
135135
auto& geo = Geometry::instance();
136-
if (row < 0 || row >= geo.getNrows() || col < 0 || col >= geo.getNcols())
136+
if (row < 0 || row >= geo.getNrows() || col < 0 || col >= geo.getNcols()) {
137137
return;
138+
}
138139
int digitIndex = mDigitIndices[row][col];
139140
LOGP(debug, " checking row={} and col={} digitIndex={}", row, col, digitIndex);
140-
if (digitIndex < 0)
141+
if (digitIndex < 0) {
141142
return;
142-
143+
}
143144
const Digit& digit = digits[digitIndex];
144145
if (cluster.getMultiplicity() > 0) {
145146
// check if new digit is in the same chamber and sector
146147
const Digit& digit2 = digits[cluster.getDigitIndex(0)];
147148
auto [sector1, ch1] = geo.getSectorChamber(digit.getTower());
148149
auto [sector2, ch2] = geo.getSectorChamber(digit2.getTower());
149150
LOGP(debug, " checking if sector and chamber are the same: ({},{}) ({},{})", sector1, ch1, sector2, ch2);
150-
if (sector1 != sector2 || ch1 != ch2)
151+
if (sector1 != sector2 || ch1 != ch2) {
151152
return;
153+
}
152154
}
153155

154156
mDigitIndices[row][col] = -1;
@@ -179,11 +181,13 @@ void Clusterizer::makeClusters(const gsl::span<const Digit>& digits, std::vector
179181
auto [row, col] = geo.globalRowColFromIndex(digit.getTower());
180182
bool isCrystal = geo.isCrystal(digit.getTower());
181183
if (isCrystal) {
182-
if (digit.getEnergy() < mCrystalDigitThreshold)
184+
if (digit.getEnergy() < mCrystalDigitThreshold) {
183185
continue;
186+
}
184187
} else {
185-
if (digit.getEnergy() < mSamplingDigitThreshold)
188+
if (digit.getEnergy() < mSamplingDigitThreshold) {
186189
continue;
190+
}
187191
}
188192
mDigitIndices[row][col] = i;
189193
}
@@ -192,10 +196,12 @@ void Clusterizer::makeClusters(const gsl::span<const Digit>& digits, std::vector
192196
for (int i = 0; i < nDigits; i++) {
193197
const Digit& digitSeed = digits[i];
194198
auto [row, col] = geo.globalRowColFromIndex(digitSeed.getTower());
195-
if (mDigitIndices[row][col] < 0)
199+
if (mDigitIndices[row][col] < 0) {
196200
continue; // digit was already added in one of the clusters
197-
if (digitSeed.getEnergy() < mClusteringThreshold)
201+
}
202+
if (digitSeed.getEnergy() < mClusteringThreshold) {
198203
continue;
204+
}
199205
LOGP(debug, " starting new cluster at row={} and col={}", row, col);
200206
auto& cluster = clusters.emplace_back();
201207
addDigitToCluster(cluster, row, col, digits);
@@ -382,8 +388,9 @@ void Clusterizer::evalClusters(std::vector<Cluster>& clusters)
382388
double xi, yi, zi;
383389
geo.detIdToGlobalPosition(towerId, xi, yi, zi);
384390
double r = std::sqrt((x - xi) * (x - xi) + (y - yi) * (y - yi) + (z - zi) * (z - zi));
385-
if (r > 2.2)
391+
if (r > 2.2) {
386392
continue;
393+
}
387394
double frac = fCrystalShowerShape->Eval(r);
388395
double rms = fCrystalRMS->Eval(r);
389396
chi2 += std::pow((energy / ee - frac) / rms, 2.);
@@ -409,10 +416,10 @@ void Clusterizer::evalClusters(std::vector<Cluster>& clusters)
409416
bool isEdge = 0;
410417
for (size_t i = 0; i < cluster.getMultiplicity(); i++) {
411418
int towerId = cluster.getDigitTowerId(i);
412-
if (!geo.isAtTheEdge(towerId))
413-
continue;
414-
isEdge = 1;
415-
break;
419+
if (geo.isAtTheEdge(towerId)) {
420+
isEdge = 1;
421+
break;
422+
}
416423
}
417424
cluster.setEdgeFlag(isEdge);
418425

@@ -434,8 +441,9 @@ int Clusterizer::getNumberOfLocalMax(Cluster& clu, int* maxAt, float* maxAtEnerg
434441
for (int i = 0; i < n; i++) {
435442
isLocalMax[i] = false;
436443
float en1 = clu.getDigitEnergy(i);
437-
if (en1 > mClusteringThreshold)
444+
if (en1 > mClusteringThreshold) {
438445
isLocalMax[i] = true;
446+
}
439447
}
440448

441449
for (int i = 0; i < n; i++) {

‎Detectors/Upgrades/ALICE3/ECal/simulation/src/Detector.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,9 @@ bool Detector::ProcessHits(FairVolume* vol)
358358
return false;
359359
}
360360

361-
if (isCrystal)
361+
if (isCrystal) {
362362
LOGP(debug, "Processing crystal {}", volName.Data());
363-
else {
363+
} else {
364364
eloss *= mSamplingFactorTransportModel;
365365
LOGP(debug, "Processing scintillator {}", volName.Data());
366366
}

‎Detectors/Upgrades/ALICE3/ECal/simulation/src/Digitizer.cxx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,18 @@ void Digitizer::processHits(const std::vector<Hit>* hits, std::vector<Digit>& di
5757
bool isCrystal = geo.isCrystal(cellID);
5858
if (isCrystal) { // crystal
5959
double elossSmearedNpe = gRandom->Poisson(eloss * mCrystalPePerGeV) / mCrystalPePerGeV;
60-
if (mSmearCrystal)
60+
if (mSmearCrystal) {
6161
elossSmeared = elossSmearedNpe * gRandom->Gaus(1, 0.007); // light attenuation in crystals
62-
} else { // sampling
62+
}
63+
} else { // sampling
6364
elossSmeared *= mSamplingFraction;
6465
}
6566

6667
Digit& digit = mArrayD[cellID];
6768
digit.setAmplitude(digit.getAmplitude() + elossSmeared);
68-
if (t < digit.getTimeStamp())
69+
if (t < digit.getTimeStamp()) {
6970
digit.setTimeStamp(t); // setting earliest time, TODO: add time smearing
71+
}
7072
LOGF(debug, " crystal: %d cellID = %5d, eloss = %8.5f elossSmeared = %8.5f time = %8.5f", isCrystal, cellID, eloss, elossSmeared, t);
7173

7274
// Adding MC info

0 commit comments

Comments
 (0)