From dee81c6ae5e03b46c0d69a100c28b849be3906bc Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Fri, 21 Nov 2025 15:25:42 +0100 Subject: [PATCH 1/3] dev: response matrix for negatives --- PWGLF/DataModel/LFNonPromptCascadeTables.h | 20 ++--- PWGLF/Tasks/Strangeness/nonPromptCascade.cxx | 92 +++++++++++++++++--- 2 files changed, 88 insertions(+), 24 deletions(-) diff --git a/PWGLF/DataModel/LFNonPromptCascadeTables.h b/PWGLF/DataModel/LFNonPromptCascadeTables.h index ca175591c06..d9ed41fe6bf 100644 --- a/PWGLF/DataModel/LFNonPromptCascadeTables.h +++ b/PWGLF/DataModel/LFNonPromptCascadeTables.h @@ -114,10 +114,10 @@ DECLARE_SOA_COLUMN(MotherDecayDaughters, motherDecayDaughters, int8_t); DECLARE_SOA_COLUMN(Sel8, sel8, bool); DECLARE_SOA_COLUMN(MultFT0C, multFT0C, float); -DECLARE_SOA_COLUMN(MultFT0A, multFT0A, float); +DECLARE_SOA_COLUMN(MultFV0A, multFV0A, float); DECLARE_SOA_COLUMN(MultFT0M, multFT0M, float); DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float); -DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float); +DECLARE_SOA_COLUMN(CentFV0A, centFV0A, float); DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); DECLARE_SOA_COLUMN(MultNTracksGlobal, multNTracksGlobal, int); DECLARE_SOA_COLUMN(ToiMask, toiMask, uint32_t); @@ -184,10 +184,10 @@ DECLARE_SOA_TABLE(NPCascTable, "AOD", "NPCASCTABLE", NPCascadeTable::BachPionTOFNSigma, NPCascadeTable::Sel8, NPCascadeTable::MultFT0C, - NPCascadeTable::MultFT0A, + NPCascadeTable::MultFV0A, NPCascadeTable::MultFT0M, NPCascadeTable::CentFT0C, - NPCascadeTable::CentFT0A, + NPCascadeTable::CentFV0A, NPCascadeTable::CentFT0M, NPCascadeTable::MultNTracksGlobal, NPCascadeTable::ToiMask, @@ -252,10 +252,10 @@ DECLARE_SOA_TABLE(NPCascTableNT, "AOD", "NPCASCTABLENT", NPCascadeTable::BachPionTOFNSigma, NPCascadeTable::Sel8, NPCascadeTable::MultFT0C, - NPCascadeTable::MultFT0A, + NPCascadeTable::MultFV0A, NPCascadeTable::MultFT0M, NPCascadeTable::CentFT0C, - NPCascadeTable::CentFT0A, + NPCascadeTable::CentFV0A, NPCascadeTable::CentFT0M, NPCascadeTable::MultNTracksGlobal, NPCascadeTable::ToiMask, @@ -326,10 +326,10 @@ DECLARE_SOA_TABLE(NPCascTableMC, "AOD", "NPCASCTABLEMC", NPCascadeTable::BachPionTOFNSigma, NPCascadeTable::Sel8, NPCascadeTable::MultFT0C, - NPCascadeTable::MultFT0A, + NPCascadeTable::MultFV0A, NPCascadeTable::MultFT0M, NPCascadeTable::CentFT0C, - NPCascadeTable::CentFT0A, + NPCascadeTable::CentFV0A, NPCascadeTable::CentFT0M, NPCascadeTable::gPt, NPCascadeTable::gEta, @@ -413,10 +413,10 @@ DECLARE_SOA_TABLE(NPCascTableMCNT, "AOD", "NPCASCTABLEMCNT", NPCascadeTable::BachPionTOFNSigma, NPCascadeTable::Sel8, NPCascadeTable::MultFT0C, - NPCascadeTable::MultFT0A, + NPCascadeTable::MultFV0A, NPCascadeTable::MultFT0M, NPCascadeTable::CentFT0C, - NPCascadeTable::CentFT0A, + NPCascadeTable::CentFV0A, NPCascadeTable::CentFT0M, NPCascadeTable::gPt, NPCascadeTable::gEta, diff --git a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx index 40048e8bcfc..65c4ab2ba60 100644 --- a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx +++ b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx @@ -41,6 +41,8 @@ #include #include #include +#include "TDatabasePDG.h" +#include "TParticlePDG.h" // #include "PWGHF/Core/PDG.h" #include "PWGLF/DataModel/LFNonPromptCascadeTables.h" #include "PWGLF/DataModel/LFStrangenessTables.h" @@ -124,10 +126,10 @@ struct NPCascCandidate { float bachPionTOFNSigma; bool sel8; float multFT0C; - float multFT0A; + float multFV0A; float multFT0M; float centFT0C; - float centFT0A; + float centFV0A; float centFT0M; int multNTracksGlobal; uint32_t toiMask; @@ -180,8 +182,10 @@ struct NonPromptCascadeTask { using TracksExtData = soa::Join; using TracksExtMC = soa::Join; - using CollisionCandidatesRun3 = soa::Join; - using CollisionCandidatesRun3MC = soa::Join; + using CollisionCandidatesRun3 = soa::Join; + using CollisionCandidatesRun3MC = soa::Join; + using CollisionsWithLabel = soa::Join; + Preslice perCollision = aod::track::collisionId; Preslice perCollisionMC = aod::track::collisionId; @@ -205,9 +209,10 @@ struct NonPromptCascadeTask { Configurable> cfgCutsPID{"particlesCutsPID", {cutsPID[0], nParticles, nCutsPID, particlesNames, cutsNames}, "Nuclei PID selections"}; Configurable cfgSkimmedProcessing{"cfgSkimmedProcessing", true, "Skimmed dataset processing"}; - Configurable cfgTriggersOfInterest{"cfgTriggersOfInterest", "fTrackedOmega,fOmegaHighMult", "Triggers of interest, comma separated for Zorro"}; + Configurable cfgTriggersOfInterest{"cfgTriggersOfInterest", "fTrackedOmega,fOmegaHighMult,fHighFt0Mult", "Triggers of interest, comma separated for Zorro"}; Configurable cfgMaxMult{"cfgMaxMult", 8000.f, "Upper range of multiplicty histo"}; + Configurable cfgMaxMultFV0{"cfgMaxMultFV0", 10000.f, "Upper range of multiplicty FV0 histo"}; Configurable cfgMinMult{"cfgMinMult", 3000.f, "Lower range of FT0M histo in zoomed histo"}; Configurable cfgMaxCent{"cfgMaxCent", 8.0025f, "Upper range of FT0M histo"}; @@ -227,13 +232,18 @@ struct NonPromptCascadeTask { std::unordered_map> mHistsPerRunNtracktVsCentZoom; int nBinsMult = cfgMaxMult; + int nBinsMultFV0 = cfgMaxMultFV0; int nBinsMultZoom = cfgMaxMult - cfgMinMult; int nBinsCentZoom = (cfgMaxCent + 0.0025) / 0.005; + AxisSpec multAxis = {nBinsMult, 0, cfgMaxMult, "Multiplicity FT0M"}; + AxisSpec multAxisFV0 = {nBinsMultFV0, 0, cfgMaxMultFV0, "Multiplicity FT0M"}; AxisSpec centAxis = {101, -0.025, 101.025, "Centrality"}; AxisSpec centAxisZoom = {nBinsCentZoom, -0.0025, cfgMaxCent, "Centrality"}; AxisSpec multAxisZoom = {nBinsMultZoom, cfgMinMult, cfgMaxMult, "Multiplicity FT0M"}; AxisSpec nTracksAxis = {100, 0., 100., "NTracksGlobal"}; + AxisSpec nTracksAxisMC = {100, 0., 100., "NTracksMC"}; + void initCCDB(aod::BCsWithTimestamps::iterator const& bc) { @@ -279,7 +289,10 @@ struct NonPromptCascadeTask { mRegistry.add("hMultVsCentZoom", "hMultVsCentZoom", HistType::kTH2F, {centAxisZoom, multAxisZoom}); mRegistry.add("hNTracksVsCent", "hNTracksVsCent", HistType::kTH2F, {centAxis, nTracksAxis}); mRegistry.add("hNTracksVsCentZoom", "hNTracksVsCentZoom", HistType::kTH2F, {centAxisZoom, nTracksAxis}); - + mRegistry.add("hMultFV0VshNTracks", "hMultFV0VshNTracks", HistType::kTH2F, {nTracksAxis, multAxisFV0}); + mRegistry.add("hNTracksVsCentFV0A", "hNTracksVsCentFV0A", HistType::kTH2F, {nTracksAxis, centAxis}); + mRegistry.add("hNTracksMCVsTracksReco", "hNTracksMCVsTracksReco", HistType::kTH2F, {nTracksAxisMC, nTracksAxis}); + mRegistry.add("hNTracksMCNotInReco","hNTracksMCNotInReco", HistType::kTH1F, {nTracksAxisMC}); for (size_t iBin{0}; iBin < cutsNames.size(); ++iBin) { cutsOmega->GetYaxis()->SetBinLabel(iBin + 1, cutsNames[iBin].c_str()); cutsXi->GetYaxis()->SetBinLabel(iBin + 1, cutsNames[iBin].c_str()); @@ -345,7 +358,8 @@ struct NonPromptCascadeTask { } } } - void fillMultHistos(const auto& collisions) + template + void fillMultHistos(CollisionType const& collisions) { // std::cout << "Filling mult histos" << std::endl; for (const auto& coll : collisions) { @@ -368,6 +382,8 @@ struct NonPromptCascadeTask { mRegistry.fill(HIST("hMultVsCentZoom"), coll.centFT0M(), coll.multFT0M()); mRegistry.fill(HIST("hNTracksVsCent"), coll.centFT0M(), (float)coll.multNTracksGlobal()); mRegistry.fill(HIST("hNTracksVsCentZoom"), coll.centFT0M(), coll.multNTracksGlobal()); + mRegistry.fill(HIST("hMultFV0VshNTracks"), coll.multNTracksGlobal(), coll.multFV0A()); + mRegistry.fill(HIST("hNTracksVsCentFV0A"), coll.multNTracksGlobal(), coll.centFV0A()); } }; @@ -590,7 +606,7 @@ 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, collision.selection_bit(aod::evsel::kNoSameBunchPileup)}); + protonTrack.tofNSigmaPr(), pionTrack.tofNSigmaPi(), bachelor.tofNSigmaKa(), bachelor.tofNSigmaPi(), collision.sel8(), collision.multFT0C(), collision.multFV0A(), collision.multFT0M(), collision.centFT0C(), collision.centFV0A(), collision.centFT0M(), collision.multNTracksGlobal(), toiMask, collision.selection_bit(aod::evsel::kNoSameBunchPileup)}); } } @@ -610,7 +626,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.noSameBunchPileup); + c.sel8, c.multFT0C, c.multFV0A, c.multFT0M, c.centFT0C, c.centFV0A, c.centFT0M, c.multNTracksGlobal, c.toiMask, c.noSameBunchPileup); } } @@ -646,7 +662,7 @@ struct NonPromptCascadeTask { c.cascNClusITS, c.protonNClusITS, c.pionNClusITS, c.bachNClusITS, c.protonNClusTPC, c.pionNClusTPC, c.bachNClusTPC, 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.sel8, c.multFT0C, c.multFV0A, c.multFT0M, c.centFT0C, c.centFV0A, 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, c.noSameBunchPileup); @@ -689,11 +705,13 @@ struct NonPromptCascadeTask { { fillCandidatesVector(collisions, tracks, cascades, gCandidatesNT); fillMCtable(mcParticles, collisions, gCandidatesNT); + fillMultHistos(collisions); } PROCESS_SWITCH(NonPromptCascadeTask, processCascadesMC, "process cascades: MC analysis", false); - void processGenParticles(aod::McParticles const& mcParticles, aod::McCollisions const&) + void processGenParticles(aod::McParticles const& mcParticles, aod::McCollisions const& collisions) { + //fillMultHistos(collisions) for (const auto& p : mcParticles) { auto absCode = std::abs(p.pdgCode()); if (absCode != 3312 && absCode != 3334) { @@ -702,7 +720,6 @@ struct NonPromptCascadeTask { auto fromHF = isFromHF(p); int pdgCodeMom = p.has_mothers() ? p.template mothers_as()[0].pdgCode() : 0; auto mcCollision = p.template mcCollision_as(); - int motherDecayDaughters{0}; if (fromHF[0] || fromHF[1]) { auto mom = p.template mothers_as()[0]; @@ -715,7 +732,6 @@ struct NonPromptCascadeTask { } } } - NPCTableGen(p.pt(), p.eta(), p.phi(), p.pdgCode(), pdgCodeMom, mcCollision.posX() - p.vx(), mcCollision.posY() - p.vy(), mcCollision.posZ() - p.vz(), fromHF[0], fromHF[1], motherDecayDaughters); } } @@ -741,9 +757,57 @@ struct NonPromptCascadeTask { zorroAccounting(collisions); fillCandidatesVector(collisions, tracks, cascades, gCandidatesNT); fillDataTable(gCandidatesNT); - fillMultHistos(collisions); + fillMultHistos(collisions); } PROCESS_SWITCH(NonPromptCascadeTask, processCascadesData, "process cascades: Data analysis", false); + + int getMCMult(aod::McParticles const& mcParticles, int mcCollId ) + { + int mult = 0; + for (auto const& mcp : mcParticles) { + if (mcp.mcCollisionId() == mcCollId) { + // multiplicity definition: + bool accept = mcp.isPhysicalPrimary(); + accept *= (mcp.eta() < 0.5) && (mcp.eta() > -0.5); + int q = 0; + auto pdgEntry = TDatabasePDG::Instance()->GetParticle(mcp.pdgCode()); + if(pdgEntry){ + q = int(std::round(pdgEntry->Charge() / 3.0)); + } else { + //LOG(warn) << "No pdg assuming neutral"; + } + accept *= (q != 0); + if (accept) { + ++mult; + } + } + } + return mult; + } + void processNegMC(CollisionsWithLabel const& colls, aod::McCollisions const& mcCollisions, aod::McParticles const& mcParticles ) + { + //std::cout << "ProcNegMC" << std::endl; + std::vector mcReconstructed(mcCollisions.size(),0); + for(auto const& col: colls){ + int mcCollId = col.mcCollisionId(); // col.template mcCollision_as(); + //auto mc = col.mcCollision(); + //int mcId = mc.globalIndex(); + //std::cout << "globalIndex:" << mcId << " colID:" << mcCollId << std::endl; + int mult = getMCMult(mcParticles, mcCollId); + mcReconstructed[mcCollId] = 1; + mRegistry.fill(HIST("hNTracksMCVsTracksReco"), mult, col.multNTracksGlobal()); + } + for(auto const& mc: mcCollisions){ + int gindex = mc.globalIndex(); + //std::cout << "mc globalIndex:" << gindex << std::endl; + if(!mcReconstructed[gindex]){ + int mult = getMCMult(mcParticles, gindex); + //std::cout << "===> unreconstructed:" << mult << std::endl; + mRegistry.fill(HIST( "hNTracksMCNotInReco"), mult); + } + } + } + PROCESS_SWITCH(NonPromptCascadeTask, processNegMC, "process mc", false); }; WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) From 0d5765fb61e01e101f8682cd9fca0c66f7cae7d8 Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Fri, 21 Nov 2025 15:26:51 +0100 Subject: [PATCH 2/3] clang --- PWGLF/Tasks/Strangeness/nonPromptCascade.cxx | 46 ++++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx index 65c4ab2ba60..983d60f9b50 100644 --- a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx +++ b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx @@ -36,13 +36,13 @@ #include "ReconstructionDataFormats/Vertex.h" #include "Math/Vector4D.h" +#include "TDatabasePDG.h" +#include "TParticlePDG.h" #include #include #include #include -#include "TDatabasePDG.h" -#include "TParticlePDG.h" // #include "PWGHF/Core/PDG.h" #include "PWGLF/DataModel/LFNonPromptCascadeTables.h" #include "PWGLF/DataModel/LFStrangenessTables.h" @@ -186,7 +186,6 @@ struct NonPromptCascadeTask { using CollisionCandidatesRun3MC = soa::Join; using CollisionsWithLabel = soa::Join; - Preslice perCollision = aod::track::collisionId; Preslice perCollisionMC = aod::track::collisionId; @@ -244,7 +243,6 @@ struct NonPromptCascadeTask { AxisSpec nTracksAxis = {100, 0., 100., "NTracksGlobal"}; AxisSpec nTracksAxisMC = {100, 0., 100., "NTracksMC"}; - void initCCDB(aod::BCsWithTimestamps::iterator const& bc) { if (mRunNumber == bc.runNumber()) { @@ -292,7 +290,7 @@ struct NonPromptCascadeTask { mRegistry.add("hMultFV0VshNTracks", "hMultFV0VshNTracks", HistType::kTH2F, {nTracksAxis, multAxisFV0}); mRegistry.add("hNTracksVsCentFV0A", "hNTracksVsCentFV0A", HistType::kTH2F, {nTracksAxis, centAxis}); mRegistry.add("hNTracksMCVsTracksReco", "hNTracksMCVsTracksReco", HistType::kTH2F, {nTracksAxisMC, nTracksAxis}); - mRegistry.add("hNTracksMCNotInReco","hNTracksMCNotInReco", HistType::kTH1F, {nTracksAxisMC}); + mRegistry.add("hNTracksMCNotInReco", "hNTracksMCNotInReco", HistType::kTH1F, {nTracksAxisMC}); for (size_t iBin{0}; iBin < cutsNames.size(); ++iBin) { cutsOmega->GetYaxis()->SetBinLabel(iBin + 1, cutsNames[iBin].c_str()); cutsXi->GetYaxis()->SetBinLabel(iBin + 1, cutsNames[iBin].c_str()); @@ -711,7 +709,7 @@ struct NonPromptCascadeTask { void processGenParticles(aod::McParticles const& mcParticles, aod::McCollisions const& collisions) { - //fillMultHistos(collisions) + // fillMultHistos(collisions) for (const auto& p : mcParticles) { auto absCode = std::abs(p.pdgCode()); if (absCode != 3312 && absCode != 3334) { @@ -761,22 +759,22 @@ struct NonPromptCascadeTask { } PROCESS_SWITCH(NonPromptCascadeTask, processCascadesData, "process cascades: Data analysis", false); - int getMCMult(aod::McParticles const& mcParticles, int mcCollId ) + int getMCMult(aod::McParticles const& mcParticles, int mcCollId) { int mult = 0; for (auto const& mcp : mcParticles) { - if (mcp.mcCollisionId() == mcCollId) { + if (mcp.mcCollisionId() == mcCollId) { // multiplicity definition: bool accept = mcp.isPhysicalPrimary(); accept *= (mcp.eta() < 0.5) && (mcp.eta() > -0.5); int q = 0; auto pdgEntry = TDatabasePDG::Instance()->GetParticle(mcp.pdgCode()); - if(pdgEntry){ + if (pdgEntry) { q = int(std::round(pdgEntry->Charge() / 3.0)); } else { - //LOG(warn) << "No pdg assuming neutral"; + // LOG(warn) << "No pdg assuming neutral"; } - accept *= (q != 0); + accept *= (q != 0); if (accept) { ++mult; } @@ -784,26 +782,26 @@ struct NonPromptCascadeTask { } return mult; } - void processNegMC(CollisionsWithLabel const& colls, aod::McCollisions const& mcCollisions, aod::McParticles const& mcParticles ) + void processNegMC(CollisionsWithLabel const& colls, aod::McCollisions const& mcCollisions, aod::McParticles const& mcParticles) { - //std::cout << "ProcNegMC" << std::endl; - std::vector mcReconstructed(mcCollisions.size(),0); - for(auto const& col: colls){ - int mcCollId = col.mcCollisionId(); // col.template mcCollision_as(); - //auto mc = col.mcCollision(); - //int mcId = mc.globalIndex(); - //std::cout << "globalIndex:" << mcId << " colID:" << mcCollId << std::endl; + // std::cout << "ProcNegMC" << std::endl; + std::vector mcReconstructed(mcCollisions.size(), 0); + for (auto const& col : colls) { + int mcCollId = col.mcCollisionId(); // col.template mcCollision_as(); + // auto mc = col.mcCollision(); + // int mcId = mc.globalIndex(); + // std::cout << "globalIndex:" << mcId << " colID:" << mcCollId << std::endl; int mult = getMCMult(mcParticles, mcCollId); mcReconstructed[mcCollId] = 1; mRegistry.fill(HIST("hNTracksMCVsTracksReco"), mult, col.multNTracksGlobal()); } - for(auto const& mc: mcCollisions){ + for (auto const& mc : mcCollisions) { int gindex = mc.globalIndex(); - //std::cout << "mc globalIndex:" << gindex << std::endl; - if(!mcReconstructed[gindex]){ + // std::cout << "mc globalIndex:" << gindex << std::endl; + if (!mcReconstructed[gindex]) { int mult = getMCMult(mcParticles, gindex); - //std::cout << "===> unreconstructed:" << mult << std::endl; - mRegistry.fill(HIST( "hNTracksMCNotInReco"), mult); + // std::cout << "===> unreconstructed:" << mult << std::endl; + mRegistry.fill(HIST("hNTracksMCNotInReco"), mult); } } } From 7d987bc7b40f98d8c9e2d99e9d847d31da699a81 Mon Sep 17 00:00:00 2001 From: Roman Lietava Date: Sun, 23 Nov 2025 09:59:56 +0100 Subject: [PATCH 3/3] fixes --- PWGLF/Tasks/Strangeness/nonPromptCascade.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx index 983d60f9b50..47417fa070f 100644 --- a/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx +++ b/PWGLF/Tasks/Strangeness/nonPromptCascade.cxx @@ -707,9 +707,8 @@ struct NonPromptCascadeTask { } PROCESS_SWITCH(NonPromptCascadeTask, processCascadesMC, "process cascades: MC analysis", false); - void processGenParticles(aod::McParticles const& mcParticles, aod::McCollisions const& collisions) + void processGenParticles(aod::McParticles const& mcParticles) { - // fillMultHistos(collisions) for (const auto& p : mcParticles) { auto absCode = std::abs(p.pdgCode()); if (absCode != 3312 && absCode != 3334) { @@ -766,7 +765,7 @@ struct NonPromptCascadeTask { if (mcp.mcCollisionId() == mcCollId) { // multiplicity definition: bool accept = mcp.isPhysicalPrimary(); - accept *= (mcp.eta() < 0.5) && (mcp.eta() > -0.5); + accept = accept && (mcp.eta() < 0.5) && (mcp.eta() > -0.5); int q = 0; auto pdgEntry = TDatabasePDG::Instance()->GetParticle(mcp.pdgCode()); if (pdgEntry) { @@ -774,7 +773,7 @@ struct NonPromptCascadeTask { } else { // LOG(warn) << "No pdg assuming neutral"; } - accept *= (q != 0); + accept = accept && (q != 0); if (accept) { ++mult; }