Skip to content

Please consider the following formatting changes to #11495 #422

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
ddobrigk merged 1 commit into from
Jun 6, 2025
Merged

Please consider the following formatting changes to #11495 #422

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
16 changes: 8 additions & 8 deletions Common/Tools/MultModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
"CentFDDMs",
"CentNTPVs",
"CentNGlobals",
"CentMFTs",
"BCCentFT0Ms",
"BCCentFT0As",
"CentMFTs",
"BCCentFT0Ms",
"BCCentFT0As",
"BCCentFT0Cs"};

static constexpr int nTablesConst = 35;
Expand Down Expand Up @@ -159,7 +159,7 @@
kCentNTPVs, // standard Run 3
kCentNGlobals, // requires track selection task
kCentMFTs, // requires MFT task
kBCCentFT0Ms, // bc centrality
kBCCentFT0Ms, // bc centrality
kBCCentFT0As, // bc centrality
kBCCentFT0Cs, // bc centrality
kNTables };
Expand Down Expand Up @@ -526,7 +526,7 @@
auto amplitude = fv0.amplitude()[ii];
auto channel = fv0.channel()[ii];
mults.multFV0A += amplitude;
if (channel > 7) {

Check failure on line 529 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multFV0AOuter += amplitude;
}
}
Expand Down Expand Up @@ -623,9 +623,9 @@
if (track.isPVContributor()) {
if (std::abs(track.eta()) < 1.0) {
mults.multNContribsEta1++; // pvmults
if (std::abs(track.eta()) < 0.8) {

Check failure on line 626 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNContribs++; // pvmults
if (std::abs(track.eta()) < 0.5) {

Check failure on line 628 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNContribsEtaHalf++; // pvmults
}
}
Expand Down Expand Up @@ -660,14 +660,14 @@
}
mults.multNbrContribsEta10GlobalTrackWoDCA++;

if (std::abs(track.eta()) < 0.8) {

Check failure on line 663 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNbrContribsEta08GlobalTrackWoDCA++;
}
if (std::abs(track.eta()) < 0.5) {

Check failure on line 666 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNbrContribsEta05GlobalTrackWoDCA++;
}
}
if (std::fabs(track.eta()) < 0.8 && track.tpcNClsFound() >= 80 && track.tpcNClsCrossedRows() >= 100) {

Check failure on line 670 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (track.isGlobalTrack()) {
mults.multGlobalTracks++;
}
Expand Down Expand Up @@ -728,20 +728,20 @@
if (p != nullptr) {
charge = p->Charge();
}
if (std::abs(charge) < 1e-3) {

Check failure on line 731 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
continue; // reject neutral particles in counters
}

if (std::abs(mcPart.eta()) < 1.0) {
multBarrelEta10++;
if (std::abs(mcPart.eta()) < 0.8) {

Check failure on line 737 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
multBarrelEta08++;
if (std::abs(mcPart.eta()) < 0.5) {

Check failure on line 739 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
multBarrelEta05++;
}
}
}
if (-3.3 < mcPart.eta() && mcPart.eta() < -2.1)

Check failure on line 744 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
multFT0C++;
if (3.5 < mcPart.eta() && mcPart.eta() < 4.9)
multFT0A++;
Expand Down Expand Up @@ -952,10 +952,10 @@
populateTable(cursors.centMFTs, mftInfo, mults[iEv].multMFTTracks, isInelGt0);
}

// populate centralities per BC
// populate centralities per BC
for (size_t ibc = 0; ibc < bcs.size(); ibc++) {
float bcMultFT0A = 0;
float bcMultFT0C = 0;
float bcMultFT0A = 0;
float bcMultFT0C = 0;

const auto& bc = bcs.rawIteratorAt(ibc);
if (bc.has_foundFT0()) {
Expand All @@ -969,7 +969,7 @@
}

if (internalOpts.mEnabledTables[kBCCentFT0Ms])
populateTable(cursors.bcCentFT0M, ft0mInfo, bcMultFT0A+bcMultFT0C, true);
populateTable(cursors.bcCentFT0M, ft0mInfo, bcMultFT0A + bcMultFT0C, true);
if (internalOpts.mEnabledTables[kBCCentFT0As])
populateTable(cursors.bcCentFT0A, ft0aInfo, bcMultFT0A, true);
if (internalOpts.mEnabledTables[kBCCentFT0Cs])
Expand Down
Loading