Skip to content

[Common] Fix autodetection string typos, add autodependency enabling #11778

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 2 commits into from
Jun 26, 2025
Merged

[Common] Fix autodetection string typos, add autodependency enabling #11778

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c6f7f2
[Common] Fix autodetection string typos
ddobrigk Jun 26, 2025
13ee6b1
Update MultModule.h
ddobrigk Jun 26, 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
14 changes: 11 additions & 3 deletions Common/Tools/MultModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
"FDDMultZeqs",
"PVMultZeqs",
"MultMCExtras",
"kMult2MCExtras",
"kMFTMults",
"kMultsGlobal",
"Mult2MCExtras",
"MFTMults",
"MultsGlobal",

// centrality subcomponent
"CentRun2V0Ms",
Expand Down Expand Up @@ -475,6 +475,14 @@
internalOpts.mEnabledTables[kFDDMultZeqs] = 1;
listOfRequestors[kFDDMultZeqs].Append(Form("%s ", "dependency check"));
}
if (internalOpts.mEnabledTables[kCentMFTs] && !internalOpts.mEnabledTables[kMFTMults]) {
internalOpts.mEnabledTables[kMFTMults] = 1;
listOfRequestors[kMFTMults].Append(Form("%s ", "dependency check"));
}
if (internalOpts.mEnabledTables[kCentNGlobals] && !internalOpts.mEnabledTables[kMultsGlobal]) {
internalOpts.mEnabledTables[kMultsGlobal] = 1;
listOfRequestors[kMultsGlobal].Append(Form("%s ", "dependency check"));
}

mRunNumber = 0;
mRunNumberCentrality = 0;
Expand Down Expand Up @@ -537,9 +545,9 @@
if (internalOpts.mEnabledTables[kPVMults]) {
if (std::abs(track.eta()) < 1.0) {
mults.multNContribsEta1++; // pvmults
if (std::abs(track.eta()) < 0.8) {

Check failure on line 548 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 550 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 @@ -635,7 +643,7 @@
auto amplitude = fv0.amplitude()[ii];
auto channel = fv0.channel()[ii];
mults.multFV0A += amplitude;
if (channel > 7) {

Check failure on line 646 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 @@ -751,9 +759,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 762 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 764 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 @@ -788,14 +796,14 @@
}
mults.multNbrContribsEta10GlobalTrackWoDCA++;

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

Check failure on line 799 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 802 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 806 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 @@ -858,13 +866,13 @@
if (p != nullptr) {
charge = p->Charge();
}
if (std::abs(charge) < 1e-3) {

Check failure on line 869 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 875 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) {
multBarrelEta05++;
Expand Down
Loading