Skip to content

Commit 22b58c3

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 00ba2ef commit 22b58c3

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎Common/TableProducer/caloClusterProducer.cxx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ struct caloClusterProducerTask {
7676
static constexpr int16_t kCpvX = 7; // grid 6 steps along z and 7 along phi as largest match ellips 20x20 cm
7777
static constexpr int16_t kCpvZ = 6;
7878
static constexpr int16_t kCpvCells = 4 * kCpvX * kCpvZ; // 4 modules
79-
static constexpr float kCpvMaxX = 73; // max CPV coordinate phi
80-
static constexpr float kCpvMaxZ = 63; // max CPV coordinate z
79+
static constexpr float kCpvMaxX = 73; // max CPV coordinate phi
80+
static constexpr float kCpvMaxZ = 63; // max CPV coordinate z
8181

8282
class TrackMatch
8383
{
@@ -128,15 +128,15 @@ struct caloClusterProducerTask {
128128
}
129129
std::map<int64_t, int> bcMap;
130130
int bcId = 0;
131-
for (const auto & bc : bcs) {
131+
for (const auto& bc : bcs) {
132132
bcMap[bc.globalBC()] = bcId;
133133
bcId++;
134134
}
135135

136136
// If several collisions appear in BC, choose one with largers number of contributors
137137
std::map<int64_t, int> colMap;
138138
int colId = 0;
139-
for (const auto & cl : colls) {
139+
for (const auto& cl : colls) {
140140
auto colbc = colMap.find(cl.bc_as<aod::BCsWithTimestamps>().globalBC());
141141
if (colbc == colMap.end()) { // single collision per BC
142142
colMap[cl.bc_as<aod::BCsWithTimestamps>().globalBC()] = colId;
@@ -351,7 +351,7 @@ struct caloClusterProducerTask {
351351
float sigmaX = 1. / std::min(5.2, 1.111 + 0.56 * std::exp(-0.031 * e * e) + 4.8 / std::pow(e + 0.61, 3)); // inverse sigma X
352352
float sigmaZ = 1. / std::min(3.3, 1.12 + 0.35 * std::exp(-0.032 * e * e) + 0.75 / std::pow(e + 0.24, 3)); // inverse sigma Z
353353

354-
for (const int & indx : regions) {
354+
for (const int& indx : regions) {
355355
if (indx >= 0 && indx < kCpvCells) {
356356
for (int ii = cpvPoints->mStart[indx]; ii < cpvPoints->mEnd[indx]; ii++) {
357357
auto p = cpvMatchPoints[indx][ii];
@@ -422,15 +422,15 @@ struct caloClusterProducerTask {
422422
}
423423
std::map<int64_t, int> bcMap;
424424
int bcId = 0;
425-
for (auto const & bc : bcs) {
425+
for (auto const& bc : bcs) {
426426
bcMap[bc.globalBC()] = bcId;
427427
bcId++;
428428
}
429429

430430
// If several collisions appear in BC, choose one with largers number of contributors
431431
std::map<int64_t, int> colMap;
432432
int colId = 0;
433-
for (auto const &cl : colls) {
433+
for (auto const& cl : colls) {
434434
auto colbc = colMap.find(cl.bc_as<aod::BCsWithTimestamps>().globalBC());
435435
if (colbc == colMap.end()) { // single collision per BC
436436
colMap[cl.bc_as<aod::BCsWithTimestamps>().globalBC()] = colId;
@@ -694,7 +694,7 @@ struct caloClusterProducerTask {
694694
mclabels.clear();
695695
mcamplitudes.clear();
696696
gsl::span<const o2::phos::MCLabel> spDigList = outputTruthCont.getLabels(i);
697-
for (const auto &cellLab : spDigList) {
697+
for (const auto& cellLab : spDigList) {
698698
mclabels.push_back(cellLab.getTrackID()); // Track ID in current event?
699699
mcamplitudes.push_back(cellLab.getEdep());
700700
}
@@ -765,15 +765,15 @@ struct caloClusterProducerTask {
765765

766766
std::map<int64_t, int> bcMap;
767767
int bcId = 0;
768-
for (const auto &bc : bcs) {
768+
for (const auto& bc : bcs) {
769769
bcMap[bc.globalBC()] = bcId;
770770
bcId++;
771771
}
772772

773773
// If several collisions appear in BC, choose one with largers number of contributors
774774
std::map<int64_t, int> colMap;
775775
int colId = 0;
776-
for (const auto &cl : colls) {
776+
for (const auto& cl : colls) {
777777
auto colbc = colMap.find(cl.bc_as<aod::BCsWithTimestamps>().globalBC());
778778
if (colbc == colMap.end()) { // single collision per BC
779779
colMap[cl.bc_as<aod::BCsWithTimestamps>().globalBC()] = colId;
@@ -1174,15 +1174,15 @@ struct caloClusterProducerTask {
11741174

11751175
std::map<int64_t, int> bcMap;
11761176
int bcId = 0;
1177-
for (const auto & bc : bcs) {
1177+
for (const auto& bc : bcs) {
11781178
bcMap[bc.globalBC()] = bcId;
11791179
bcId++;
11801180
}
11811181

11821182
// If several collisions appear in BC, choose one with largers number of contributors
11831183
std::map<int64_t, int> colMap;
11841184
int colId = 0;
1185-
for (const auto & cl : colls) {
1185+
for (const auto& cl : colls) {
11861186
auto colbc = colMap.find(cl.bc_as<aod::BCsWithTimestamps>().globalBC());
11871187
if (colbc == colMap.end()) { // single collision per BC
11881188
colMap[cl.bc_as<aod::BCsWithTimestamps>().globalBC()] = colId;
@@ -1545,7 +1545,7 @@ struct caloClusterProducerTask {
15451545
mclabels.clear();
15461546
mcamplitudes.clear();
15471547
gsl::span<const o2::phos::MCLabel> spDigList = outputTruthCont.getLabels(i);
1548-
for (const auto & cellLab : spDigList) {
1548+
for (const auto& cellLab : spDigList) {
15491549
mclabels.push_back(cellLab.getTrackID()); // Track ID in current event?
15501550
mcamplitudes.push_back(cellLab.getEdep());
15511551
}
@@ -1617,7 +1617,7 @@ struct caloClusterProducerTask {
16171617
const float etaMax = 0.178266;
16181618
double bz = o2::base::Propagator::Instance()->getNominalBz(); // magnetic field
16191619

1620-
trackPhi = RecoDecay::constrainAngle(trackPhi,0.,1); //constrain angle to range 0,twoPi
1620+
trackPhi = RecoDecay::constrainAngle(trackPhi, 0., 1); // constrain angle to range 0,twoPi
16211621
if (trackPhi < phiMin || trackPhi > phiMax || std::abs(trackEta) > etaMax) { // do not match even approximately
16221622
return false;
16231623
}
@@ -1632,7 +1632,7 @@ struct caloClusterProducerTask {
16321632
}
16331633

16341634
// get PHOS radius
1635-
const double shiftY = -1.26; // Depth-optimized
1635+
const double shiftY = -1.26; // Depth-optimized
16361636
double posL[3] = {0., 0., shiftY}; // local position at the center of module
16371637
double posG[3] = {0};
16381638
geomPHOS->getAlignmentMatrix(module)->LocalToMaster(posL, posG);

‎PWGEM/Tasks/phosNonlin.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ struct phosNonlin {
180180

181181
mCurEvent.clear();
182182
int i, j, k, l;
183-
for (auto const & clu : clusters) {
183+
for (auto const& clu : clusters) {
184184
if (clu.e() < minCluE ||
185185
clu.ncell() < minCluNcell ||
186186
clu.time() > maxCluTime || clu.time() < minCluTime ||

‎PWGEM/Tasks/phosPi0.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ struct phosPi0 {
374374
if constexpr (isMC) {
375375
// check current collision Id for clusters
376376
int cluMcBCId = -1;
377-
for (const auto &clu : clusters) {
377+
for (const auto& clu : clusters) {
378378
auto mcList = clu.labels(); // const std::vector<int>
379379
int nParents = mcList.size();
380380
for (int iParent = 0; iParent < nParents; iParent++) { // Not found nbar parent yiet
@@ -462,7 +462,7 @@ struct phosPi0 {
462462
}
463463
Photon ph1(clu.px(), clu.py(), clu.pz(), clu.e(), clu.mod(), testLambda(clu.e(), clu.m02(), clu.m20()), clu.trackdist() > cpvCut, mcLabel);
464464
// Mix with other photons added to stack
465-
for (cosnt auto & ph2 : mCurEvent) {
465+
for (cosnt auto& ph2 : mCurEvent) {
466466
double m = std::pow(ph1.e + ph2.e, 2) - std::pow(ph1.px + ph2.px, 2) -
467467
std::pow(ph1.py + ph2.py, 2) - std::pow(ph1.pz + ph2.pz, 2);
468468
if (m > 0) {
@@ -510,9 +510,9 @@ struct phosPi0 {
510510
}
511511

512512
// Mixed
513-
for (const auto & ph1 : mCurEvent) {
514-
for (const auto & mixEvent : mMixedEvents[mixedEventBin]) {
515-
for (const auto &ph2 : mixEvent) {
513+
for (const auto& ph1 : mCurEvent) {
514+
for (const auto& mixEvent : mMixedEvents[mixedEventBin]) {
515+
for (const auto& ph2 : mixEvent) {
516516
double m = std::pow(ph1.e + ph2.e, 2) - std::pow(ph1.px + ph2.px, 2) -
517517
std::pow(ph1.py + ph2.py, 2) - std::pow(ph1.pz + ph2.pz, 2);
518518
if (m > 0) {
@@ -597,14 +597,14 @@ struct phosPi0 {
597597
int mcLabel = -1;
598598
Photon ph1(clu.px(), clu.py(), clu.pz(), clu.e(), clu.mod(), testLambda(clu.e(), clu.m02(), clu.m20()), clu.trackdist() > cpvCut, mcLabel);
599599
// Mix with other photons added to stack
600-
for (const auto & ph2 : mCurEvent) {
600+
for (const auto& ph2 : mCurEvent) {
601601
double m = std::pow(ph1.e + ph2.e, 2) - std::pow(ph1.px + ph2.px, 2) -
602602
std::pow(ph1.py + ph2.py, 2) - std::pow(ph1.pz + ph2.pz, 2);
603603
if (m > 0) {
604604
m = std::sqrt(m);
605605
}
606606
double pt = std::sqrt(std::pow(ph1.px + ph2.px, 2) +
607-
std::pow(ph1.py + ph2.py, 2));
607+
std::pow(ph1.py + ph2.py, 2));
608608
int modComb = moduleCombination(ph1.mod, ph2.mod);
609609
hReMod->Fill(m, pt, modComb);
610610
hReAll->Fill(m, pt);
@@ -625,16 +625,16 @@ struct phosPi0 {
625625
}
626626

627627
// Mixed
628-
for (const auto & ph1 : mCurEvent) {
629-
for (const auto & mixEvent : mMixedEvents[mixedEventBin]) {
630-
for (const auto &ph2 : mixEvent) {
628+
for (const auto& ph1 : mCurEvent) {
629+
for (const auto& mixEvent : mMixedEvents[mixedEventBin]) {
630+
for (const auto& ph2 : mixEvent) {
631631
double m = std::pow(ph1.e + ph2.e, 2) - std::pow(ph1.px + ph2.px, 2) -
632632
std::pow(ph1.py + ph2.py, 2) - std::pow(ph1.pz + ph2.pz, 2);
633633
if (m > 0) {
634634
m = std::sqrt(m);
635635
}
636636
double pt = std::sqrt(std::pow(ph1.px + ph2.px, 2) +
637-
std::pow(ph1.py + ph2.py, 2));
637+
std::pow(ph1.py + ph2.py, 2));
638638
int modComb = moduleCombination(ph1.mod, ph2.mod);
639639
hMiMod->Fill(m, pt, modComb);
640640
hMiAll->Fill(m, pt);

0 commit comments

Comments
 (0)