Skip to content

Commit f47a756

Browse files
rolavickrolavick
committed
Capital for constexpr
1 parent 3a737d3 commit f47a756

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

‎PWGUD/Tasks/upcVmRof.cxx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ struct UpcVmRof {
174174
std::bitset<o2::constants::lhc::LHCMaxBunches> bcPatternC;
175175

176176
// constants related to ITS ROFs
177-
static constexpr int rofPerOrbit = 6; // valid for pO, OO and PbPb in Run 3
178-
static constexpr int rofShift = 64; // bc shift of ITS. Valid for pO, OO and PbPb in Run 3
177+
static constexpr int RofPerOrbit = 6; // valid for pO, OO and PbPb in Run 3
178+
static constexpr int RofShift = 64; // bc shift of ITS. Valid for pO, OO and PbPb in Run 3
179179

180180
// variables to store run info
181181
int runNumberBc = 0; // run number used to process BCs
@@ -191,12 +191,12 @@ struct UpcVmRof {
191191
// constant related to trigger mask indices
192192
// https://github.com/AliceO2Group/AliceO2/blob/6c0251c35e5cbf6028d2bd6f7e30f9a4fd348e38/DataFormats/Detectors/CTP/src/Configuration.cxx#L1123
193193
// PbPb triggers: 1ZNC, FV0CH+FT0VTX, OO: 1ZNC, FT0CE+FT0VTX
194-
static constexpr int ft0vtxIdx = 2;
195-
static constexpr int ft0ceIdx = 4;
194+
static constexpr int Ft0VtxIdx = 2;
195+
static constexpr int Ft0CeIdx = 4;
196196

197197
// number of tracks for the selected event topologies
198-
static constexpr int nTrksTwoBody = 2;
199-
static constexpr int nTrksFourBody = 4;
198+
static constexpr int NTrksTwoBody = 2;
199+
static constexpr int NTrksFourBody = 4;
200200

201201
// information for selection collisions
202202
Configurable<float> maxAbsPosZ{"maxAbsPosZ", 10.0, "max |Z| position of vtx"};
@@ -246,7 +246,7 @@ struct UpcVmRof {
246246
auto orbitSOR = runInfo.orbitSOR;
247247
auto orbitEOR = runInfo.orbitEOR;
248248
orbitsPerTF = runInfo.orbitsPerTF;
249-
nBCsPerROF = o2::constants::lhc::LHCMaxBunches / rofPerOrbit;
249+
nBCsPerROF = o2::constants::lhc::LHCMaxBunches / RofPerOrbit;
250250
bcSOR = orbitSOR * o2::constants::lhc::LHCMaxBunches; // first bc of the first orbit
251251
nBCsPerTF = orbitsPerTF * o2::constants::lhc::LHCMaxBunches; // duration of TF in bcs
252252
nTF = std::ceil((orbitEOR - orbitSOR) / orbitsPerTF);
@@ -270,9 +270,9 @@ struct UpcVmRof {
270270
// compute ROF for this BC
271271
int getRof(int64_t thisBC)
272272
{
273-
int64_t bctmp = thisBC - rofShift;
273+
int64_t bctmp = thisBC - RofShift;
274274
if (bctmp < 0)
275-
bctmp = o2::constants::lhc::LHCMaxBunches - rofShift - 1;
275+
bctmp = o2::constants::lhc::LHCMaxBunches - RofShift - 1;
276276
return static_cast<int>(bctmp / nBCsPerROF);
277277
}
278278

@@ -337,9 +337,9 @@ struct UpcVmRof {
337337
bcTH1Pointers[Form("bc/%d/tf_H", run)] = bcTH1Registry.add<TH1>(Form("bc/%d/tf_H", run), "analysed time frames;TF;Counts",
338338
{HistType::kTH1D, {{static_cast<int>(nTF / tfPerBin), -0.5, static_cast<double>(nTF) - 0.5}}});
339339
bcTH2Pointers[Form("bc/%d/ft0Vtx_H", run)] = bcTH2Registry.add<TH2>(Form("bc/%d/ft0Vtx_H", run), "ft0Vtx triggers; TF; ROF; Counter",
340-
{HistType::kTH2F, {{static_cast<int>(nTF / tfPerBin), -0.5, static_cast<double>(nTF) - 0.5}, {rofPerOrbit, -0.5, rofPerOrbit - 0.5}}});
340+
{HistType::kTH2F, {{static_cast<int>(nTF / tfPerBin), -0.5, static_cast<double>(nTF) - 0.5}, {RofPerOrbit, -0.5, RofPerOrbit - 0.5}}});
341341
bcTH2Pointers[Form("bc/%d/ft0VtxCe_H", run)] = bcTH2Registry.add<TH2>(Form("bc/%d/ft0VtxCe_H", run), "ft0VtxCe triggers; TF; ROF; Counter",
342-
{HistType::kTH2F, {{static_cast<int>(nTF / tfPerBin), -0.5, static_cast<double>(nTF) - 0.5}, {rofPerOrbit, -0.5, rofPerOrbit - 0.5}}});
342+
{HistType::kTH2F, {{static_cast<int>(nTF / tfPerBin), -0.5, static_cast<double>(nTF) - 0.5}, {RofPerOrbit, -0.5, RofPerOrbit - 0.5}}});
343343

344344
} // addBcHistos
345345

@@ -436,8 +436,8 @@ struct UpcVmRof {
436436

437437
// get triggers
438438
std::bitset<64> mask = bc.inputMask();
439-
bool ft0vtxTrg = mask[ft0vtxIdx];
440-
bool ft0ceTrg = mask[ft0ceIdx];
439+
bool ft0vtxTrg = mask[Ft0VtxIdx];
440+
bool ft0ceTrg = mask[Ft0CeIdx];
441441
if (ft0vtxTrg) {
442442
bcTH2Pointers[Form("bc/%d/ft0Vtx_H", runNumberBc)]->Fill(thisBC, thisROF);
443443
if (ft0ceTrg)
@@ -483,12 +483,12 @@ struct UpcVmRof {
483483
colTH1Pointers[Form("col/%d/colSel_H", runNumberCol)]->Fill(11);
484484

485485
// select number of contributors
486-
if (!((col.numContrib() == nTrksTwoBody) || (col.numContrib() == nTrksFourBody)))
486+
if (!((col.numContrib() == NTrksTwoBody) || (col.numContrib() == NTrksFourBody)))
487487
return;
488-
if (col.numContrib() == nTrksTwoBody) {
488+
if (col.numContrib() == NTrksTwoBody) {
489489
colTH1Pointers[Form("col/%d/colSel_H", runNumberCol)]->Fill(16);
490490
}
491-
if (col.numContrib() == nTrksFourBody) {
491+
if (col.numContrib() == NTrksFourBody) {
492492
colTH1Pointers[Form("col/%d/colSel_H", runNumberCol)]->Fill(18);
493493
}
494494

@@ -529,15 +529,15 @@ struct UpcVmRof {
529529
colTH1Pointers[Form("col/%d/trkSel_H", runNumberCol)]->Fill(8);
530530
selTrks.push_back(track);
531531
}
532-
if (!(((col.numContrib() == nTrksTwoBody) && (selTrks.size() == nTrksTwoBody)) ||
533-
((col.numContrib() == nTrksFourBody) && (selTrks.size() == nTrksFourBody))))
532+
if (!(((col.numContrib() == NTrksTwoBody) && (selTrks.size() == NTrksTwoBody)) ||
533+
((col.numContrib() == NTrksFourBody) && (selTrks.size() == NTrksFourBody))))
534534
return;
535535

536536
// selected events
537-
if ((col.numContrib() == nTrksTwoBody) && (selTrks.size() == nTrksTwoBody)) {
537+
if ((col.numContrib() == NTrksTwoBody) && (selTrks.size() == NTrksTwoBody)) {
538538
colTH1Pointers[Form("col/%d/colSel_H", runNumberCol)]->Fill(17);
539539
}
540-
if ((col.numContrib() == nTrksFourBody) && (selTrks.size() == nTrksFourBody)) {
540+
if ((col.numContrib() == NTrksFourBody) && (selTrks.size() == NTrksFourBody)) {
541541
colTH1Pointers[Form("col/%d/colSel_H", runNumberCol)]->Fill(19);
542542
}
543543

@@ -576,10 +576,10 @@ struct UpcVmRof {
576576
} // FT0 selection
577577

578578
// final number of selected events
579-
if ((col.numContrib() == nTrksTwoBody) && (selTrks.size() == nTrksTwoBody)) {
579+
if ((col.numContrib() == NTrksTwoBody) && (selTrks.size() == NTrksTwoBody)) {
580580
colTH1Pointers[Form("col/%d/colSel_H", runNumberCol)]->Fill(20);
581581
}
582-
if ((col.numContrib() == nTrksFourBody) && (selTrks.size() == nTrksFourBody)) {
582+
if ((col.numContrib() == NTrksFourBody) && (selTrks.size() == NTrksFourBody)) {
583583
colTH1Pointers[Form("col/%d/colSel_H", runNumberCol)]->Fill(21);
584584
}
585585

@@ -664,7 +664,7 @@ struct UpcVmRof {
664664

665665
// fill output table
666666
int recoFlag = (col.flags() & dataformats::Vertex<o2::dataformats::TimeStamp<int>>::Flags::UPCMode) ? 1 : 0;
667-
if (selTrks.size() == nTrksTwoBody) {
667+
if (selTrks.size() == NTrksTwoBody) {
668668
colTH1Pointers[Form("col/%d/twoTrkTF_H", runNumberCol)]->Fill(thisTF);
669669
twoTrkTable(runNumberCol, col.posX(), col.posY(), col.posZ(), col.chi2(), thisBC, thisTF, thisROF, recoFlag,
670670
aFT0A, aFT0C, aFV0A, aFDDA, aFDDC, tFT0A, tFT0C, tFV0A, tFDDA, tFDDC, nFT0A, nFT0C, nFV0A, nFDDA, nFDDC,
@@ -674,7 +674,7 @@ struct UpcVmRof {
674674
selTrks[1].pt(), selTrks[1].eta(), selTrks[1].phi(), selTrks[1].sign(),
675675
selTrks[1].tpcNSigmaPi(), selTrks[1].tpcNSigmaEl(), selTrks[1].tpcNSigmaKa(), selTrks[1].tpcNSigmaPr());
676676
}
677-
if (selTrks.size() == nTrksFourBody) {
677+
if (selTrks.size() == NTrksFourBody) {
678678
colTH1Pointers[Form("col/%d/fourTrkTF_H", runNumberCol)]->Fill(thisTF);
679679
fourTrkTable(runNumberCol, col.posX(), col.posY(), col.posZ(), col.chi2(), thisBC, thisTF, thisROF, recoFlag,
680680
aFT0A, aFT0C, aFV0A, aFDDA, aFDDC, tFT0A, tFT0C, tFV0A, tFDDA, tFDDC, nFT0A, nFT0C, nFV0A, nFDDA, nFDDC,

0 commit comments

Comments
 (0)