From eac0024b0674fcf3522bd05468bfde5e31fb7502 Mon Sep 17 00:00:00 2001 From: Giovanni Malfattore Date: Tue, 21 Oct 2025 11:32:57 +0200 Subject: [PATCH 1/5] NucleiTask - Fix error --- PWGLF/Tasks/Nuspex/{LFNucleiBATask.cxx => lfNucleiBATask.cxx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename PWGLF/Tasks/Nuspex/{LFNucleiBATask.cxx => lfNucleiBATask.cxx} (100%) diff --git a/PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx b/PWGLF/Tasks/Nuspex/lfNucleiBATask.cxx similarity index 100% rename from PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx rename to PWGLF/Tasks/Nuspex/lfNucleiBATask.cxx From 9151dd56c0f67d7ef054a7ec0673ec3f763d7ae1 Mon Sep 17 00:00:00 2001 From: Giovanni Malfattore Date: Tue, 21 Oct 2025 11:39:26 +0200 Subject: [PATCH 2/5] NucleiTask - Fix bugs in mult dependent histos --- PWGLF/Tasks/Nuspex/{lfNucleiBATask.cxx => LFNucleiBATask.cxx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename PWGLF/Tasks/Nuspex/{lfNucleiBATask.cxx => LFNucleiBATask.cxx} (100%) diff --git a/PWGLF/Tasks/Nuspex/lfNucleiBATask.cxx b/PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx similarity index 100% rename from PWGLF/Tasks/Nuspex/lfNucleiBATask.cxx rename to PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx From 8ad53e5f58e5a0603e031bf6fc81634b5baf3e3c Mon Sep 17 00:00:00 2001 From: Giovanni Malfattore Date: Thu, 28 May 2026 16:48:48 +0200 Subject: [PATCH 3/5] NucleiTask - Add INELgt0 and INELgt1 checks on data model --- PWGLF/DataModel/LFNucleiTables.h | 8 +++++ .../Nuspex/LFTreeCreatorNuclei.cxx | 9 ++++-- PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx | 32 ++++++++++++++++--- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/PWGLF/DataModel/LFNucleiTables.h b/PWGLF/DataModel/LFNucleiTables.h index f74d3b8ed9d..2caf11a5fb2 100644 --- a/PWGLF/DataModel/LFNucleiTables.h +++ b/PWGLF/DataModel/LFNucleiTables.h @@ -33,6 +33,11 @@ DECLARE_SOA_COLUMN(IsEventReject, isEventReject, int); DECLARE_SOA_COLUMN(RunNumber, runNumber, int); DECLARE_SOA_COLUMN(CentFV0M, centFV0M, float); DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float); +DECLARE_SOA_COLUMN(MultNTracksPVeta1, multNTracksPVeta1, int); +DECLARE_SOA_DYNAMIC_COLUMN(IsInelGt0, isInelGt0, // is INEL > 0 + [](int multPveta1) -> bool { return multPveta1 > 0; }); +DECLARE_SOA_DYNAMIC_COLUMN(IsInelGt1, isInelGt1, // is INEL > 1 + [](int multPveta1) -> bool { return multPveta1 > 1; }); DECLARE_SOA_DYNAMIC_COLUMN(Selection_Bit, selection_bit, //! Dummy [](o2::aod::evsel::EventSelectionFlags /*v*/) -> bool { return true; }); } // namespace fullEvent @@ -44,6 +49,9 @@ DECLARE_SOA_TABLE(LfNuclEvents, "AOD", "LFNUCLEvent", collision::PosZ, fullEvent::CentFV0M, fullEvent::CentFT0M, + fullEvent::MultNTracksPVeta1, + fullEvent::IsInelGt0, + fullEvent::IsInelGt1, fullEvent::IsEventReject, fullEvent::RunNumber, fullEvent::Selection_Bit<>); diff --git a/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx b/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx index 4a255202ea5..73a9346096a 100644 --- a/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx +++ b/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx @@ -20,12 +20,14 @@ #include "PWGLF/DataModel/LFNucleiTables.h" #include "PWGLF/DataModel/LFParticleIdentification.h" +#include "PWGLF/Utils/inelGt.h" #include "Common/CCDB/EventSelectionParams.h" #include "Common/Core/TrackSelection.h" #include "Common/Core/TrackSelectionDefaults.h" #include "Common/DataModel/Centrality.h" #include "Common/DataModel/EventSelection.h" +#include "Common/DataModel/Multiplicity.h" #include "Common/DataModel/PIDResponseTOF.h" #include "Common/DataModel/TrackSelectionTables.h" @@ -118,7 +120,7 @@ struct LfTreeCreatorNuclei { (trackSelType.value == 2) || (trackSelType.value == 3); Filter DCAcutFilter = (nabs(aod::track::dcaXY) < cfgCutDCAxy) && (nabs(aod::track::dcaZ) < cfgCutDCAz); - using EventCandidates = soa::Join; + using EventCandidates = soa::Join; using TrackCandidates = soa::JoinGetXaxis()->SetBinLabel(2, "Skimmed events"); if (enableCentrality) { - histos.add("event/eventSelection", "eventSelection", HistType::kTH2D, {{8, -0.5, 7.5}, {binsPercentile, "Centrality FT0M"}}); + histos.add("event/eventSelection", "eventSelection", HistType::kTH2D, {{11, -0.5, 10.5}, {binsPercentile, "Centrality FT0M"}}); auto h2d = histos.get(HIST("event/eventSelection")); if (skimmingOptions.applySkimming) h2d->GetXaxis()->SetBinLabel(1, "Skimmed events"); @@ -511,8 +511,11 @@ struct LFNucleiBATask { h2d->GetXaxis()->SetBinLabel(6, "Sel8 cut"); h2d->GetXaxis()->SetBinLabel(7, "Z-vert Cut"); h2d->GetXaxis()->SetBinLabel(8, "Multiplicity cut"); + h2d->GetXaxis()->SetBinLabel(9, "INEL"); + h2d->GetXaxis()->SetBinLabel(10, "INEL > 0"); + h2d->GetXaxis()->SetBinLabel(11, "INEL > 1"); } else { - histos.add("event/eventSelection", "eventSelection", HistType::kTH1D, {{8, -0.5, 7.5}}); + histos.add("event/eventSelection", "eventSelection", HistType::kTH1D, {{11, -0.5, 10.5}}); auto h1d = histos.get(HIST("event/eventSelection")); if (skimmingOptions.applySkimming) h1d->GetXaxis()->SetBinLabel(1, "Skimmed events"); @@ -526,6 +529,9 @@ struct LFNucleiBATask { h1d->GetXaxis()->SetBinLabel(6, "Sel8 cut"); h1d->GetXaxis()->SetBinLabel(7, "Z-vert Cut"); h1d->GetXaxis()->SetBinLabel(8, "Multiplicity cut"); + h1d->GetXaxis()->SetBinLabel(9, "INEL"); + h1d->GetXaxis()->SetBinLabel(10, "INEL > 0"); + h1d->GetXaxis()->SetBinLabel(11, "INEL > 1"); } if (enableCentrality) @@ -2405,10 +2411,26 @@ struct LFNucleiBATask { if (enableCentrality && (centFT0M <= cfgMultCutLow || centFT0M > cfgMultCutHigh)) { return; } - if (enableCentrality) + if (enableCentrality) { histos.fill(HIST("event/eventSelection"), 7, centFT0M); - else + histos.fill(HIST("event/eventSelection"), 8, centFT0M); + } else { histos.fill(HIST("event/eventSelection"), 7); + histos.fill(HIST("event/eventSelection"), 8); + } + + if (event.isInelGt0()) { + if (enableCentrality) + histos.fill(HIST("event/eventSelection"), 9, centFT0M); + else + histos.fill(HIST("event/eventSelection"), 9); + } + if (event.isInelGt1()) { + if (enableCentrality) + histos.fill(HIST("event/eventSelection"), 10, centFT0M); + else + histos.fill(HIST("event/eventSelection"), 10); + } float gamma = 0., massTOF = 0., massTOFhe = 0., massTOFantihe = 0., heTPCmomentum = 0.f, antiheTPCmomentum = 0.f, heP = 0.f, antiheP = 0.f, hePt = 0.f, antihePt = 0.f, antiDPt = 0.f, DPt = 0.f; bool isTritonTPCpid = false; @@ -6090,7 +6112,7 @@ struct LFNucleiBATask { } } - using EventCandidates = soa::Join; + using EventCandidates = soa::Join; using EventCandidatesMC = soa::Join; using TrackCandidates0 = soa::Join Date: Mon, 1 Jun 2026 10:36:13 +0200 Subject: [PATCH 4/5] NucleiTask - Fix variables --- PWGLF/DataModel/LFNucleiTables.h | 22 +++++++++---------- .../Nuspex/LFTreeCreatorNuclei.cxx | 10 ++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/PWGLF/DataModel/LFNucleiTables.h b/PWGLF/DataModel/LFNucleiTables.h index 2caf11a5fb2..14b6504ff49 100644 --- a/PWGLF/DataModel/LFNucleiTables.h +++ b/PWGLF/DataModel/LFNucleiTables.h @@ -61,20 +61,20 @@ namespace full { DECLARE_SOA_INDEX_COLUMN(LfNuclEvent, lfNuclEvent); DECLARE_SOA_COLUMN(Pt, pt, float); -DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) -> float { return pt * cosh(eta); }); +DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) -> float { return pt * std::cosh(eta); }); DECLARE_SOA_COLUMN(Eta, eta, float); DECLARE_SOA_COLUMN(Sign, sign, int16_t); DECLARE_SOA_COLUMN(Phi, phi, float); DECLARE_SOA_COLUMN(IsPVContributor, isPVContributor, bool); DECLARE_SOA_DYNAMIC_COLUMN(Rapidity, rapidity, [](float pt, float eta, float mass) -> float { - const auto p = pt * cosh(eta); - const auto pz = pt * sinh(eta); - const auto energy = sqrt(p * p + mass * mass); - return 0.5f * log((energy + pz) / (energy - pz)); + const auto p = pt * std::cosh(eta); + const auto pz = pt * std::sinh(eta); + const auto energy = std::sqrt(p * p + mass * mass); + return 0.5f * std::log((energy + pz) / (energy - pz)); }); // ITS -DECLARE_SOA_COLUMN(ITSClusterSizes, itsClusterSizes, uint32_t); //! ITS cluster sizes per layer +DECLARE_SOA_COLUMN(ItsClusterSizes, itsClusterSizes, uint32_t); //! ITS cluster sizes per layer // TPC DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float); DECLARE_SOA_COLUMN(TPCNSigmaKa, tpcNSigmaKa, float); @@ -103,7 +103,7 @@ DECLARE_SOA_COLUMN(HasTOF, hasTOF, bool); DECLARE_SOA_COLUMN(HasTRD, hasTRD, bool); DECLARE_SOA_COLUMN(DcaXY, dcaXY, float); DECLARE_SOA_COLUMN(DcaZ, dcaZ, float); -DECLARE_SOA_COLUMN(TPCInnerParam, tpcInnerParam, float); +DECLARE_SOA_COLUMN(TpcInnerParam, tpcInnerParam, float); DECLARE_SOA_COLUMN(TOFExpMom, tofExpMom, float); DECLARE_SOA_COLUMN(TPCSignal, tpcSignal, float); DECLARE_SOA_COLUMN(Beta, beta, float); @@ -178,7 +178,7 @@ DECLARE_SOA_TABLE(LfCandNucleus, "AOD", "LFNUCL", full::IsEvTimeT0AC, full::HasTOF, full::HasTRD, - full::TPCInnerParam, + full::TpcInnerParam, full::Beta, full::PIDForTracking, full::TPCSignal, @@ -196,7 +196,7 @@ DECLARE_SOA_TABLE(LfCandNucleus, "AOD", "LFNUCL", full::IsPVContributor, full::P, full::Rapidity, - full::ITSClusterSizes, + full::ItsClusterSizes, track::TPCNClsFound, track::TPCNClsCrossedRows, track::TPCCrossedRowsOverFindableCls, @@ -211,7 +211,7 @@ DECLARE_SOA_TABLE_VERSIONED(LfCandNucleusDummy, "AOD", "LFNUCL", 1, full::IsEvTimeT0AC, full::HasTOF, full::HasTRD, - full::TPCInnerParam, + full::TpcInnerParam, full::Beta, full::PIDForTracking, full::TPCSignal, @@ -228,7 +228,7 @@ DECLARE_SOA_TABLE_VERSIONED(LfCandNucleusDummy, "AOD", "LFNUCL", 1, track::ITSClusterMap, full::IsPVContributor, full::P, - full::ITSClusterSizes, + full::ItsClusterSizes, dummy::TPCNSigmaPi, dummy::TPCNSigmaKa, dummy::TPCNSigmaPr, dummy::TPCNSigmaTr, dummy::TPCNSigmaAl, dummy::TOFNSigmaPi, dummy::TOFNSigmaKa, dummy::TOFNSigmaPr, diff --git a/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx b/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx index 73a9346096a..617d801ee64 100644 --- a/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx +++ b/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx @@ -94,7 +94,7 @@ struct LfTreeCreatorNuclei { Configurable cfgHighCutVertex{"cfgHighCutVertex", 10.0f, "Accepted z-vertex range"}; Configurable cfgLowCutVertex{"cfgLowCutVertex", -10.0f, "Accepted z-vertex range"}; Configurable useSel8{"useSel8", true, "Use Sel8 for run3 Event Selection"}; - Configurable TVXtrigger{"TVXtrigger", false, "Use TVX for Event Selection (default w/ Sel8)"}; + Configurable tvxTrigger{"tvxTrigger", false, "Use TVX for Event Selection (default w/ Sel8)"}; Configurable removeTFBorder{"removeTFBorder", false, "Remove TimeFrame border (default w/ Sel8)"}; Configurable removeITSROFBorder{"removeITSROFBorder", false, "Remove ITS Read-Out Frame border (default w/ Sel8)"}; @@ -149,7 +149,7 @@ struct LfTreeCreatorNuclei { if ((track.pt() < ptcutLow.value) || (track.pt() > ptcutHigh.value)) { continue; } - if ((TMath::Abs(track.tpcNSigmaDe()) > filterDeTPC.value) && (TMath::Abs(track.tpcNSigmaHe()) > filterHeTPC.value)) { + if ((std::abs(track.tpcNSigmaDe()) > filterDeTPC.value) && (std::abs(track.tpcNSigmaHe()) > filterHeTPC.value)) { continue; } out = kTRUE; @@ -233,7 +233,7 @@ struct LfTreeCreatorNuclei { if ((track.pt() < ptcutLow.value) || (track.pt() > ptcutHigh.value)) { continue; } - if ((TMath::Abs(track.tpcNSigmaDe()) > filterDeTPC.value) && (TMath::Abs(track.tpcNSigmaHe()) > filterHeTPC.value)) { + if ((std::abs(track.tpcNSigmaDe()) > filterDeTPC.value) && (std::abs(track.tpcNSigmaHe()) > filterHeTPC.value)) { continue; } } @@ -313,7 +313,7 @@ struct LfTreeCreatorNuclei { hEvents.fill(HIST("eventSelection"), 0); if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) { - if (TVXtrigger) + if (tvxTrigger) continue; } else { hEvents.fill(HIST("eventSelection"), 1); @@ -371,7 +371,7 @@ struct LfTreeCreatorNuclei { hEvents.fill(HIST("eventSelection"), 0); if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) { - if (TVXtrigger) + if (tvxTrigger) continue; } else { hEvents.fill(HIST("eventSelection"), 1); From 8f94641342f170e0db0be41420ff370a1fe4d75f Mon Sep 17 00:00:00 2001 From: Giovanni Malfattore Date: Mon, 1 Jun 2026 11:02:46 +0200 Subject: [PATCH 5/5] NucleiTask - Fix variables --- PWGLF/DataModel/LFNucleiTables.h | 142 +++++++++--------- .../Nuspex/LFTreeCreatorNuclei.cxx | 6 +- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/PWGLF/DataModel/LFNucleiTables.h b/PWGLF/DataModel/LFNucleiTables.h index 14b6504ff49..28345e245b9 100644 --- a/PWGLF/DataModel/LFNucleiTables.h +++ b/PWGLF/DataModel/LFNucleiTables.h @@ -76,27 +76,27 @@ DECLARE_SOA_DYNAMIC_COLUMN(Rapidity, rapidity, // ITS DECLARE_SOA_COLUMN(ItsClusterSizes, itsClusterSizes, uint32_t); //! ITS cluster sizes per layer // TPC -DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float); -DECLARE_SOA_COLUMN(TPCNSigmaKa, tpcNSigmaKa, float); -DECLARE_SOA_COLUMN(TPCNSigmaPr, tpcNSigmaPr, float); -DECLARE_SOA_COLUMN(TPCNSigmaDe, tpcNSigmaDe, float); -DECLARE_SOA_COLUMN(TPCNSigmaTr, tpcNSigmaTr, float); -DECLARE_SOA_COLUMN(TPCNSigmaHe, tpcNSigmaHe, float); -DECLARE_SOA_COLUMN(TPCNSigmaAl, tpcNSigmaAl, float); +DECLARE_SOA_COLUMN(TpcNSigmaPi, tpcNSigmaPi, float); +DECLARE_SOA_COLUMN(TpcNSigmaKa, tpcNSigmaKa, float); +DECLARE_SOA_COLUMN(TpcNSigmaPr, tpcNSigmaPr, float); +DECLARE_SOA_COLUMN(TpcNSigmaDe, tpcNSigmaDe, float); +DECLARE_SOA_COLUMN(TpcNSigmaTr, tpcNSigmaTr, float); +DECLARE_SOA_COLUMN(TpcNSigmaHe, tpcNSigmaHe, float); +DECLARE_SOA_COLUMN(TpcNSigmaAl, tpcNSigmaAl, float); // TOF -DECLARE_SOA_COLUMN(TOFNSigmaPi, tofNSigmaPi, float); -DECLARE_SOA_COLUMN(TOFNSigmaKa, tofNSigmaKa, float); -DECLARE_SOA_COLUMN(TOFNSigmaPr, tofNSigmaPr, float); -DECLARE_SOA_COLUMN(TOFNSigmaDe, tofNSigmaDe, float); -DECLARE_SOA_COLUMN(TOFNSigmaTr, tofNSigmaTr, float); -DECLARE_SOA_COLUMN(TOFNSigmaHe, tofNSigmaHe, float); -DECLARE_SOA_COLUMN(TOFNSigmaAl, tofNSigmaAl, float); -DECLARE_SOA_COLUMN(TPCExpSignalDiffPr, tpcExpSignalDiffPr, float); -DECLARE_SOA_COLUMN(TPCExpSignalDiffDe, tpcExpSignalDiffDe, float); -DECLARE_SOA_COLUMN(TPCExpSignalDiffHe, tpcExpSignalDiffHe, float); -DECLARE_SOA_COLUMN(TOFExpSignalDiffPr, tofExpSignalDiffPr, float); -DECLARE_SOA_COLUMN(TOFExpSignalDiffDe, tofExpSignalDiffDe, float); -DECLARE_SOA_COLUMN(TOFExpSignalDiffHe, tofExpSignalDiffHe, float); +DECLARE_SOA_COLUMN(TofNSigmaPi, tofNSigmaPi, float); +DECLARE_SOA_COLUMN(TofNSigmaKa, tofNSigmaKa, float); +DECLARE_SOA_COLUMN(TofNSigmaPr, tofNSigmaPr, float); +DECLARE_SOA_COLUMN(TofNSigmaDe, tofNSigmaDe, float); +DECLARE_SOA_COLUMN(TofNSigmaTr, tofNSigmaTr, float); +DECLARE_SOA_COLUMN(TofNSigmaHe, tofNSigmaHe, float); +DECLARE_SOA_COLUMN(TofNSigmaAl, tofNSigmaAl, float); +DECLARE_SOA_COLUMN(TpcExpSignalDiffPr, tpcExpSignalDiffPr, float); +DECLARE_SOA_COLUMN(TpcExpSignalDiffDe, tpcExpSignalDiffDe, float); +DECLARE_SOA_COLUMN(TpcExpSignalDiffHe, tpcExpSignalDiffHe, float); +DECLARE_SOA_COLUMN(TofExpSignalDiffPr, tofExpSignalDiffPr, float); +DECLARE_SOA_COLUMN(TofExpSignalDiffDe, tofExpSignalDiffDe, float); +DECLARE_SOA_COLUMN(TofExpSignalDiffHe, tofExpSignalDiffHe, float); DECLARE_SOA_COLUMN(IsEvTimeTOF, isEvTimeTOF, bool); DECLARE_SOA_COLUMN(IsEvTimeT0AC, isEvTimeT0AC, bool); DECLARE_SOA_COLUMN(HasTOF, hasTOF, bool); @@ -104,14 +104,14 @@ DECLARE_SOA_COLUMN(HasTRD, hasTRD, bool); DECLARE_SOA_COLUMN(DcaXY, dcaXY, float); DECLARE_SOA_COLUMN(DcaZ, dcaZ, float); DECLARE_SOA_COLUMN(TpcInnerParam, tpcInnerParam, float); -DECLARE_SOA_COLUMN(TOFExpMom, tofExpMom, float); -DECLARE_SOA_COLUMN(TPCSignal, tpcSignal, float); +DECLARE_SOA_COLUMN(TofExpMom, tofExpMom, float); +DECLARE_SOA_COLUMN(TpcSignal, tpcSignal, float); DECLARE_SOA_COLUMN(Beta, beta, float); // TPC and ITS QA -DECLARE_SOA_COLUMN(PIDForTracking, pidForTracking, uint8_t); -DECLARE_SOA_COLUMN(ITSNCls, itsNCls, int16_t); -DECLARE_SOA_COLUMN(TPCChi2Ncl, tpcChi2NCl, float); -DECLARE_SOA_COLUMN(ITSChi2NCl, itsChi2NCl, float); +DECLARE_SOA_COLUMN(PidForTracking, pidForTracking, uint8_t); +DECLARE_SOA_COLUMN(ItsNCls, itsNCls, int16_t); +DECLARE_SOA_COLUMN(TpcChi2Ncl, tpcChi2NCl, float); +DECLARE_SOA_COLUMN(ItsChi2NCl, itsChi2NCl, float); DECLARE_SOA_COLUMN(TpcPassed, tpcPassed, bool); DECLARE_SOA_COLUMN(ItsPassed, itsPassed, bool); DECLARE_SOA_COLUMN(FakeHitsFlag, fakeHitsFlag, bool); @@ -124,39 +124,39 @@ DECLARE_SOA_COLUMN(GetProcess, getProcess, int); } // namespace full namespace dummy { -DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaPi, tpcNSigmaPi, +DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaPi, tpcNSigmaPi, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaKa, tpcNSigmaKa, +DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaKa, tpcNSigmaKa, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaPr, tpcNSigmaPr, +DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaPr, tpcNSigmaPr, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaTr, tpcNSigmaTr, +DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaTr, tpcNSigmaTr, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TPCNSigmaAl, tpcNSigmaAl, +DECLARE_SOA_DYNAMIC_COLUMN(TpcNSigmaAl, tpcNSigmaAl, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaPi, tofNSigmaPi, +DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaPi, tofNSigmaPi, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaKa, tofNSigmaKa, +DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaKa, tofNSigmaKa, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaPr, tofNSigmaPr, +DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaPr, tofNSigmaPr, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaTr, tofNSigmaTr, +DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaTr, tofNSigmaTr, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TOFNSigmaAl, tofNSigmaAl, +DECLARE_SOA_DYNAMIC_COLUMN(TofNSigmaAl, tofNSigmaAl, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TPCExpSignalDiffPr, tpcExpSignalDiffPr, +DECLARE_SOA_DYNAMIC_COLUMN(TpcExpSignalDiffPr, tpcExpSignalDiffPr, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TPCExpSignalDiffDe, tpcExpSignalDiffDe, +DECLARE_SOA_DYNAMIC_COLUMN(TpcExpSignalDiffDe, tpcExpSignalDiffDe, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TPCExpSignalDiffHe, tpcExpSignalDiffHe, +DECLARE_SOA_DYNAMIC_COLUMN(TpcExpSignalDiffHe, tpcExpSignalDiffHe, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TOFExpSignalDiffPr, tofExpSignalDiffPr, +DECLARE_SOA_DYNAMIC_COLUMN(TofExpSignalDiffPr, tofExpSignalDiffPr, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TOFExpSignalDiffDe, tofExpSignalDiffDe, +DECLARE_SOA_DYNAMIC_COLUMN(TofExpSignalDiffDe, tofExpSignalDiffDe, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TOFExpSignalDiffHe, tofExpSignalDiffHe, +DECLARE_SOA_DYNAMIC_COLUMN(TofExpSignalDiffHe, tofExpSignalDiffHe, [](bool /*b*/) -> float { return 0.f; }); -DECLARE_SOA_DYNAMIC_COLUMN(TOFExpMom, tofExpMom, +DECLARE_SOA_DYNAMIC_COLUMN(TofExpMom, tofExpMom, [](bool /*b*/) -> float { return 0.f; }); } // namespace dummy @@ -172,26 +172,26 @@ DECLARE_SOA_TABLE(LfCandNucleus, "AOD", "LFNUCL", o2::soa::Index<>, full::LfNuclEventId, full::DcaXY, full::DcaZ, - full::TPCNSigmaDe, full::TPCNSigmaHe, - full::TOFNSigmaDe, full::TOFNSigmaHe, + full::TpcNSigmaDe, full::TpcNSigmaHe, + full::TofNSigmaDe, full::TofNSigmaHe, full::IsEvTimeTOF, full::IsEvTimeT0AC, full::HasTOF, full::HasTRD, full::TpcInnerParam, full::Beta, - full::PIDForTracking, - full::TPCSignal, + full::PidForTracking, + full::TpcSignal, full::Pt, full::Eta, full::Phi, full::Sign, - full::ITSNCls, + full::ItsNCls, track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusCrossedRows, - full::TPCChi2Ncl, - full::ITSChi2NCl, + full::TpcChi2Ncl, + full::ItsChi2NCl, track::ITSClusterMap, full::IsPVContributor, full::P, @@ -205,37 +205,37 @@ DECLARE_SOA_TABLE_VERSIONED(LfCandNucleusDummy, "AOD", "LFNUCL", 1, o2::soa::Index<>, full::LfNuclEventId, full::DcaXY, full::DcaZ, - full::TPCNSigmaDe, full::TPCNSigmaHe, - full::TOFNSigmaDe, full::TOFNSigmaHe, + full::TpcNSigmaDe, full::TpcNSigmaHe, + full::TofNSigmaDe, full::TofNSigmaHe, full::IsEvTimeTOF, full::IsEvTimeT0AC, full::HasTOF, full::HasTRD, full::TpcInnerParam, full::Beta, - full::PIDForTracking, - full::TPCSignal, + full::PidForTracking, + full::TpcSignal, full::Pt, full::Eta, full::Phi, full::Sign, - full::ITSNCls, + full::ItsNCls, track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusCrossedRows, - full::TPCChi2Ncl, - full::ITSChi2NCl, + full::TpcChi2Ncl, + full::ItsChi2NCl, track::ITSClusterMap, full::IsPVContributor, full::P, full::ItsClusterSizes, - dummy::TPCNSigmaPi, dummy::TPCNSigmaKa, dummy::TPCNSigmaPr, - dummy::TPCNSigmaTr, dummy::TPCNSigmaAl, - dummy::TOFNSigmaPi, dummy::TOFNSigmaKa, dummy::TOFNSigmaPr, - dummy::TOFNSigmaTr, dummy::TOFNSigmaAl, - dummy::TPCExpSignalDiffPr, dummy::TPCExpSignalDiffDe, dummy::TPCExpSignalDiffHe, - dummy::TOFExpSignalDiffPr, dummy::TOFExpSignalDiffDe, dummy::TOFExpSignalDiffHe, - dummy::TOFExpMom, + dummy::TpcNSigmaPi, dummy::TpcNSigmaKa, dummy::TpcNSigmaPr, + dummy::TpcNSigmaTr, dummy::TpcNSigmaAl, + dummy::TofNSigmaPi, dummy::TofNSigmaKa, dummy::TofNSigmaPr, + dummy::TofNSigmaTr, dummy::TofNSigmaAl, + dummy::TpcExpSignalDiffPr, dummy::TpcExpSignalDiffDe, dummy::TpcExpSignalDiffHe, + dummy::TofExpSignalDiffPr, dummy::TofExpSignalDiffDe, dummy::TofExpSignalDiffHe, + dummy::TofExpMom, full::Rapidity, track::TPCNClsFound, track::TPCNClsCrossedRows, @@ -243,13 +243,13 @@ DECLARE_SOA_TABLE_VERSIONED(LfCandNucleusDummy, "AOD", "LFNUCL", 1, track::TPCFoundOverFindableCls); DECLARE_SOA_TABLE(LfCandNucleusExtra, "AOD", "LFNUCLEXTRA", - full::TPCNSigmaPi, full::TPCNSigmaKa, full::TPCNSigmaPr, - full::TPCNSigmaTr, full::TPCNSigmaAl, - full::TOFNSigmaPi, full::TOFNSigmaKa, full::TOFNSigmaPr, - full::TOFNSigmaTr, full::TOFNSigmaAl, - full::TPCExpSignalDiffPr, full::TPCExpSignalDiffDe, full::TPCExpSignalDiffHe, - full::TOFExpSignalDiffPr, full::TOFExpSignalDiffDe, full::TOFExpSignalDiffHe, - full::TOFExpMom); + full::TpcNSigmaPi, full::TpcNSigmaKa, full::TpcNSigmaPr, + full::TpcNSigmaTr, full::TpcNSigmaAl, + full::TofNSigmaPi, full::TofNSigmaKa, full::TofNSigmaPr, + full::TofNSigmaTr, full::TofNSigmaAl, + full::TpcExpSignalDiffPr, full::TpcExpSignalDiffDe, full::TpcExpSignalDiffHe, + full::TofExpSignalDiffPr, full::TofExpSignalDiffDe, full::TofExpSignalDiffHe, + full::TofExpMom); DECLARE_SOA_TABLE(LfCandNucleusMC, "AOD", "LFNUCLMC", mcparticle::PdgCode, diff --git a/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx b/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx index 617d801ee64..fed51cd8539 100644 --- a/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx +++ b/PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx @@ -94,7 +94,7 @@ struct LfTreeCreatorNuclei { Configurable cfgHighCutVertex{"cfgHighCutVertex", 10.0f, "Accepted z-vertex range"}; Configurable cfgLowCutVertex{"cfgLowCutVertex", -10.0f, "Accepted z-vertex range"}; Configurable useSel8{"useSel8", true, "Use Sel8 for run3 Event Selection"}; - Configurable tvxTrigger{"tvxTrigger", false, "Use TVX for Event Selection (default w/ Sel8)"}; + Configurable Tttrigger{"Tttrigger", false, "Use TVX for Event Selection (default w/ Sel8)"}; Configurable removeTFBorder{"removeTFBorder", false, "Remove TimeFrame border (default w/ Sel8)"}; Configurable removeITSROFBorder{"removeITSROFBorder", false, "Remove ITS Read-Out Frame border (default w/ Sel8)"}; @@ -313,7 +313,7 @@ struct LfTreeCreatorNuclei { hEvents.fill(HIST("eventSelection"), 0); if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) { - if (tvxTrigger) + if (Tttrigger) continue; } else { hEvents.fill(HIST("eventSelection"), 1); @@ -371,7 +371,7 @@ struct LfTreeCreatorNuclei { hEvents.fill(HIST("eventSelection"), 0); if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) { - if (tvxTrigger) + if (Tttrigger) continue; } else { hEvents.fill(HIST("eventSelection"), 1);