Skip to content

Fix multCentTable + multModule #423

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

Fix multCentTable + multModule #423

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: 5 additions & 11 deletions Common/TableProducer/multCentTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,23 +122,17 @@ struct MultCentTable {
o2::aod::MFTTracks const& mfttracks,
soa::SmallGroups<aod::BestCollisionsFwd> const& retracks)
{
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);
}
// 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)
{
if (opts.mEnabledTables[o2::common::multiplicity::kMultMCExtras]) {
module.collisionProcessMonteCarlo(mcCollision, mcParticles, pdg, products);
}
module.collisionProcessMonteCarlo(mcCollision, mcParticles, pdg, products);
}
void processMonteCarlo2Mults(soa::Join<aod::McCollisionLabels, aod::Collisions>::iterator const& collision)
{
if (opts.mEnabledTables[o2::common::multiplicity::kMult2MCExtras]) {
// establish simple interlink for posterior analysis (derived data)
products.tableExtraMult2MCExtras(collision.mcCollisionId());
}
// 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
6 changes: 5 additions & 1 deletion Common/Tools/MultModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ static const std::vector<std::string> tableNames{
"FV0Mults",
"FV0AOuterMults",
"FT0Mults",
"FDDMults",
"ZDCMults",
"TrackletMults",
"TPCMults",
Expand Down Expand Up @@ -83,7 +84,7 @@ static const std::vector<std::string> tableNames{
"BCCentFT0As",
"BCCentFT0Cs"};

static constexpr int nTablesConst = 35;
static constexpr int nTablesConst = 36;

static const std::vector<std::string> parameterNames{"enable"};
static const int defaultParameters[nTablesConst][nParameters]{
Expand Down Expand Up @@ -121,6 +122,7 @@ static const int defaultParameters[nTablesConst][nParameters]{
{-1},
{-1},
{-1},
{-1},
{-1}};

// table index : match order above
Expand Down Expand Up @@ -674,6 +676,8 @@ class MultModule
}
} // end constexpr requires track selection stuff
}

cursors.multsGlobal(mults.multGlobalTracks, mults.multNbrContribsEta08GlobalTrackWoDCA, mults.multNbrContribsEta10GlobalTrackWoDCA, mults.multNbrContribsEta05GlobalTrackWoDCA);
}

// fill track counters at this stage if requested
Expand Down
Loading