Skip to content

Further fix multCentTable #424

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

Further fix multCentTable #424

Show file tree
Hide file tree
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: 11 additions & 5 deletions Common/TableProducer/multCentTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,23 @@ struct MultCentTable {
o2::aod::MFTTracks const& mfttracks,
soa::SmallGroups<aod::BestCollisionsFwd> const& retracks)
{
// populates MFT information in the mults buffer (in addition to filling table)
module.collisionProcessMFT(collision, mfttracks, retracks, mults, products);
if (opts.mEnabledTables[o2::common::multiplicity::kMFTMults]) {
// populates MFT information in the mults buffer (in addition to filling table)
module.collisionProcessMFT(collision, mfttracks, retracks, mults, products);
}
}
void processMonteCarlo(aod::McCollision const& mcCollision, aod::McParticles const& mcParticles)
{
module.collisionProcessMonteCarlo(mcCollision, mcParticles, pdg, products);
if (opts.mEnabledTables[o2::common::multiplicity::kMultMCExtras]) {
module.collisionProcessMonteCarlo(mcCollision, mcParticles, pdg, products);
}
}
void processMonteCarlo2Mults(soa::Join<aod::McCollisionLabels, aod::Collisions>::iterator const& collision)
{
// establish simple interlink for posterior analysis (derived data)
products.tableExtraMult2MCExtras(collision.mcCollisionId());
if (opts.mEnabledTables[o2::common::multiplicity::kMult2MCExtras]) {
// establish simple interlink for posterior analysis (derived data)
products.tableExtraMult2MCExtras(collision.mcCollisionId());
}
}
void processCentrality(aod::Collisions const& collisions, soa::Join<aod::BCs, aod::BcSels, aod::Timestamps> const& bcs, aod::FT0s const&)
{
Expand Down
52 changes: 38 additions & 14 deletions Common/Tools/MultModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,19 +218,19 @@
// FIXME ideally cursors could be readable
// to avoid duplicate memory allocation but ok
struct multEntry {
float multFV0A = -999.0f;
float multFV0C = -999.0f;
float multFV0AOuter = -999.0f;
float multFT0A = -999.0f;
float multFT0C = -999.0f;
float multFDDA = -999.0f;
float multFDDC = -999.0f;
float multZNA = -999.0f;
float multZNC = -999.0f;
float multZEM1 = -999.0f;
float multZEM2 = -999.0f;
float multZPA = -999.0f;
float multZPC = -999.0f;
float multFV0A = 0.0f;
float multFV0C = 0.0f;
float multFV0AOuter = 0.0f;
float multFT0A = 0.0f;
float multFT0C = 0.0f;
float multFDDA = 0.0f;
float multFDDC = 0.0f;
float multZNA = 0.0f;
float multZNC = 0.0f;
float multZEM1 = 0.0f;
float multZEM2 = 0.0f;
float multZPA = 0.0f;
float multZPC = 0.0f;
int multTracklets = 0;

int multNContribs = 0; // PVMult 0.8
Expand Down Expand Up @@ -407,7 +407,7 @@
CalibrationInfo mftInfo = CalibrationInfo("MFT");

template <typename TConfigurables, typename TInitContext>
void init(TConfigurables const& opts, TInitContext& context)
void init(TConfigurables& opts, TInitContext& context)
{
// read in configurations from the task where it's used
internalOpts = opts;
Expand Down Expand Up @@ -445,6 +445,8 @@
}
}

opts = internalOpts;

// list enabled tables
for (int i = 0; i < nTablesConst; i++) {
// printout to be improved in the future
Expand Down Expand Up @@ -528,10 +530,13 @@
auto amplitude = fv0.amplitude()[ii];
auto channel = fv0.channel()[ii];
mults.multFV0A += amplitude;
if (channel > 7) {

Check failure on line 533 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;
}
}
} else {
mults.multFV0A = -999.f;
mults.multFV0AOuter = -999.f;
}
if (collision.has_foundFT0()) {
const auto& ft0 = collision.foundFT0();
Expand All @@ -541,6 +546,9 @@
for (const auto& amplitude : ft0.amplitudeC()) {
mults.multFT0C += amplitude;
}
} else {
mults.multFT0A = -999.f;
mults.multFT0C = -999.f;
}
if (collision.has_foundFDD()) {
const auto& fdd = collision.foundFDD();
Expand All @@ -550,6 +558,9 @@
for (const auto& amplitude : fdd.chargeC()) {
mults.multFDDC += amplitude;
}
} else {
mults.multFDDA = -999.f;
mults.multFDDC = -999.f;
}
if (bc.has_zdc()) {
mults.multZNA = bc.zdc().amplitudeZNA();
Expand All @@ -558,9 +569,19 @@
mults.multZEM2 = bc.zdc().amplitudeZEM2();
mults.multZPA = bc.zdc().amplitudeZPA();
mults.multZPC = bc.zdc().amplitudeZPC();
} else {
mults.multZNA = -999.f;
mults.multZNC = -999.f;
mults.multZEM1 = -999.f;
mults.multZEM2 = -999.f;
mults.multZPA = -999.f;
mults.multZPC = -999.f;
}

// fill standard cursors if required
if (internalOpts.mEnabledTables[kTrackletMults]) { // Tracklets (only Run2) nothing to do (to be removed!)
cursors.tableTracklet(0);
}
if (internalOpts.mEnabledTables[kFV0Mults]) {
cursors.tableFV0(mults.multFV0A, mults.multFV0C);
}
Expand Down Expand Up @@ -625,9 +646,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 649 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 651 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 @@ -662,14 +683,14 @@
}
mults.multNbrContribsEta10GlobalTrackWoDCA++;

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

Check failure on line 686 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 689 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 693 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 @@ -732,20 +753,20 @@
if (p != nullptr) {
charge = p->Charge();
}
if (std::abs(charge) < 1e-3) {

Check failure on line 756 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 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.
multBarrelEta08++;
if (std::abs(mcPart.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.
multBarrelEta05++;
}
}
}
if (-3.3 < mcPart.eta() && mcPart.eta() < -2.1)

Check failure on line 769 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 @@ -970,6 +991,9 @@
for (const auto& amplitude : ft0.amplitudeC()) {
bcMultFT0C += amplitude;
}
} else {
bcMultFT0A = -999.f;
bcMultFT0C = -999.f;
}

if (internalOpts.mEnabledTables[kBCCentFT0Ms])
Expand Down
Loading