Skip to content

[PWGLF] Omegahm #12962

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 4 commits into from
Sep 13, 2025
Merged

[PWGLF] Omegahm #12962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
817e8b2
dev: mult hists per run
lietava Sep 11, 2025
bf6eeea
clang
lietava Sep 11, 2025
68a4e2e
cleaning
lietava Sep 11, 2025
5d5bdac
dummy
lietava Sep 13, 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
18 changes: 14 additions & 4 deletions PWGLF/DataModel/LFNonPromptCascadeTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -12,7 +12,7 @@
///
/// \file LFNonPromptCascadeTable.h
/// \brief Non prompt cascade tables
///

Check failure on line 15 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \author is missing, incorrect or misplaced.

Check failure on line 15 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \file is missing, incorrect or misplaced.

#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
Expand All @@ -27,7 +27,7 @@
DECLARE_SOA_COLUMN(MatchingChi2, matchingChi2, float);
DECLARE_SOA_COLUMN(DeltaPtITSCascade, deltaPtITSCascade, float);
DECLARE_SOA_COLUMN(DeltaPtCascade, deltaPtCascade, float);
DECLARE_SOA_COLUMN(ITSClusSize, itsClusSize, float);

Check failure on line 30 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(HasReassociatedCluster, hasReassociatedCluster, bool);
DECLARE_SOA_COLUMN(IsGoodMatch, isGoodMatch, bool);
DECLARE_SOA_COLUMN(IsGoodCascade, isGoodCascade, bool);
Expand Down Expand Up @@ -62,8 +62,8 @@
DECLARE_SOA_COLUMN(BachDCAxy, bachDCAxy, float);
DECLARE_SOA_COLUMN(BachDCAz, bachDCAz, float);

DECLARE_SOA_COLUMN(CascCosPA, casccosPA, float);

Check failure on line 65 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(V0CosPA, v0cosPA, float);

Check failure on line 66 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

DECLARE_SOA_COLUMN(MassXi, massXi, double);
DECLARE_SOA_COLUMN(MassOmega, massOmega, double);
Expand Down Expand Up @@ -98,10 +98,10 @@
DECLARE_SOA_COLUMN(BachKaonTOFNSigma, bachKaonTOFNSigma, float);
DECLARE_SOA_COLUMN(BachPionTOFNSigma, bachPionTOFNSigma, float);

DECLARE_SOA_COLUMN(gPt, genPt, float);

Check failure on line 101 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(gEta, genEta, float);

Check failure on line 102 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(gPhi, genPhi, float);

Check failure on line 103 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(gVx, genVx, float);

Check failure on line 104 in PWGLF/DataModel/LFNonPromptCascadeTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(gVy, genVy, float);
DECLARE_SOA_COLUMN(gVz, genVz, float);
DECLARE_SOA_COLUMN(PDGcode, pdgCode, int);
Expand All @@ -121,9 +121,12 @@
DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);
DECLARE_SOA_COLUMN(MultNTracksGlobal, multNTracksGlobal, int);
DECLARE_SOA_COLUMN(ToiMask, toiMask, uint32_t);
DECLARE_SOA_COLUMN(RunNumber, runNumber, int);
DECLARE_SOA_COLUMN(NoSameBunchPileup, noSameBunchPileup, bool);

} // namespace NPCascadeTable
DECLARE_SOA_TABLE(NPCascTable, "AOD", "NPCASCTABLE",
NPCascadeTable::RunNumber,
NPCascadeTable::MatchingChi2,
NPCascadeTable::DeltaPtITSCascade,
NPCascadeTable::DeltaPtCascade,
Expand Down Expand Up @@ -187,9 +190,11 @@
NPCascadeTable::CentFT0A,
NPCascadeTable::CentFT0M,
NPCascadeTable::MultNTracksGlobal,
NPCascadeTable::ToiMask)
NPCascadeTable::ToiMask,
NPCascadeTable::NoSameBunchPileup)

DECLARE_SOA_TABLE(NPCascTableNT, "AOD", "NPCASCTABLENT",
NPCascadeTable::RunNumber,
NPCascadeTable::MatchingChi2,
NPCascadeTable::DeltaPtITSCascade,
NPCascadeTable::DeltaPtCascade,
Expand Down Expand Up @@ -253,9 +258,11 @@
NPCascadeTable::CentFT0A,
NPCascadeTable::CentFT0M,
NPCascadeTable::MultNTracksGlobal,
NPCascadeTable::ToiMask)
NPCascadeTable::ToiMask,
NPCascadeTable::NoSameBunchPileup)

DECLARE_SOA_TABLE(NPCascTableMC, "AOD", "NPCASCTABLEMC",
NPCascadeTable::RunNumber,
NPCascadeTable::MatchingChi2,
NPCascadeTable::DeltaPtITSCascade,
NPCascadeTable::DeltaPtCascade,
Expand Down Expand Up @@ -338,9 +345,11 @@
NPCascadeTable::HasFakeReassociation,
NPCascadeTable::MotherDecayDaughters,
NPCascadeTable::MultNTracksGlobal,
NPCascadeTable::ToiMask)
NPCascadeTable::ToiMask,
NPCascadeTable::NoSameBunchPileup)

DECLARE_SOA_TABLE(NPCascTableMCNT, "AOD", "NPCASCTABLEMCNT",
NPCascadeTable::RunNumber,
NPCascadeTable::MatchingChi2,
NPCascadeTable::DeltaPtITSCascade,
NPCascadeTable::DeltaPtCascade,
Expand Down Expand Up @@ -423,7 +432,8 @@
NPCascadeTable::HasFakeReassociation,
NPCascadeTable::MotherDecayDaughters,
NPCascadeTable::MultNTracksGlobal,
NPCascadeTable::ToiMask)
NPCascadeTable::ToiMask,
NPCascadeTable::NoSameBunchPileup)

DECLARE_SOA_TABLE(NPCascTableGen, "AOD", "NPCASCTABLEGen",
NPCascadeTable::gPt,
Expand Down
46 changes: 34 additions & 12 deletions PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ using namespace o2::framework::expressions;
namespace
{
struct NPCascCandidate {
int runNumber;
int64_t mcParticleId;
int64_t trackGlobID;
int64_t trackITSID;
Expand Down Expand Up @@ -127,6 +128,7 @@ struct NPCascCandidate {
float centFT0M;
int multNTracksGlobal;
uint32_t toiMask;
bool noSameBunchPileup;
};
std::array<bool, 2> isFromHF(auto& particle)
{
Expand Down Expand Up @@ -211,6 +213,16 @@ struct NonPromptCascadeTask {
o2::vertexing::DCAFitterN<2> mDCAFitter;
std::array<int, 2> mProcessCounter = {0, 0}; // {Tracked, All}
std::map<uint64_t, uint32_t> mToiMap;
std::unordered_set<int> mRuns;
std::shared_ptr<TH2> mHistPointer1;
std::shared_ptr<TH2> mHistPointer2;
std::shared_ptr<TH2> mHistPointer3;
std::shared_ptr<TH2> mHistPointer4;
AxisSpec multAxis = {10000, 0, 10000, "Multiplicity FT0M"};
AxisSpec centAxis = {2021, -0.025, 101.025, "Centrality"};
AxisSpec centAxisZoom = {2000, -0.0025, 10.0025, "Centrality"};
AxisSpec multAxisZoom = {7000, 3000, 10000, "Multiplicity FT0M"};
AxisSpec nTracksAxis = {100, 0., 100., "NTracksGlobal"};

void initCCDB(aod::BCsWithTimestamps::iterator const& bc)
{
Expand Down Expand Up @@ -248,11 +260,6 @@ struct NonPromptCascadeTask {

std::vector<double> ptBinning = {0.4, 0.8, 1.2, 1.6, 2.0, 2.4, 2.8, 3.2, 3.6, 4.0, 4.4, 4.8, 5.2, 5.6, 6.0};
// AxisSpec ptAxis = {ptBinning, "#it{p}_{T} (GeV/#it{c})"};
AxisSpec centAxis = {101, 0., 101., "Centrality"};
AxisSpec centAxisZoom = {100, 0., 10., "Centrality"};
AxisSpec multAxis = {10000, 0, 10000, "Multiplicity FT0M"};
AxisSpec multAxisZoom = {7000, 3000, 10000, "Multiplicity FT0M"};
AxisSpec nTracksAxis = {100, 0., 100., "NTracksGlobal"};

std::array<std::string, 7> cutsNames{"# candidates", "hasTOF", "nClusTPC", "nSigmaTPCbach", "nSigmaTPCprotontrack", "nSigmaTPCpiontrack", "cosPA"};
auto cutsOmega{std::get<std::shared_ptr<TH2>>(mRegistry.add("h_PIDcutsOmega", ";;Invariant mass (GeV/#it{c}^{2})", HistType::kTH2D, {{cutsNames.size(), -0.5, -0.5 + cutsNames.size()}, {125, 1.650, 1.700}}))};
Expand Down Expand Up @@ -331,7 +338,22 @@ struct NonPromptCascadeTask {
{
// std::cout << "Filling mult histos" << std::endl;
for (const auto& coll : collisions) {
// std::cout << coll.centFT0M() << " mult, cent " << coll.multNTracksGlobal() << std::endl;
if (!mRuns.count(mRunNumber)) {
std::string histName = "mult/hMultVsCent_run" + std::to_string(mRunNumber);
mHistPointer1 = std::get<std::shared_ptr<TH2>>(mRegistry.add(histName.c_str(), histName.c_str(), HistType::kTH2F, {centAxis, multAxis}));
histName = "mult/hMultVsCentZoom_run" + std::to_string(mRunNumber);
mHistPointer2 = std::get<std::shared_ptr<TH2>>(mRegistry.add(histName.c_str(), histName.c_str(), HistType::kTH2F, {centAxisZoom, multAxisZoom}));
histName = "mult/hNTracksVsCent_run" + std::to_string(mRunNumber);
mHistPointer3 = std::get<std::shared_ptr<TH2>>(mRegistry.add(histName.c_str(), histName.c_str(), HistType::kTH2F, {centAxis, nTracksAxis}));
histName = "mult/hNTracksVsCentZoom_run" + std::to_string(mRunNumber);
mHistPointer4 = std::get<std::shared_ptr<TH2>>(mRegistry.add(histName.c_str(), histName.c_str(), HistType::kTH2F, {centAxisZoom, nTracksAxis}));
mRuns.insert(mRunNumber);
}
mHistPointer1->Fill(coll.centFT0M(), coll.multFT0M());
mHistPointer2->Fill(coll.centFT0M(), coll.multFT0M());
mHistPointer3->Fill(coll.centFT0M(), coll.multNTracksGlobal());
mHistPointer4->Fill(coll.centFT0M(), coll.multNTracksGlobal());

mRegistry.fill(HIST("hMultVsCent"), coll.centFT0M(), coll.multFT0M());
mRegistry.fill(HIST("hMultVsCentZoom"), coll.centFT0M(), coll.multFT0M());
mRegistry.fill(HIST("hNTracksVsCent"), coll.centFT0M(), (float)coll.multNTracksGlobal());
Expand Down Expand Up @@ -548,7 +570,7 @@ struct NonPromptCascadeTask {
if (mToiMap.count(bc.globalBC())) {
toiMask = mToiMap[bc.globalBC()];
}
candidates.emplace_back(NPCascCandidate{mcParticleID, trackedCascGlobalIndex, itsTrackGlobalIndex, candidate.collisionId(), matchingChi2, deltaPtITSCascade, deltaPtCascade, cascITSclsSize, hasReassociatedClusters, hasFakeReassociation, isGoodMatch, isGoodCascade, pdgCodeMom, itsTrackPDG, fromHF[0], fromHF[1],
candidates.emplace_back(NPCascCandidate{mRunNumber, mcParticleID, trackedCascGlobalIndex, itsTrackGlobalIndex, candidate.collisionId(), matchingChi2, deltaPtITSCascade, deltaPtCascade, cascITSclsSize, hasReassociatedClusters, hasFakeReassociation, isGoodMatch, isGoodCascade, pdgCodeMom, itsTrackPDG, fromHF[0], fromHF[1],
collision.numContrib(), cascPVContribs, collision.collisionTimeRes(), primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ(),
cascadeLvector.pt(), cascadeLvector.eta(), cascadeLvector.phi(),
protonTrack.pt(), protonTrack.eta(), pionTrack.pt(), pionTrack.eta(), bachelor.pt(), bachelor.eta(),
Expand All @@ -558,15 +580,15 @@ struct NonPromptCascadeTask {
cascITSclusters, protonTrack.itsNCls(), pionTrack.itsNCls(), bachelor.itsNCls(), protonTrack.tpcNClsFound(), pionTrack.tpcNClsFound(), bachelor.tpcNClsFound(),
protonTrack.tpcNSigmaPr(), pionTrack.tpcNSigmaPi(), bachelor.tpcNSigmaKa(), bachelor.tpcNSigmaPi(),
protonTrack.hasTOF(), pionTrack.hasTOF(), bachelor.hasTOF(),
protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFT0A(), collision.multFT0M(), collision.centFT0C(), collision.centFT0A(), collision.centFT0M(), collision.multNTracksGlobal(), toiMask});
protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFT0A(), collision.multFT0M(), collision.centFT0C(), collision.centFT0A(), collision.centFT0M(), collision.multNTracksGlobal(), toiMask, collision.selection_bit(aod::evsel::kNoSameBunchPileup)});
}
}

template <typename CascadeType>
void fillDataTable(auto const& candidates)
{
for (const auto& c : candidates) {
getDataTable<CascadeType>()(c.matchingChi2, c.deltaPtITS, c.deltaPt, c.itsClusSize, c.hasReassociatedCluster,
getDataTable<CascadeType>()(mRunNumber, c.matchingChi2, c.deltaPtITS, c.deltaPt, c.itsClusSize, c.hasReassociatedCluster,
c.pvContributors, c.cascPVContribs, c.pvTimeResolution, c.pvX, c.pvY, c.pvZ,
c.cascPt, c.cascEta, c.cascPhi,
c.protonPt, c.protonEta, c.pionPt, c.pionEta, c.bachPt, c.bachEta,
Expand All @@ -578,7 +600,7 @@ struct NonPromptCascadeTask {
c.protonTPCNSigma, c.pionTPCNSigma, c.bachKaonTPCNSigma, c.bachPionTPCNSigma,
c.protonHasTOF, c.pionHasTOF, c.bachHasTOF,
c.protonTOFNSigma, c.pionTOFNSigma, c.bachKaonTOFNSigma, c.bachPionTOFNSigma,
c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M, c.multNTracksGlobal, c.toiMask);
c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M, c.multNTracksGlobal, c.toiMask, c.noSameBunchPileup);
}
}

Expand Down Expand Up @@ -606,7 +628,7 @@ struct NonPromptCascadeTask {
auto mcCollision = particle.template mcCollision_as<aod::McCollisions>();
auto recCollision = collisions.iteratorAt(c.collisionID);

getMCtable<CascadeType>()(c.matchingChi2, c.deltaPtITS, c.deltaPt, c.itsClusSize, c.hasReassociatedCluster, c.isGoodMatch, c.isGoodCascade, c.pdgCodeMom, c.pdgCodeITStrack, c.isFromBeauty, c.isFromCharm,
getMCtable<CascadeType>()(mRunNumber, c.matchingChi2, c.deltaPtITS, c.deltaPt, c.itsClusSize, c.hasReassociatedCluster, c.isGoodMatch, c.isGoodCascade, c.pdgCodeMom, c.pdgCodeITStrack, c.isFromBeauty, c.isFromCharm,
c.pvContributors, c.cascPVContribs, c.pvTimeResolution, c.pvX, c.pvY, c.pvZ, c.cascPt, c.cascEta, c.cascPhi,
c.protonPt, c.protonEta, c.pionPt, c.pionEta, c.bachPt, c.bachEta,
c.cascDCAxy, c.cascDCAz, c.protonDCAxy, c.protonDCAz, c.pionDCAxy, c.pionDCAz, c.bachDCAxy, c.bachDCAz,
Expand All @@ -617,7 +639,7 @@ struct NonPromptCascadeTask {
c.sel8, c.multFT0C, c.multFT0A, c.multFT0M, c.centFT0C, c.centFT0A, c.centFT0M,
particle.pt(), particle.eta(), particle.phi(), mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(),
particle.pdgCode(), mcCollision.posX() - particle.vx(), mcCollision.posY() - particle.vy(),
mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters, c.multNTracksGlobal, c.toiMask);
mcCollision.posZ() - particle.vz(), mcCollision.globalIndex() == recCollision.mcCollisionId(), c.hasFakeReassociation, motherDecayDaughters, c.multNTracksGlobal, c.toiMask, c.noSameBunchPileup);
}
}

Expand Down
Loading