Skip to content
Merged
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
4 changes: 3 additions & 1 deletion 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 Down Expand Up @@ -462,7 +462,9 @@
NPCascadeTable::EtaRec,
NPCascadeTable::MultNTracksNP,
NPCascadeTable::MultGen,
NPCascadeTable::MultGenFT0);
NPCascadeTable::MultGenFT0,
NPCascadeTable::MultFT0M,
NPCascadeTable::CentFT0M);
DECLARE_SOA_TABLE(NPCollisionTable, "AOD", "NPCollisionTABLE",
NPCascadeTable::RunNumber,
NPCascadeTable::GlobalBC,
Expand Down
22 changes: 15 additions & 7 deletions PWGLF/Tasks/Strangeness/nonPromptCascade.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -960,11 +960,15 @@ struct NonPromptCascadeTask {
// MC collision has a reconstructed collision in 'colls'.
// This must be independent of reco-track cuts.
std::vector<char> mcCollisionHasRecoCollision(mcCollisions.size(), 0);
std::vector<float> mcCollisionRecoMultFT0M(mcCollisions.size(), InvalidEta);
std::vector<float> mcCollisionRecoCentFT0M(mcCollisions.size(), InvalidEta);

for (auto const& col : colls) {
const int mcid = col.mcCollisionId();
if (mcid >= 0 && static_cast<size_t>(mcid) < mcCollisionHasRecoCollision.size()) {
mcCollisionHasRecoCollision[mcid] = 1;
mcCollisionRecoMultFT0M[mcid] = col.multFT0M();
mcCollisionRecoCentFT0M[mcid] = col.centFT0M();
} else {
LOG(info) << "4 This should never happen ?";
}
Expand Down Expand Up @@ -1016,11 +1020,13 @@ struct NonPromptCascadeTask {
const float multReco = recoMultDense[dIdx];
const float ptReco = trk.pt();
const float etaReco = trk.eta();
const float multFT0M = col.multFT0M();
const float centFT0M = col.centFT0M();

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, InvalidEta, etaReco, multReco, -1.f, -1.f);
NPMCNTable(-1.f, ptReco, InvalidEta, etaReco, multReco, -1.f, -1.f, multFT0M, centFT0M);
}
continue;
}
Expand All @@ -1029,7 +1035,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, InvalidEta, etaReco, multReco, -2.f, mcMultFT0[mcCollId]);
NPMCNTable(-2.f, ptReco, InvalidEta, etaReco, multReco, -2.f, mcMultFT0[mcCollId], multFT0M, centFT0M);
}
continue;
}
Expand All @@ -1040,15 +1046,15 @@ struct NonPromptCascadeTask {
if (mcParCollId != mcCollId) {
if (writeMcCollision[mcCollId]) {
// Fake: reco collision and particle label point to different MC collisions.
NPMCNTable(-3.f, ptReco, InvalidEta, etaReco, multReco, -3.f, mcMultFT0[mcCollId]);
NPMCNTable(-3.f, ptReco, InvalidEta, etaReco, multReco, -3.f, mcMultFT0[mcCollId], multFT0M, centFT0M);
}
continue;
}

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

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

Expand Down Expand Up @@ -1097,14 +1103,16 @@ struct NonPromptCascadeTask {

const float multMC = mcMult[mcid];
const float multMCFT0 = mcMultFT0[mcid];
const float multFT0M = mcCollisionRecoMultFT0M[mcid];
const float centFT0M = mcCollisionRecoCentFT0M[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, mcp.eta(), InvalidEta, -1.f, multMC, multMCFT0);
NPMCNTable(mcp.pt(), -1.f, mcp.eta(), InvalidEta, -1.f, multMC, multMCFT0, multFT0M, centFT0M);
}
}

Expand Down Expand Up @@ -1134,7 +1142,7 @@ struct NonPromptCascadeTask {

if (writeMcCollision[mcid]) {
// Missed collision: accepted truth particle from an MC collision with no reconstructed collision.
NPMCNTable(mcp.pt(), -2.f, mcp.eta(), InvalidEta, -2.f, multMC, multMCFT0);
NPMCNTable(mcp.pt(), -2.f, mcp.eta(), InvalidEta, -2.f, multMC, multMCFT0, InvalidEta, InvalidEta);
}
}
}
Expand Down
Loading