Skip to content

[PWGLF] NucleiTask - Fix bugs in mult dependent histos #13473

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

Closed
giovannimalfattore wants to merge 3 commits into from
Closed

[PWGLF] NucleiTask - Fix bugs in mult dependent histos #13473

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
affeb15
NucleiTask - Fix bugs in mult dependent histos
giovannimalfattore Oct 21, 2025
cd84ac3
NucleiTask - Fix O2linter errors
giovannimalfattore Oct 21, 2025
08fe50b
NucleiTask - Fix error
giovannimalfattore Oct 21, 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
2 changes: 1 addition & 1 deletion PWGLF/Tasks/Nuspex/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,52 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

o2physics_add_dpl_workflow(nuclei-batask

Check failure on line 12 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name nuclei-batask does not match its file name lfNucleiBATask.cxx. (Matches nucleiBatask.cxx.)
SOURCES LFNucleiBATask.cxx
SOURCES lfNucleiBATask.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::EventFilteringUtils
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(hypertritonanalysis

Check failure on line 17 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name hypertritonanalysis does not match its file name hypertritonAnalysis.cxx. (Matches hypertritonanalysis.cxx.)
SOURCES hypertritonAnalysis.cxx
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(nuclei-hist

Check failure on line 22 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name nuclei-hist does not match its file name NucleiHistTask.cxx. (Matches nucleiHist.cxx.)
SOURCES NucleiHistTask.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(helium-flow

Check failure on line 27 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name helium-flow does not match its file name helium_flow.cxx. (Matches heliumFlow.cxx.)
SOURCES helium_flow.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(antimatter-abs-hmpid

Check failure on line 32 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name antimatter-abs-hmpid does not match its file name AntimatterAbsorptionHMPID.cxx. (Matches antimatterAbsHmpid.cxx.)
SOURCES AntimatterAbsorptionHMPID.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::ReconstructionDataFormats O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(hyhefour-analysis

Check failure on line 37 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name hyhefour-analysis does not match its file name hyhe4analysis.cxx. (Matches hyhefourAnalysis.cxx.)
SOURCES hyhe4analysis.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(mc-spectra-efficiency

Check failure on line 42 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name mc-spectra-efficiency does not match its file name mcspectraefficiency.cxx. (Matches mcSpectraEfficiency.cxx.)
SOURCES mcspectraefficiency.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(spectra-tof

Check failure on line 47 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name spectra-tof does not match its file name spectraTOF.cxx. (Matches spectraTof.cxx.)
SOURCES spectraTOF.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(spectra-tof-run2

Check failure on line 52 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name spectra-tof-run2 does not match its file name spectraTOFRun2.cxx. (Matches spectraTofRun2.cxx.)
SOURCES spectraTOFRun2.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(spectra-tpc

Check failure on line 57 in PWGLF/Tasks/Nuspex/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name spectra-tpc does not match its file name spectraTPC.cxx. (Matches spectraTpc.cxx.)
SOURCES spectraTPC.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
Expand Down
50 changes: 24 additions & 26 deletions PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx → PWGLF/Tasks/Nuspex/lfNucleiBATask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// or submit itself to any jurisdiction.

///
/// \file LFNucleiBATask.cxx
/// \file lfNucleiBATask.cxx
///
/// \brief Analysis task for the measurement of the coalescence parameter B2/B3 in pp collisions for (anti)deuteron/(anti)helium-3
///
Expand Down Expand Up @@ -53,7 +53,7 @@ using namespace o2;
using namespace o2::framework;
using namespace o2::framework::expressions;

struct LFNucleiBATask {
struct lfNucleiBATask {
Service<o2::ccdb::BasicCCDBManager> ccdb;

Zorro zorro;
Expand Down Expand Up @@ -419,7 +419,7 @@ struct LFNucleiBATask {
}

if (enableCentrality)
histos.add<TH2>("event/h1VtxZ", "V_{z};V_{z} (in cm); counts", HistType::kTH1F, {{1500, -15, 15}, {binsPercentile, "Centrality FT0M"}});
histos.add<TH2>("event/h1VtxZ", "V_{z};V_{z} (in cm); counts", HistType::kTH2F, {{1500, -15, 15}, {binsPercentile, "Centrality FT0M"}});
else
histos.add<TH1>("event/h1VtxZ", "V_{z};V_{z} (in cm); counts", HistType::kTH1F, {{1500, -15, 15}});

Expand Down Expand Up @@ -2061,7 +2061,7 @@ struct LFNucleiBATask {
}
// To be optimised
if (!doprocessMCGen && !doprocessMCReco && !doprocessMCRecoLfPid && !doprocessMCRecoFiltered && !doprocessMCRecoFilteredLight) {
LOG(info) << "Histograms of LFNucleiBATask:";
LOG(info) << "Histograms of lfNucleiBATask:";
histos.print();
return;
}
Expand Down Expand Up @@ -2162,14 +2162,14 @@ struct LFNucleiBATask {
spectraGen.add("helium/histGenPtHe", "generated particles", HistType::kTH1F, {ptHeAxis});
spectraGen.add("helium/histGenPtHePrim", "generated particles", HistType::kTH1F, {ptHeAxis});
if (enableCentrality)
spectraGen.add("helium/histGenPtHePrim", "generated particles", HistType::kTH2F, {{ptHeAxis}, {binsPercentile}});
spectraGen.add("helium/histGenPtHePrimVsMult", "generated particles", HistType::kTH2F, {{ptHeAxis}, {binsPercentile}});
spectraGen.add("helium/histGenPtHeSec", "generated particles", HistType::kTH1F, {ptHeAxis});
spectraGen.add("helium/histSecTransportPtHe", "generated particles", HistType::kTH1F, {ptHeAxis});

spectraGen.add("helium/histGenPtantiHe", "generated particles", HistType::kTH1F, {ptHeAxis});
spectraGen.add("helium/histGenPtantiHePrim", "generated particles", HistType::kTH1F, {ptHeAxis});
if (enableCentrality)
spectraGen.add("helium/histGenPtantiHePrim", "generated particles", HistType::kTH2F, {{ptHeAxis}, {binsPercentile}});
spectraGen.add("helium/histGenPtantiHePrimVsMult", "generated particles", HistType::kTH2F, {{ptHeAxis}, {binsPercentile}});
spectraGen.add("helium/histGenPtantiHeSec", "generated particles", HistType::kTH1F, {ptHeAxis});
spectraGen.add("helium/histSecTransportPtantiHe", "generated particles", HistType::kTH1F, {ptHeAxis});
}
Expand All @@ -2184,7 +2184,7 @@ struct LFNucleiBATask {
spectraGen.add("alpha/histGenPtantiAlSec", "generated particles", HistType::kTH1F, {ptAxis});
spectraGen.add("alpha/histSecTransportPtantiAl", "generated particles", HistType::kTH1F, {ptAxis});
}
LOG(info) << "Histograms of LFNucleiBATask:";
LOG(info) << "Histograms of lfNucleiBATask:";
histos.print();
if (doprocessMCGen)
spectraGen.print();
Expand Down Expand Up @@ -5752,7 +5752,7 @@ struct LFNucleiBATask {
if (isWeakDecay) {
histos.fill(HIST("tracks/helium/h1HeliumSpectraTrueSec_Z2"), 2 * hePt);
if (enableCentrality)
histos.fill(HIST("tracks/helium/h1HeliumSpectraTrueSecVsMult_Z2"), 2 * hePt);
histos.fill(HIST("tracks/helium/h2HeliumSpectraTrueSecVsMult_Z2"), 2 * hePt, event.centFT0M());
if (outFlagOptions.makeDCAAfterCutPlots) {
histos.fill(HIST("tracks/helium/dca/after/hDCAxyVsPtHeliumTrueSec"), hePt, track.dcaXY());
histos.fill(HIST("tracks/helium/dca/after/hDCAzVsPtHeliumTrueSec"), hePt, track.dcaZ());
Expand Down Expand Up @@ -5946,7 +5946,7 @@ struct LFNucleiBATask {
{
fillHistograms<false /*MC*/, false /*Filtered*/>(event, tracks, true /*dummy*/);
}
PROCESS_SWITCH(LFNucleiBATask, processData, "process data", true);
PROCESS_SWITCH(lfNucleiBATask, processData, "process data", true);

// Process function that runs on the original AO2D
void processDataLfPid(EventCandidates::iterator const& event,
Expand All @@ -5955,7 +5955,7 @@ struct LFNucleiBATask {
{
fillHistograms<false /*MC*/, false /*Filtered*/>(event, tracks, true /*dummy*/);
}
PROCESS_SWITCH(LFNucleiBATask, processDataLfPid, "process data with LF PID", false);
PROCESS_SWITCH(lfNucleiBATask, processDataLfPid, "process data with LF PID", false);

// Process function that runs on the filtered data
void processDataFiltered(o2::aod::LfNuclEvents::iterator const& event,
Expand All @@ -5966,7 +5966,7 @@ struct LFNucleiBATask {
// Takes as input full AO2Ds
fillHistograms<false /*MC*/, true /*Filtered*/>(event, tracks, true /*dummy*/);
}
PROCESS_SWITCH(LFNucleiBATask, processDataFiltered, "process data on the filtered data", false);
PROCESS_SWITCH(lfNucleiBATask, processDataFiltered, "process data on the filtered data", false);

void processDataLight(o2::aod::LfNuclEvents::iterator const& event,
o2::aod::LfCandNucleusDummy const& tracks,
Expand All @@ -5976,7 +5976,7 @@ struct LFNucleiBATask {
// Takes as input derived trees
fillHistograms<false /*MC*/, true /*Filtered*/>(event, tracks, true /*dummy*/);
}
PROCESS_SWITCH(LFNucleiBATask, processDataLight, "process data on the derived trees", false);
PROCESS_SWITCH(lfNucleiBATask, processDataLight, "process data on the derived trees", false);

/////////////
// MC Reco //
Expand All @@ -5995,7 +5995,7 @@ struct LFNucleiBATask {
}
fillHistograms<true /*MC*/, false /*Filtered*/>(event, tracks, mcParticles);
} // CLOSING PROCESS MC RECO
PROCESS_SWITCH(LFNucleiBATask, processMCReco, "process mc reco", false);
PROCESS_SWITCH(lfNucleiBATask, processMCReco, "process mc reco", false);

// Process function that runs on the original AO2D (for the MC) with the LfPIDcalibration
void processMCRecoLfPid(EventCandidatesMC::iterator const& event,
Expand All @@ -6010,7 +6010,7 @@ struct LFNucleiBATask {
}
fillHistograms<true /*MC*/, false /*Filtered*/>(event, tracks, mcParticles);
} // CLOSING PROCESS MC RECO
PROCESS_SWITCH(LFNucleiBATask, processMCRecoLfPid, "process mc reco with LfPid", false);
PROCESS_SWITCH(lfNucleiBATask, processMCRecoLfPid, "process mc reco with LfPid", false);

Preslice<aod::McParticles> perMCCol = aod::mcparticle::mcCollisionId;
SliceCache cache;
Expand Down Expand Up @@ -6096,7 +6096,7 @@ struct LFNucleiBATask {
}
}
// CLOSING PROCESS MC RECO
PROCESS_SWITCH(LFNucleiBATask, processMCRecoLfPidEv, "process mc reco with LfPid w/ Event", false);
PROCESS_SWITCH(lfNucleiBATask, processMCRecoLfPidEv, "process mc reco with LfPid w/ Event", false);

// Process function that runs on the filtered AO2D (for the MC)
void processMCRecoFiltered(o2::aod::LfNuclEvents::iterator const& event,
Expand All @@ -6105,15 +6105,15 @@ struct LFNucleiBATask {
{
fillHistograms<true /*MC*/, true /*Filtered*/>(event, tracks, true /*dummy*/);
} // CLOSING PROCESS MC RECO ON FILTERED DATA
PROCESS_SWITCH(LFNucleiBATask, processMCRecoFiltered, "process mc reco on the filtered data", false);
PROCESS_SWITCH(lfNucleiBATask, processMCRecoFiltered, "process mc reco on the filtered data", false);

void processMCRecoFilteredLight(o2::aod::LfNuclEvents::iterator const& event,
soa::Join<o2::aod::LfCandNucleusDummy, o2::aod::LfCandNucleusMC> const& tracks,
o2::aod::BCsWithTimestamps const&)
{
fillHistograms<true /*MC*/, true /*Filtered*/>(event, tracks, true /*dummy*/);
} // CLOSING PROCESS MC RECO ON FILTERED DATA
PROCESS_SWITCH(LFNucleiBATask, processMCRecoFilteredLight, "process mc reco on the derived trees", false);
PROCESS_SWITCH(lfNucleiBATask, processMCRecoFilteredLight, "process mc reco on the derived trees", false);

////////////
// MC Gen //
Expand Down Expand Up @@ -6304,10 +6304,9 @@ struct LFNucleiBATask {
if (pdgCode == PDGHelium) {
spectraGen.fill(HIST("helium/histGenPtHe"), ptMC);
if (isPhysPrim) {
spectraGen.fill(HIST("helium/histGenPtHePrim"), ptMC);
if (enableCentrality)
spectraGen.fill(HIST("helium/histGenPtHePrim"), ptMC, mcCollision.centFT0M());
else
spectraGen.fill(HIST("helium/histGenPtHePrim"), ptMC);
spectraGen.fill(HIST("helium/histGenPtHePrimVsMult"), ptMC, mcCollision.centFT0M());
}
if (!isPhysPrim && isProdByGen) {
{
Expand All @@ -6324,10 +6323,9 @@ struct LFNucleiBATask {
if (pdgCode == -PDGHelium) {
spectraGen.fill(HIST("helium/histGenPtantiHe"), ptMC);
if (isPhysPrim) {
spectraGen.fill(HIST("helium/histGenPtantiHePrim"), ptMC);
if (enableCentrality)
spectraGen.fill(HIST("helium/histGenPtantiHePrim"), ptMC, mcCollision.centFT0M());
else
spectraGen.fill(HIST("helium/histGenPtantiHePrim"), ptMC);
spectraGen.fill(HIST("helium/histGenPtantiHePrimVsMult"), ptMC, mcCollision.centFT0M());
}
if (!isPhysPrim && isProdByGen) {
{
Expand Down Expand Up @@ -6374,7 +6372,7 @@ struct LFNucleiBATask {
}
}
} // Close processMCGen
PROCESS_SWITCH(LFNucleiBATask, processMCGen, "process MC Generated", true);
PROCESS_SWITCH(lfNucleiBATask, processMCGen, "process MC Generated", true);

void processEvSgLossMC(soa::Join<aod::McCollisions, aod::McCentFT0Ms>::iterator const& mcCollision,
aod::McParticles const& mcParticles,
Expand Down Expand Up @@ -6429,10 +6427,10 @@ struct LFNucleiBATask {
}
}
}
PROCESS_SWITCH(LFNucleiBATask, processEvSgLossMC, "process MC SignLoss", false);
PROCESS_SWITCH(lfNucleiBATask, processEvSgLossMC, "process MC SignLoss", false);
};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{adaptAnalysisTask<LFNucleiBATask>(cfgc)};
return WorkflowSpec{adaptAnalysisTask<lfNucleiBATask>(cfgc)};
}
Loading