Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions PWGLF/DataModel/LFNonPromptCascadeTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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 31 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 @@ -63,8 +63,8 @@
DECLARE_SOA_COLUMN(BachDCAxy, bachDCAxy, float);
DECLARE_SOA_COLUMN(BachDCAz, bachDCAz, float);

DECLARE_SOA_COLUMN(CascCosPA, casccosPA, 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(V0CosPA, v0cosPA, float);

Check failure on line 67 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 @@ -99,13 +99,13 @@
DECLARE_SOA_COLUMN(BachKaonTOFNSigma, bachKaonTOFNSigma, float);
DECLARE_SOA_COLUMN(BachPionTOFNSigma, bachPionTOFNSigma, float);

DECLARE_SOA_COLUMN(gPt, genPt, 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(gEta, genEta, 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(gPhi, genPhi, 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(gVx, genVx, float);

Check failure on line 105 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);

Check failure on line 106 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(gVz, genVz, float);

Check failure on line 107 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(PDGcode, pdgCode, int);

Check failure on line 108 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(DCAxMC, dcaXmc, float);
DECLARE_SOA_COLUMN(DCAyMC, dcaYmc, float);
DECLARE_SOA_COLUMN(DCAzMC, dcaZmc, float);
Expand All @@ -128,7 +128,10 @@
DECLARE_SOA_COLUMN(GlobalBC, globalBC, uint64_t);
DECLARE_SOA_COLUMN(PtGen, ptGen, float);
DECLARE_SOA_COLUMN(PtRec, ptRec, float);
DECLARE_SOA_COLUMN(EtaGen, etaGen, float);
DECLARE_SOA_COLUMN(EtaRec, etaRec, float);
DECLARE_SOA_COLUMN(MultGen, multGen, int);
DECLARE_SOA_COLUMN(MultGenFT0, multGenFT0, int);

} // namespace NPCascadeTable
DECLARE_SOA_TABLE(NPCascTable, "AOD", "NPCASCTABLE",
Expand Down Expand Up @@ -455,20 +458,25 @@
DECLARE_SOA_TABLE(NPMCChargedTable, "AOD", "NPMCChargedTABLE",
NPCascadeTable::PtGen,
NPCascadeTable::PtRec,
NPCascadeTable::EtaGen,
NPCascadeTable::EtaRec,
NPCascadeTable::MultNTracksNP,
NPCascadeTable::MultGen);
NPCascadeTable::MultGen,
NPCascadeTable::MultGenFT0);
DECLARE_SOA_TABLE(NPCollisionTable, "AOD", "NPCollisionTABLE",
NPCascadeTable::RunNumber,
NPCascadeTable::GlobalBC,
aod::collision::NumContrib,
NPCascadeTable::MultNTracksGlobal,
NPCascadeTable::MultNTracksNP,
NPCascadeTable::CentFT0M,
NPCascadeTable::MultFT0M);
NPCascadeTable::MultFT0M,
NPCascadeTable::NoSameBunchPileup);
DECLARE_SOA_INDEX_COLUMN_FULL(NPCollision, npCollision, int32_t, NPCollisionTable, "");
DECLARE_SOA_TABLE(NPRecoChargedCand, "AOD", "NPRecoChargedCand",
NPCollisionId,
NPCascadeTable::PtRec);
NPCascadeTable::PtRec,
NPCascadeTable::EtaRec);
} // namespace o2::aod

#endif // PWGLF_DATAMODEL_LFNONPROMPTCASCADETABLES_H_
61 changes: 47 additions & 14 deletions PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,29 @@ struct NonPromptCascadeTask {
return q != 0;
};

static constexpr float minEtaFT0A = 3.5f;
static constexpr float maxEtaFT0A = 4.9f;
static constexpr float minEtaFT0C = -3.3f;
static constexpr float maxEtaFT0C = -2.1f;
static constexpr float invalidEta = -999.f;

auto isAcceptedMCParticleFT0 = [&](auto const& mcp) {
if (!mcp.isPhysicalPrimary()) {
return false;
}

const float eta = mcp.eta();
if (!((eta > minEtaFT0A && eta < maxEtaFT0A) || (eta > minEtaFT0C && eta < maxEtaFT0C))) {
return false;
}

int q = 0;
if (auto pdg = pdgDB->GetParticle(mcp.pdgCode())) {
q = static_cast<int>(std::round(pdg->Charge() / 3.0));
}
return q != 0;
};

// ------------------------------------------------------------
// Helper: accepted reconstructed track
// Use same cuts as data.
Expand All @@ -866,6 +889,7 @@ struct NonPromptCascadeTask {
// mcid: mc collision row of mc particle
// ------------------------------------------------------------
std::vector<int> mcMult(mcCollisions.size(), 0);
std::vector<int> mcMultFT0(mcCollisions.size(), 0);
// std::cout << "mcCollisions size:" << mcCollisions.size() << std::endl;
for (auto const& mcp : mcParticles) {
const int mcid = mcp.mcCollisionId();
Expand All @@ -874,10 +898,12 @@ struct NonPromptCascadeTask {
LOG(info) << "0 This should never happen ?";
continue;
}
if (!isAcceptedMCParticle(mcp)) {
continue;
if (isAcceptedMCParticle(mcp)) {
++mcMult[mcid];
}
if (isAcceptedMCParticleFT0(mcp)) {
++mcMultFT0[mcid];
}
++mcMult[mcid];
}

// ------------------------------------------------------------
Expand Down Expand Up @@ -990,11 +1016,12 @@ struct NonPromptCascadeTask {
const int mcCollId = col.mcCollisionId();
const float multReco = recoMultDense[dIdx];
const float ptReco = trk.pt();
const float etaReco = trk.eta();

if (mcCollId < 0 || static_cast<int64_t>(mcCollId) >= mcCollisions.size()) {
if (writeRecoCollision[dIdx]) {
// Fake: accepted reco track whose reconstructed collision has no valid MC collision label.
NPMCNTable(-1.f, ptReco, multReco, -1.f);
NPMCNTable(-1.f, ptReco, invalidEta, etaReco, multReco, -1.f, -1.f);
}
continue;
}
Expand All @@ -1003,7 +1030,7 @@ struct NonPromptCascadeTask {
if (mcPid < 0 || static_cast<int64_t>(mcPid) >= mcParticles.size()) {
if (writeMcCollision[mcCollId]) {
// Fake: accepted reco track with invalid or missing MC particle label.
NPMCNTable(-2.f, ptReco, multReco, -2.f);
NPMCNTable(-2.f, ptReco, invalidEta, etaReco, multReco, -2.f, mcMultFT0[mcCollId]);
}
continue;
}
Expand All @@ -1014,15 +1041,15 @@ struct NonPromptCascadeTask {
if (mcParCollId != mcCollId) {
if (writeMcCollision[mcCollId]) {
// Fake: reco collision and particle label point to different MC collisions.
NPMCNTable(-3.f, ptReco, multReco, -3.f);
NPMCNTable(-3.f, ptReco, invalidEta, etaReco, multReco, -3.f, mcMultFT0[mcCollId]);
}
continue;
}

if (!isAcceptedMCParticle(mcPar)) {
if (writeMcCollision[mcCollId]) {
// Feed-in: accepted reco track matched to truth outside fiducial phase space.
NPMCNTable(-4.f, ptReco, multReco, -4.f);
NPMCNTable(-4.f, ptReco, mcPar.eta(), etaReco, multReco, -4.f, mcMultFT0[mcCollId]);
}
continue;
}
Expand All @@ -1031,6 +1058,7 @@ struct NonPromptCascadeTask {

const float multMC = mcMult[mcCollId];
const float ptMC = mcPar.pt();
const float etaMC = mcPar.eta();

mRegistrydNdeta.fill(HIST("hdNdetaRM/hdNdetaRM"),
multMC,
Expand All @@ -1040,7 +1068,7 @@ struct NonPromptCascadeTask {

if (writeMcCollision[mcCollId]) {
// Matched: accepted truth particle reconstructed inside the fiducial reco phase space.
NPMCNTable(ptMC, ptReco, multReco, multMC);
NPMCNTable(ptMC, ptReco, etaMC, etaReco, multReco, multMC, mcMultFT0[mcCollId]);
}
}

Expand Down Expand Up @@ -1069,14 +1097,15 @@ struct NonPromptCascadeTask {
}

const float multMC = mcMult[mcid];
const float multMCFT0 = mcMultFT0[mcid];

mRegistrydNdeta.fill(HIST("hdNdetaRM/hdNdetaRMNotInRecoTrk"),
multMC,
mcp.pt());

if (writeMcCollision[mcid]) {
// Missed track: accepted truth particle in a reconstructed MC collision, but no accepted reco track.
NPMCNTable(mcp.pt(), -1.f, -1.f, multMC);
NPMCNTable(mcp.pt(), -1.f, mcp.eta(), invalidEta, -1.f, multMC, multMCFT0);
}
}

Expand All @@ -1089,6 +1118,7 @@ struct NonPromptCascadeTask {
}

const float multMC = mcMult[mcid];
const float multMCFT0 = mcMultFT0[mcid];

for (auto const& mcp : mcParticles) {
if (mcp.mcCollisionId() != mcid) {
Expand All @@ -1105,7 +1135,7 @@ struct NonPromptCascadeTask {

if (writeMcCollision[mcid]) {
// Missed collision: accepted truth particle from an MC collision with no reconstructed collision.
NPMCNTable(mcp.pt(), -2.f, -2.f, multMC);
NPMCNTable(mcp.pt(), -2.f, mcp.eta(), invalidEta, -2.f, multMC, multMCFT0);
}
}
}
Expand Down Expand Up @@ -1134,13 +1164,15 @@ struct NonPromptCascadeTask {
auto tracksThisColl = tracks.sliceBy(perCollisionSel, coll.globalIndex());
int multreco = 0;
std::vector<float> recoPts;
std::vector<float> recoEtas;
// std::cout << "tracks:" << tracksThisColl.size() << std::endl;
for (auto const& track : tracksThisColl) {
// std::cout << track.pt() << " tracks " << track.isGlobalTrack() << std::endl;
if (std::fabs(track.eta()) < cfgEtaCutdNdeta && track.tpcNClsFound() >= 80 && track.tpcNClsCrossedRows() >= 100) {
if (track.isGlobalTrack()) {
multreco++;
recoPts.push_back(track.pt());
recoEtas.push_back(track.eta());
}
}
}
Expand All @@ -1155,10 +1187,11 @@ struct NonPromptCascadeTask {
coll.multNTracksGlobal(),
multreco,
coll.centFT0M(),
coll.multFT0M());
coll.multFT0M(),
coll.selection_bit(aod::evsel::kNoSameBunchPileup));
auto collIdx = NPCollsTable.lastIndex();
for (auto const& pt : recoPts) {
NPRecoCandTable(collIdx, pt);
for (size_t i = 0; i < recoPts.size(); ++i) {
NPRecoCandTable(collIdx, recoPts[i], recoEtas[i]);
}
}
}
Expand Down Expand Up @@ -1190,7 +1223,7 @@ struct NonPromptCascadeTask {
}
float centFT0M = coll.centFT0M();
float multFT0M = coll.multFT0M();
NPCollsTable(mRunNumber, globalBC, coll.numContrib(), coll.multNTracksGlobal(), 0, centFT0M, multFT0M);
NPCollsTable(mRunNumber, globalBC, coll.numContrib(), coll.multNTracksGlobal(), 0, centFT0M, multFT0M, coll.selection_bit(aod::evsel::kNoSameBunchPileup));
}
}
};
Expand Down
Loading