Skip to content

Please consider the following formatting changes to #11621 #430

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 14, 2025
Merged

Please consider the following formatting changes to #11621 #430

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
8 changes: 4 additions & 4 deletions Common/TableProducer/multiplicityTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
using Run2Tracks = soa::Join<aod::Tracks, aod::TracksExtra>;
Partition<Run2Tracks> run2tracklets = (aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Run2Tracklet));
Partition<Run2Tracks> tracksWithTPC = (aod::track::tpcNClsFindable > (uint8_t)0);
Partition<Run2Tracks> pvContribTracks = (nabs(aod::track::eta) < 0.8f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));

Check failure on line 114 in Common/TableProducer/multiplicityTable.cxx

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.
Partition<Run2Tracks> pvContribTracksEta1 = (nabs(aod::track::eta) < 1.0f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));
Preslice<aod::Tracks> perCol = aod::track::collisionId;
Preslice<aod::TracksIU> perColIU = aod::track::collisionId;
Expand Down Expand Up @@ -296,10 +296,10 @@
if (std::abs(tracklet.eta()) < 1.0) {
multNContribsEta1++;
}
if (std::abs(tracklet.eta()) < 0.8) {

Check failure on line 299 in Common/TableProducer/multiplicityTable.cxx

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.
multNContribs++;
}
if (std::abs(tracklet.eta()) < 0.5) {

Check failure on line 302 in Common/TableProducer/multiplicityTable.cxx

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.
multNContribsEtaHalf++;
}
}
Expand All @@ -317,9 +317,9 @@
using Run3TracksIU = soa::Join<aod::TracksIU, aod::TracksExtra>;
Partition<Run3TracksIU> tracksIUWithTPC = (aod::track::tpcNClsFindable > (uint8_t)0);
Partition<Run3TracksIU> pvAllContribTracksIU = ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));
Partition<Run3TracksIU> pvContribTracksIU = (nabs(aod::track::eta) < 0.8f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));

Check failure on line 320 in Common/TableProducer/multiplicityTable.cxx

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.
Partition<Run3TracksIU> pvContribTracksIUEta1 = (nabs(aod::track::eta) < 1.0f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));
Partition<Run3TracksIU> pvContribTracksIUEtaHalf = (nabs(aod::track::eta) < 0.5f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));

Check failure on line 322 in Common/TableProducer/multiplicityTable.cxx

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.

void processRun3(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
Run3TracksIU const&,
Expand Down Expand Up @@ -467,7 +467,7 @@
auto amplitude = fv0.amplitude()[ii];
auto channel = fv0.channel()[ii];
multFV0A += amplitude;
if (channel > 7) {

Check failure on line 470 in Common/TableProducer/multiplicityTable.cxx

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.
multFV0AOuter += amplitude;
}
}
Expand Down Expand Up @@ -562,10 +562,10 @@
const auto& tracksThisCollision = pvContribTracksIUEta1.sliceByCached(aod::track::collisionId, collision.globalIndex(), cache);
multNContribsEta1 = tracksThisCollision.size();
for (const auto& track : tracksThisCollision) {
if (std::abs(track.eta()) < 0.8) {

Check failure on line 565 in Common/TableProducer/multiplicityTable.cxx

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.
multNContribs++;
}
if (std::abs(track.eta()) < 0.5) {

Check failure on line 568 in Common/TableProducer/multiplicityTable.cxx

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.
multNContribsEtaHalf++;
}
}
Expand Down Expand Up @@ -623,14 +623,14 @@
} break;
case kFV0MultZeqs: // Z equalized FV0
{
if (std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {

Check failure on line 626 in Common/TableProducer/multiplicityTable.cxx

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.
multZeqFV0A = hVtxZFV0A->Interpolate(0.0) * multFV0A / hVtxZFV0A->Interpolate(collision.posZ());
}
tableFV0Zeqs(multZeqFV0A);
} break;
case kFT0MultZeqs: // Z equalized FT0
{
if (std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {

Check failure on line 633 in Common/TableProducer/multiplicityTable.cxx

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.
multZeqFT0A = hVtxZFT0A->Interpolate(0.0) * multFT0A / hVtxZFT0A->Interpolate(collision.posZ());
multZeqFT0C = hVtxZFT0C->Interpolate(0.0) * multFT0C / hVtxZFT0C->Interpolate(collision.posZ());
}
Expand Down Expand Up @@ -739,10 +739,10 @@
{
for (auto const& hepmchi : hepmchis) {
multHepMCHIs(hepmchi.mcCollisionId(),
hepmchi.ncollHard(),
hepmchi.npartProj(),
hepmchi.npartTarg(),
hepmchi.ncoll(),
hepmchi.ncollHard(),
hepmchi.npartProj(),
hepmchi.npartTarg(),
hepmchi.ncoll(),
hepmchi.impactParameter());
}
}
Expand Down
Loading