Skip to content

[PWGDQ] Fix necessary use of ReducedEventsMultPV in rableReader_withAssoc #15335

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
iarsene merged 3 commits into from
Mar 11, 2026
+27 −10
Merged

[PWGDQ] Fix necessary use of ReducedEventsMultPV in rableReader_withAssoc #15335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbcf644
Fix necessary use of ReducedEventsMultPV in rableReader_withAssoc and…
axti98 Mar 10, 2026
dac5542
Added mctruth histogram information
axti98 Mar 10, 2026
de14af8
Fixed HistogramLibrary
axti98 Mar 10, 2026
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: 8 additions & 0 deletions PWGDQ/Core/HistogramsLibrary.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,14 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
hm->AddHistogram(histClass, "Weight", "", false, 50, 0.0, 5.0, VarManager::kMCParticleWeight);
hm->AddHistogram(histClass, "MCImpPar_CentFT0CMC", "MC impact param vs MC Cent. FT0C", false, 20, 0.0, 20.0, VarManager::kMCEventImpParam, 100, 0.0, 100.0, VarManager::kMCEventCentrFT0C);
}
if (!groupStr.CompareTo("mctruth_mult")) {
hm->AddHistogram(histClass, "PtMC_MultEta05", "MC pT vs mult |#eta| < 0.5", false, 200, 0.0, 20.0, VarManager::kMCPt, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta05);
hm->AddHistogram(histClass, "PtMC_MultEta08", "MC pT vs mult |#eta| < 0.8", false, 200, 0.0, 20.0, VarManager::kMCPt, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta08);
hm->AddHistogram(histClass, "PtMC_MultEta10", "MC pT vs mult |#eta| < 1.0", false, 200, 0.0, 20.0, VarManager::kMCPt, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta10);
hm->AddHistogram(histClass, "EtaMC_MultEta05", "MC Eta vs mult |#eta| < 0.5", false, 40, -2.0, 2.0, VarManager::kMCEta, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta05);
hm->AddHistogram(histClass, "EtaMC_MultEta08", "MC Eta vs mult |#eta| < 0.8", false, 40, -2.0, 2.0, VarManager::kMCEta, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta08);
hm->AddHistogram(histClass, "EtaMC_MultEta10", "MC Eta vs mult |#eta| < 1.0", false, 40, -2.0, 2.0, VarManager::kMCEta, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta10);
}

if (!groupStr.CompareTo("energy-correlator-gen")) {
double coschiBins[26];
Expand Down
3 changes: 3 additions & 0 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2325,6 +2325,9 @@ void VarManager::FillEvent(T const& event, float* values)
values[kMCEventWeight] = event.weight();
values[kMCEventImpParam] = event.impactParameter();
values[kMCEventCentrFT0C] = event.centFT0C();
values[kMultMCNParticlesEta05] = event.multMCNParticlesEta05();
values[kMultMCNParticlesEta08] = event.multMCNParticlesEta08();
values[kMultMCNParticlesEta10] = event.multMCNParticlesEta10();
}

if constexpr ((fillMap & EventFilter) > 0 || (fillMap & RapidityGapFilter) > 0) {
Expand Down
1 change: 0 additions & 1 deletion PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2176,7 +2176,6 @@ struct AnalysisSameEventPairing {
template <int TPairType>
void runMCGen(MyEventsVtxCovSelected const& events, ReducedMCEvents const& mcEvents, ReducedMCTracks const& mcTracks)
{
cout << "AnalysisSameEventPairing::runMCGen() called" << endl;
uint32_t mcDecision = 0;
int isig = 0;

Expand Down
25 changes: 16 additions & 9 deletions PWGDQ/Tasks/tableReader_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ DECLARE_SOA_TABLE(JPsieeCandidates, "AOD", "DQPSEUDOPROPER", dqanalysisflags::Ma

// Declarations of various short names
using MyEvents = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll>;
using MyEventsBasic = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended>;
using MyEventsMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsQvectorCentr, aod::ReducedEventsMergingTable>;
using MyEventsMultExtraQVector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsQvectorCentr, aod::ReducedEventsQvectorCentrExtra>;
using MyEventsZdc = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedZdcs>;
Expand Down Expand Up @@ -307,7 +308,7 @@ struct AnalysisEventSelection {
void init(o2::framework::InitContext& context)
{

bool isAnyProcessEnabled = context.mOptions.get<bool>("processSkimmed") || context.mOptions.get<bool>("processSkimmedWithZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtra") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdcFit") || context.mOptions.get<bool>("processSkimmedWithQvectorCentr");
bool isAnyProcessEnabled = context.mOptions.get<bool>("processSkimmed") || context.mOptions.get<bool>("processSkimmedBasic") || context.mOptions.get<bool>("processSkimmedWithZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtra") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdc") || context.mOptions.get<bool>("processSkimmedWithMultExtraZdcFit") || context.mOptions.get<bool>("processSkimmedWithQvectorCentr");
bool isDummyEnabled = context.mOptions.get<bool>("processDummy");

if (isDummyEnabled) {
Expand Down Expand Up @@ -528,6 +529,11 @@ struct AnalysisEventSelection {
runEventSelection<gkEventFillMap>(events);
publishSelections<gkEventFillMap>(events);
}
void processSkimmedBasic(MyEventsBasic const& events)
{
runEventSelection<gkEventFillMap>(events);
publishSelections<gkEventFillMap>(events);
}
void processSkimmedWithZdc(MyEventsZdc const& events)
{
runEventSelection<gkEventFillMapWithZdc>(events);
Expand All @@ -553,12 +559,13 @@ struct AnalysisEventSelection {
runEventSelection<gkEventFillMapWithQvectorCentr>(events);
publishSelections<gkEventFillMapWithQvectorCentr>(events);
}
void processDummy(MyEvents&)
void processDummy(MyEventsBasic&)
{
// do nothing
}

PROCESS_SWITCH(AnalysisEventSelection, processSkimmed, "Run event selection on DQ skimmed events", false);
PROCESS_SWITCH(AnalysisEventSelection, processSkimmedBasic, "Run event selection on DQ skimmed events with basic tables", false);
PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithZdc, "Run event selection on DQ skimmed events, with ZDC", false);
PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithMultExtra, "Run event selection on DQ skimmed events, with mult extra", false);
PROCESS_SWITCH(AnalysisEventSelection, processSkimmedWithMultExtraZdc, "Run event selection on DQ skimmed events, with mult extra and ZDC", false);
Expand Down Expand Up @@ -814,7 +821,7 @@ struct AnalysisTrackSelection {
{
runTrackSelection<gkEventFillMapWithCov, gkTrackFillMapWithCov>(assocs, events, tracks);
}
void processDummy(MyEvents&)
void processDummy(MyEventsBasic&)
{
// do nothing
}
Expand Down Expand Up @@ -1025,7 +1032,7 @@ struct AnalysisMuonSelection {
{
runMuonSelection<gkEventFillMapWithCov, gkMuonFillMapWithCov>(assocs, events, muons);
}
void processDummy(MyEvents&)
void processDummy(MyEventsBasic&)
{
// do nothing
}
Expand Down Expand Up @@ -1207,7 +1214,7 @@ struct AnalysisPrefilterSelection {
}
}

void processDummy(MyEvents&)
void processDummy(MyEventsBasic&)
{
// do nothing
}
Expand Down Expand Up @@ -2500,7 +2507,7 @@ struct AnalysisSameEventPairing {
runSameSideMixing<pairTypeMuMu, gkEventFillMap>(events, muonAssocs, muons, muonAssocsPerCollision);
}

void processDummy(MyEvents&)
void processDummy(MyEventsBasic&)
{
// do nothing
}
Expand Down Expand Up @@ -3246,7 +3253,7 @@ struct AnalysisAsymmetricPairing {
runThreeProng<true, gkEventFillMapWithCovZdcFit, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, VarManager::kTripleCandidateToPKPi);
}

void processDummy(MyEvents&)
void processDummy(MyEventsBasic&)
{
// do nothing
}
Expand Down Expand Up @@ -3930,7 +3937,7 @@ struct AnalysisDileptonTrack {
} // end event loop
}

void processDummy(MyEvents&)
void processDummy(MyEventsBasic&)
{
// do nothing
}
Expand Down Expand Up @@ -4185,7 +4192,7 @@ struct AnalysisDileptonTrackTrack {
}
}

void processDummy(MyEvents&)
void processDummy(MyEventsBasic&)
{
// do nothing
}
Expand Down
Loading