diff --git a/PWGLF/DataModel/LFLithium4Tables.h b/PWGLF/DataModel/LFLithium4Tables.h deleted file mode 100644 index 99700e76ea0..00000000000 --- a/PWGLF/DataModel/LFLithium4Tables.h +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright 2019-2020 CERN and copyright holders of ALICE O2. -// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. -// All rights not expressly granted are reserved. -// -// This software is distributed under the terms of the GNU General Public -// License v3 (GPL Version 3), copied verbatim in the file "COPYING". -// -// In applying this license CERN does not waive the privileges and immunities -// granted to it by virtue of its status as an Intergovernmental Organization -// or submit itself to any jurisdiction. - -/// -/// \file LFLithium4Tables.h -/// \brief Slim tables for Lithium4 -/// - -#ifndef PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_ -#define PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_ - -#include - -#include - -namespace o2::aod -{ -namespace Lithium4TablesNS -{ - -DECLARE_SOA_COLUMN(PtHe3, ptHe3, float); -DECLARE_SOA_COLUMN(EtaHe3, etaHe3, float); -DECLARE_SOA_COLUMN(PhiHe3, phiHe3, float); -DECLARE_SOA_COLUMN(PtPr, ptPr, float); -DECLARE_SOA_COLUMN(EtaPr, etaPr, float); -DECLARE_SOA_COLUMN(PhiPr, phiPr, float); - -DECLARE_SOA_COLUMN(DCAxyHe3, dcaxyHe3, float); -DECLARE_SOA_COLUMN(DCAzHe3, dcazHe3, float); -DECLARE_SOA_COLUMN(DCAxyPr, dcaxyPr, float); -DECLARE_SOA_COLUMN(DCAzPr, dcazPr, float); - -DECLARE_SOA_COLUMN(SignalTPCHe3, signalTPCHe3, float); -DECLARE_SOA_COLUMN(InnerParamTPCHe3, innerParamTPCHe3, float); -DECLARE_SOA_COLUMN(SignalTPCPr, signalTPCPr, float); -DECLARE_SOA_COLUMN(InnerParamTPCPr, innerParamTPCPr, float); -DECLARE_SOA_COLUMN(NClsTPCHe3, nClsTPCHe3, uint8_t); -DECLARE_SOA_COLUMN(NSigmaTPCHe3, nSigmaTPCHe3, float); -DECLARE_SOA_COLUMN(NSigmaTPCPr, nSigmaTOFPr, float); -DECLARE_SOA_COLUMN(Chi2TPCHe3, chi2TPCHe3, float); -DECLARE_SOA_COLUMN(Chi2TPCPr, chi2TPCPr, float); -DECLARE_SOA_COLUMN(MassTOFHe3, massTOFHe3, float); -DECLARE_SOA_COLUMN(MassTOFPr, massTOFPr, float); -DECLARE_SOA_COLUMN(PIDtrkHe3, pidTrkHe3, uint32_t); -DECLARE_SOA_COLUMN(PIDtrkPr, pidTrkPr, uint32_t); - -DECLARE_SOA_COLUMN(ItsClusterSizeHe3, itsClusterSizeHe3, uint32_t); -DECLARE_SOA_COLUMN(ItsClusterSizePr, itsClusterSizePr, uint32_t); - -DECLARE_SOA_COLUMN(SharedClustersHe3, sharedClustersHe3, uint8_t); -DECLARE_SOA_COLUMN(SharedClustersPr, sharedClustersPr, uint8_t); - -DECLARE_SOA_COLUMN(IsBkgLS, isBkgLS, bool); -DECLARE_SOA_COLUMN(IsBkgEM, isBkgEM, bool); - -DECLARE_SOA_COLUMN(PtMCHe3, ptMCHe3, float); -DECLARE_SOA_COLUMN(EtaMCHe3, etaMCHe3, float); -DECLARE_SOA_COLUMN(PhiMCHe3, phiMCHe3, float); -DECLARE_SOA_COLUMN(PtMCPr, ptMCPr, float); -DECLARE_SOA_COLUMN(EtaMCPr, etaMCPr, float); -DECLARE_SOA_COLUMN(PhiMCPr, phiMCPr, float); -DECLARE_SOA_COLUMN(SignedPtMC, signedPtMC, float); -DECLARE_SOA_COLUMN(MassMC, massMC, float); - -DECLARE_SOA_COLUMN(Multiplicity, multiplicity, uint16_t); -DECLARE_SOA_COLUMN(CentralityFT0C, centFT0C, float); -DECLARE_SOA_COLUMN(MultiplicityFT0C, multiplicityFT0C, float); - -} // namespace Lithium4TablesNS - -DECLARE_SOA_TABLE(Lithium4Table, "AOD", "LITHIUM4TABLE", - Lithium4TablesNS::PtHe3, - Lithium4TablesNS::EtaHe3, - Lithium4TablesNS::PhiHe3, - Lithium4TablesNS::PtPr, - Lithium4TablesNS::EtaPr, - Lithium4TablesNS::PhiPr, - Lithium4TablesNS::DCAxyHe3, - Lithium4TablesNS::DCAzHe3, - Lithium4TablesNS::DCAxyPr, - Lithium4TablesNS::DCAzPr, - Lithium4TablesNS::SignalTPCHe3, - Lithium4TablesNS::InnerParamTPCHe3, - Lithium4TablesNS::SignalTPCPr, - Lithium4TablesNS::InnerParamTPCPr, - Lithium4TablesNS::NClsTPCHe3, - Lithium4TablesNS::NSigmaTPCHe3, - Lithium4TablesNS::NSigmaTPCPr, - Lithium4TablesNS::Chi2TPCHe3, - Lithium4TablesNS::Chi2TPCPr, - Lithium4TablesNS::MassTOFHe3, - Lithium4TablesNS::MassTOFPr, - Lithium4TablesNS::PIDtrkHe3, - Lithium4TablesNS::PIDtrkPr, - Lithium4TablesNS::ItsClusterSizeHe3, - Lithium4TablesNS::ItsClusterSizePr, - Lithium4TablesNS::SharedClustersHe3, - Lithium4TablesNS::SharedClustersPr, - Lithium4TablesNS::IsBkgLS, - Lithium4TablesNS::IsBkgEM) -DECLARE_SOA_TABLE(Lithium4TableMC, "AOD", "LITHIUM4TABLEMC", - Lithium4TablesNS::PtMCHe3, - Lithium4TablesNS::EtaMCHe3, - Lithium4TablesNS::PhiMCHe3, - Lithium4TablesNS::PtMCPr, - Lithium4TablesNS::EtaMCPr, - Lithium4TablesNS::PhiMCPr, - Lithium4TablesNS::SignedPtMC, - Lithium4TablesNS::MassMC) -DECLARE_SOA_TABLE(Lithium4Mult, "AOD", "LITHIUM4MULT", - Lithium4TablesNS::Multiplicity, - Lithium4TablesNS::CentralityFT0C, - Lithium4TablesNS::MultiplicityFT0C) - -} // namespace o2::aod - -#endif // PWGLF_DATAMODEL_LFLITHIUM4TABLES_H_ diff --git a/PWGLF/DataModel/LFhe3HadronTables.h b/PWGLF/DataModel/LFhe3HadronTables.h index 719776fabde..a31b806b0d3 100644 --- a/PWGLF/DataModel/LFhe3HadronTables.h +++ b/PWGLF/DataModel/LFhe3HadronTables.h @@ -37,7 +37,6 @@ DECLARE_SOA_COLUMN(DCAxyHe3, dcaxyHe3, float); DECLARE_SOA_COLUMN(DCAzHe3, dcazHe3, float); DECLARE_SOA_COLUMN(DCAxyHad, dcaxyHad, float); DECLARE_SOA_COLUMN(DCAzHad, dcazHad, float); -DECLARE_SOA_COLUMN(DCApair, dcapair, float); DECLARE_SOA_COLUMN(SignalTPCHe3, signalTPCHe3, float); DECLARE_SOA_COLUMN(InnerParamTPCHe3, innerParamTPCHe3, float); @@ -45,9 +44,11 @@ DECLARE_SOA_COLUMN(SignalTPCHad, signalTPCHad, float); DECLARE_SOA_COLUMN(InnerParamTPCHad, innerParamTPCHad, float); DECLARE_SOA_COLUMN(NClsTPCHe3, nClsTPCHe3, uint8_t); DECLARE_SOA_COLUMN(NSigmaTPCHe3, nSigmaTPCHe3, float); +DECLARE_SOA_COLUMN(NSigmaTPCHad, nSigmaTPCHad, float); DECLARE_SOA_COLUMN(NSigmaTPCHadPi, nSigmaTPCHadPi, float); DECLARE_SOA_COLUMN(NSigmaTPCHadKa, nSigmaTPCHadKa, float); DECLARE_SOA_COLUMN(NSigmaTPCHadPr, nSigmaTPCHadPr, float); +DECLARE_SOA_COLUMN(NSigmaTOFHad, nSigmaTOFHad, float); DECLARE_SOA_COLUMN(NSigmaTOFHadPi, nSigmaTOFHadPi, float); DECLARE_SOA_COLUMN(NSigmaTOFHadKa, nSigmaTOFHadKa, float); DECLARE_SOA_COLUMN(NSigmaTOFHadPr, nSigmaTOFHadPr, float); @@ -104,29 +105,21 @@ DECLARE_SOA_TABLE(he3HadronTable, "AOD", "HE3HADTABLE", he3HadronTablesNS::DCAzHe3, he3HadronTablesNS::DCAxyHad, he3HadronTablesNS::DCAzHad, - he3HadronTablesNS::DCApair, he3HadronTablesNS::SignalTPCHe3, he3HadronTablesNS::InnerParamTPCHe3, he3HadronTablesNS::SignalTPCHad, he3HadronTablesNS::InnerParamTPCHad, he3HadronTablesNS::NClsTPCHe3, he3HadronTablesNS::NSigmaTPCHe3, - he3HadronTablesNS::NSigmaTPCHadPi, - he3HadronTablesNS::NSigmaTPCHadKa, - he3HadronTablesNS::NSigmaTPCHadPr, - he3HadronTablesNS::NSigmaTOFHadPi, - he3HadronTablesNS::NSigmaTOFHadKa, - he3HadronTablesNS::NSigmaTOFHadPr, + he3HadronTablesNS::NSigmaTPCHad, + he3HadronTablesNS::NSigmaTOFHad, he3HadronTablesNS::Chi2TPCHe3, he3HadronTablesNS::Chi2TPCHad, - he3HadronTablesNS::MassTOFHe3, he3HadronTablesNS::MassTOFHad, he3HadronTablesNS::PIDtrkHe3, - he3HadronTablesNS::PIDtrkHad, he3HadronTablesNS::ItsClusterSizeHe3, he3HadronTablesNS::ItsClusterSizeHad, - he3HadronTablesNS::SharedClustersHe3, - he3HadronTablesNS::SharedClustersHad) + he3HadronTablesNS::SharedClustersHe3) DECLARE_SOA_TABLE(he3HadronTableMC, "AOD", "HE3HADTABLEMC", he3HadronTablesNS::PtMCHe3, he3HadronTablesNS::EtaMCHe3, @@ -145,7 +138,17 @@ DECLARE_SOA_TABLE(he3HadronMult, "AOD", "HE3HADMULT", he3HadronTablesNS::MultiplicityFT0C) DECLARE_SOA_TABLE(he3HadronQa, "AOD", "HE3HADQA", he3HadronTablesNS::TrackIDHe3, - he3HadronTablesNS::TrackIDHad) + he3HadronTablesNS::TrackIDHad, + he3HadronTablesNS::MassTOFHe3, + he3HadronTablesNS::PIDtrkHad, + he3HadronTablesNS::SharedClustersHad) +DECLARE_SOA_TABLE(he3HadronPid, "AOD", "HE3HADPID", + he3HadronTablesNS::NSigmaTPCHadPi, + he3HadronTablesNS::NSigmaTPCHadKa, + he3HadronTablesNS::NSigmaTPCHadPr, + he3HadronTablesNS::NSigmaTOFHadPi, + he3HadronTablesNS::NSigmaTOFHadKa, + he3HadronTablesNS::NSigmaTOFHadPr) } // namespace o2::aod diff --git a/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx b/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx index db8eced7bda..cd5851d8272 100644 --- a/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx +++ b/PWGLF/TableProducer/Nuspex/he3HadronFemto.cxx @@ -192,9 +192,11 @@ struct He3HadCandidate { float chi2TPCHe3 = -10.f; float chi2TPCHad = -10.f; float nSigmaHe3 = -10.f; + float nSigmaTPCHad = -10.f; float nSigmaTPCHadPi = -10.f; float nSigmaTPCHadKa = -10.f; float nSigmaTPCHadPr = -10.f; + float nSigmaTOFHad = -10.f; float nSigmaTOFHadPi = -10.f; float nSigmaTOFHadKa = -10.f; float nSigmaTOFHadPr = -10.f; @@ -239,6 +241,7 @@ struct he3HadronFemto { Produces outputMcTable; Produces outputMultiplicityTable; Produces outputQaTable; + Produces outputPidTable; // Selections Configurable settingHadPDGCode{"settingHadPDGCode", 211, "Hadron - PDG code"}; @@ -755,9 +758,11 @@ struct he3HadronFemto { he3Hadcand.nTPCClustersHe3 = trackHe3.tpcNClsFound(); he3Hadcand.nSigmaHe3 = computeNSigmaHe3(trackHe3); + he3Hadcand.nSigmaTPCHad = computeTPCNSigmaHadron(trackHad); he3Hadcand.nSigmaTPCHadPi = trackHad.tpcNSigmaPi(); he3Hadcand.nSigmaTPCHadKa = trackHad.tpcNSigmaKa(); he3Hadcand.nSigmaTPCHadPr = trackHad.tpcNSigmaPr(); + he3Hadcand.nSigmaTOFHad = computeTOFNSigmaHadron(trackHad); he3Hadcand.nSigmaTOFHadPi = trackHad.tofNSigmaPi(); he3Hadcand.nSigmaTOFHadKa = trackHad.tofNSigmaKa(); he3Hadcand.nSigmaTOFHadPr = trackHad.tofNSigmaPr(); @@ -906,29 +911,21 @@ struct he3HadronFemto { he3Hadcand.dcazHe3, he3Hadcand.dcaxyHad, he3Hadcand.dcazHad, - he3Hadcand.dcaPair, he3Hadcand.tpcSignalHe3, he3Hadcand.momHe3TPC, he3Hadcand.tpcSignalHad, he3Hadcand.momHadTPC, he3Hadcand.nTPCClustersHe3, he3Hadcand.nSigmaHe3, - he3Hadcand.nSigmaTPCHadPi, - he3Hadcand.nSigmaTPCHadKa, - he3Hadcand.nSigmaTPCHadPr, - he3Hadcand.nSigmaTOFHadPi, - he3Hadcand.nSigmaTOFHadKa, - he3Hadcand.nSigmaTOFHadPr, + he3Hadcand.nSigmaTPCHad, + he3Hadcand.nSigmaTOFHad, he3Hadcand.chi2TPCHe3, he3Hadcand.chi2TPCHad, - he3Hadcand.massTOFHe3, he3Hadcand.massTOFHad, he3Hadcand.pidtrkHe3, - he3Hadcand.pidtrkHad, he3Hadcand.itsClSizeHe3, he3Hadcand.itsClSizeHad, - he3Hadcand.sharedClustersHe3, - he3Hadcand.sharedClustersHad); + he3Hadcand.sharedClustersHe3); if (isMC) { outputMcTable( he3Hadcand.momHe3MC, @@ -941,19 +938,25 @@ struct he3HadronFemto { he3Hadcand.l4MassMC, he3Hadcand.flags); } - if (settingFillMultiplicity) { - outputMultiplicityTable( - collision.globalIndex(), - collision.posZ(), - collision.numContrib(), - collision.centFT0C(), - collision.multFT0C()); - } - if (settingFillQa) { - outputQaTable( - he3Hadcand.trackIDHe3, - he3Hadcand.trackIDHad); - } + outputMultiplicityTable( + collision.globalIndex(), + collision.posZ(), + collision.numContrib(), + collision.centFT0C(), + collision.multFT0C()); + outputQaTable( + he3Hadcand.trackIDHe3, + he3Hadcand.trackIDHad, + he3Hadcand.massTOFHe3, + he3Hadcand.pidtrkHad, + he3Hadcand.sharedClustersHad); + outputPidTable( + he3Hadcand.nSigmaTPCHadPi, + he3Hadcand.nSigmaTPCHadKa, + he3Hadcand.nSigmaTPCHadPr, + he3Hadcand.nSigmaTOFHadPi, + he3Hadcand.nSigmaTOFHadKa, + he3Hadcand.nSigmaTOFHadPr); } void fillHistograms(const He3HadCandidate& he3Hadcand, bool isMc = false)