Skip to content

Commit 7f70e49

Browse files
vkuceravkucera
committed
Move cascade DecayType. Move aliases.
1 parent a1e3332 commit 7f70e49

File tree

3 files changed

+68
-118
lines changed

3 files changed

+68
-118
lines changed

‎PWGHF/DataModel/AliasTables.h‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
12+
/// \file CandidateReconstructionTables.h
13+
/// \brief Definitions of tables produced by candidate reconstruction workflows
14+
///
15+
/// \author Gian Michele Innocenti <gian.michele.innocenti@cern.ch>, CERN
16+
/// \author Vít Kučera <vit.kucera@cern.ch>, CERN
17+
18+
#ifndef PWGHF_DATAMODEL_ALIASTABLES_H_
19+
#define PWGHF_DATAMODEL_ALIASTABLES_H_
20+
21+
#include <Framework/AnalysisDataModel.h>
22+
23+
namespace o2::aod
24+
{
25+
// Table aliases
26+
using BcFullInfos = soa::Join<aod::BCsWithTimestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
27+
28+
using TracksWCov = soa::Join<Tracks, TracksCov>;
29+
using TracksWDca = soa::Join<Tracks, TracksDCA>;
30+
using TracksWExtra = soa::Join<Tracks, TracksExtra>;
31+
using TracksWCovDca = soa::Join<Tracks, TracksCov, TracksDCA>;
32+
using TracksWCovExtra = soa::Join<Tracks, TracksCov, TracksExtra>;
33+
using TracksWDcaExtra = soa::Join<Tracks, TracksDCA, TracksExtra>;
34+
using TracksWCovDcaExtra = soa::Join<Tracks, TracksCov, TracksDCA, TracksExtra>;
35+
36+
using TracksWMc = soa::Join<Tracks, McTrackLabels>;
37+
38+
using TracksPidEl = soa::Join<aod::pidTPCFullEl, aod::pidTOFFullEl>;
39+
using TracksPidMu = soa::Join<aod::pidTPCFullMu, aod::pidTOFFullMu>;
40+
using TracksPidPi = soa::Join<aod::pidTPCFullPi, aod::pidTOFFullPi>;
41+
using TracksPidKa = soa::Join<aod::pidTPCFullKa, aod::pidTOFFullKa>;
42+
using TracksPidPr = soa::Join<aod::pidTPCFullPr, aod::pidTOFFullPr>;
43+
44+
using TracksPidTinyEl = soa::Join<aod::pidTPCEl, aod::pidTOFEl>;
45+
using TracksPidTinyMu = soa::Join<aod::pidTPCMu, aod::pidTOFMu>;
46+
using TracksPidTinyPi = soa::Join<aod::pidTPCPi, aod::pidTOFPi>;
47+
using TracksPidTinyKa = soa::Join<aod::pidTPCKa, aod::pidTOFKa>;
48+
using TracksPidTinyPr = soa::Join<aod::pidTPCPr, aod::pidTOFPr>;
49+
50+
} // namespace o2::aod
51+
52+
#endif // PWGHF_DATAMODEL_ALIASTABLES_H_

‎PWGHF/DataModel/CandidateReconstructionTables.h‎

Lines changed: 1 addition & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#ifndef PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_
1919
#define PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLES_H_
2020

21+
#include "PWGHF/DataModel/AliasTables.h"
2122
#include "PWGHF/DataModel/CandidateSkimmingTables.h"
2223
#include "PWGHF/Utils/utilsPid.h"
2324
//
@@ -39,116 +40,6 @@
3940

4041
namespace o2::aod
4142
{
42-
// Table aliases
43-
using BcFullInfos = soa::Join<aod::BCsWithTimestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
44-
45-
using TracksWCov = soa::Join<Tracks, TracksCov>;
46-
using TracksWDca = soa::Join<Tracks, TracksDCA>;
47-
using TracksWExtra = soa::Join<Tracks, TracksExtra>;
48-
using TracksWCovDca = soa::Join<Tracks, TracksCov, TracksDCA>;
49-
using TracksWCovExtra = soa::Join<Tracks, TracksCov, TracksExtra>;
50-
using TracksWDcaExtra = soa::Join<Tracks, TracksDCA, TracksExtra>;
51-
using TracksWCovDcaExtra = soa::Join<Tracks, TracksCov, TracksDCA, TracksExtra>;
52-
53-
using TracksWMc = soa::Join<Tracks, McTrackLabels>;
54-
55-
using TracksPidEl = soa::Join<aod::pidTPCFullEl, aod::pidTOFFullEl>;
56-
using TracksPidMu = soa::Join<aod::pidTPCFullMu, aod::pidTOFFullMu>;
57-
using TracksPidPi = soa::Join<aod::pidTPCFullPi, aod::pidTOFFullPi>;
58-
using TracksPidKa = soa::Join<aod::pidTPCFullKa, aod::pidTOFFullKa>;
59-
using TracksPidPr = soa::Join<aod::pidTPCFullPr, aod::pidTOFFullPr>;
60-
using TracksPidDe = soa::Join<aod::pidTPCFullDe, aod::pidTOFFullDe>;
61-
62-
using TracksPidTinyEl = soa::Join<aod::pidTPCEl, aod::pidTOFEl>;
63-
using TracksPidTinyMu = soa::Join<aod::pidTPCMu, aod::pidTOFMu>;
64-
using TracksPidTinyPi = soa::Join<aod::pidTPCPi, aod::pidTOFPi>;
65-
using TracksPidTinyKa = soa::Join<aod::pidTPCKa, aod::pidTOFKa>;
66-
using TracksPidTinyPr = soa::Join<aod::pidTPCPr, aod::pidTOFPr>;
67-
using TracksPidTinyDe = soa::Join<aod::pidTPCDe, aod::pidTOFDe>;
68-
69-
// namespace pid_tpc_tof_utils
70-
// {
71-
// /// Function to combine TPC and TOF NSigma (for ML purposes)
72-
// /// \param tpcNSigma is the (binned) NSigma separation in TPC (if tiny = true)
73-
// /// \param tofNSigma is the (binned) NSigma separation in TOF (if tiny = true)
74-
// /// \return Node containing the combined NSigma of TPC and TOF
75-
// template <bool tiny = false, typename T1>
76-
// o2::framework::expressions::Node combineNSigma(const T1& tpcNSigma, const T1& tofNSigma)
77-
// {
78-
// float defaultNSigmaTolerance = .1f;
79-
// float defaultNSigma = -999.f + defaultNSigmaTolerance; // -999.f is the default value set in TPCPIDResponse.h and PIDTOF.h
80-
81-
// if constexpr (tiny) {
82-
// auto tpcBinWidth = 1.f * pidtpc_tiny::binning::bin_width;
83-
// auto tofBinWidth = 1.f * pidtof_tiny::binning::bin_width;
84-
85-
// return o2::framework::expressions::ifnode((tpcNSigma * tpcBinWidth > defaultNSigma) && (tofNSigma * tofBinWidth > defaultNSigma), o2::framework::expressions::nsqrt(.5f * tpcNSigma * tpcNSigma * tpcBinWidth * tpcBinWidth + .5f * tofNSigma * tofNSigma * tofBinWidth * tofBinWidth), // TPC and TOF
86-
// o2::framework::expressions::ifnode(tpcNSigma * tpcBinWidth > defaultNSigma, o2::framework::expressions::nabs(tpcNSigma * tpcBinWidth), // only TPC
87-
// o2::framework::expressions::ifnode(tofNSigma * tofBinWidth > defaultNSigma, o2::framework::expressions::nabs(tofNSigma * tofBinWidth), // only TOF
88-
// 1.f * tofNSigma * tofBinWidth))); // no TPC nor TOF
89-
// }
90-
91-
// return o2::framework::expressions::ifnode((tpcNSigma > defaultNSigma) && (tofNSigma > defaultNSigma), o2::framework::expressions::nsqrt(.5f * tpcNSigma * tpcNSigma + .5f * tofNSigma * tofNSigma), // TPC and TOF
92-
// o2::framework::expressions::ifnode(tpcNSigma > defaultNSigma, o2::framework::expressions::nabs(tpcNSigma), // only TPC
93-
// o2::framework::expressions::ifnode(tofNSigma > defaultNSigma, o2::framework::expressions::nabs(tofNSigma), // only TOF
94-
// 1.f * tofNSigma))); // no TPC nor TOF
95-
// }
96-
// } // namespace pid_tpc_tof_utils
97-
98-
// namespace pid_tpc_tof_full
99-
// {
100-
// // Combined TPC and TOF NSigma
101-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaEl, tpcTofNSigmaEl, //! Combined NSigma separation with the TPC & TOF detectors for electron
102-
// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaEl, o2::aod::pidtof::tofNSigmaEl));
103-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaMu, tpcTofNSigmaMu, //! Combined NSigma separation with the TPC & TOF detectors for muon
104-
// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaMu, o2::aod::pidtof::tofNSigmaMu));
105-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaPi, tpcTofNSigmaPi, //! Combined NSigma separation with the TPC & TOF detectors for pion
106-
// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaPi, o2::aod::pidtof::tofNSigmaPi));
107-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaKa, tpcTofNSigmaKa, //! Combined NSigma separation with the TPC & TOF detectors for kaon
108-
// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaKa, o2::aod::pidtof::tofNSigmaKa));
109-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaPr, tpcTofNSigmaPr, //! Combined NSigma separation with the TPC & TOF detectors for proton
110-
// float, pid_tpc_tof_utils::combineNSigma(o2::aod::pidtpc::tpcNSigmaPr, o2::aod::pidtof::tofNSigmaPr));
111-
// } // namespace pid_tpc_tof_full
112-
113-
// namespace pid_tpc_tof_tiny
114-
// {
115-
// // Combined binned TPC and TOF NSigma
116-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaEl, tpcTofNSigmaEl, //! Combined binned NSigma separation with the TPC & TOF detectors for electron
117-
// float, pid_tpc_tof_utils::combineNSigma<true>(o2::aod::pidtpc_tiny::tpcNSigmaStoreEl, o2::aod::pidtof_tiny::tofNSigmaStoreEl));
118-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaMu, tpcTofNSigmaMu, //! Combined binned NSigma separation with the TPC & TOF detectors for muon
119-
// float, pid_tpc_tof_utils::combineNSigma<true>(o2::aod::pidtpc_tiny::tpcNSigmaStoreMu, o2::aod::pidtof_tiny::tofNSigmaStoreMu));
120-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaPi, tpcTofNSigmaPi, //! Combined binned NSigma separation with the TPC & TOF detectors for pion
121-
// float, pid_tpc_tof_utils::combineNSigma<true>(o2::aod::pidtpc_tiny::tpcNSigmaStorePi, o2::aod::pidtof_tiny::tofNSigmaStorePi));
122-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaKa, tpcTofNSigmaKa, //! Combined binned NSigma separation with the TPC & TOF detectors for kaon
123-
// float, pid_tpc_tof_utils::combineNSigma<true>(o2::aod::pidtpc_tiny::tpcNSigmaStoreKa, o2::aod::pidtof_tiny::tofNSigmaStoreKa));
124-
// DECLARE_SOA_EXPRESSION_COLUMN(TpcTofNSigmaPr, tpcTofNSigmaPr, //! Combined binned NSigma separation with the TPC & TOF detectors for proton
125-
// float, pid_tpc_tof_utils::combineNSigma<true>(o2::aod::pidtpc_tiny::tpcNSigmaStorePr, o2::aod::pidtof_tiny::tofNSigmaStorePr));
126-
// } // namespace pid_tpc_tof_tiny
127-
128-
// // Extension of per particle tables
129-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidElExt, TracksPidEl, "PIDELEXT", //! Table of the TPC & TOF Combined NSigma for electron
130-
// pid_tpc_tof_full::TpcTofNSigmaEl);
131-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidMuExt, TracksPidMu, "PIDMUEXT", //! Table of the TPC & TOF Combined NSigma for muon
132-
// pid_tpc_tof_full::TpcTofNSigmaMu);
133-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidPiExt, TracksPidPi, "PIDPIEXT", //! Table of the TPC & TOF Combined NSigma for pion
134-
// pid_tpc_tof_full::TpcTofNSigmaPi);
135-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidKaExt, TracksPidKa, "PIDKAEXT", //! Table of the TPC & TOF Combined NSigma for kaon
136-
// pid_tpc_tof_full::TpcTofNSigmaKa);
137-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidPrExt, TracksPidPr, "PIDPREXT", //! Table of the TPC & TOF Combined NSigma for proton
138-
// pid_tpc_tof_full::TpcTofNSigmaPr);
139-
140-
// // Extension of tiny size tables
141-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyElExt, TracksPidTinyEl, "PIDTINYELEXT", //! Table of the TPC & TOF combined binned NSigma for electron
142-
// pid_tpc_tof_tiny::TpcTofNSigmaEl);
143-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyMuExt, TracksPidTinyMu, "PIDTINYMUEXT", //! Table of the TPC & TOF combined binned NSigma for muon
144-
// pid_tpc_tof_tiny::TpcTofNSigmaMu);
145-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyPiExt, TracksPidTinyPi, "PIDTINYPIEXT", //! Table of the TPC & TOF combined binned NSigma for pion
146-
// pid_tpc_tof_tiny::TpcTofNSigmaPi);
147-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyKaExt, TracksPidTinyKa, "PIDTINYKAEXT", //! Table of the TPC & TOF combined binned NSigma for kaon
148-
// pid_tpc_tof_tiny::TpcTofNSigmaKa);
149-
// DECLARE_SOA_EXTENDED_TABLE_USER(TracksPidTinyPrExt, TracksPidTinyPr, "PIDTINYPREXT", //! Table of the TPC & TOF combined binned NSigma for proton
150-
// pid_tpc_tof_tiny::TpcTofNSigmaPr);
151-
15243
namespace pid_tpc_tof_static_full
15344
{
15445
// Combined TPC and TOF NSigma
@@ -967,17 +858,9 @@ using HfCandBplusToJpsi = soa::Join<HfCandBpJPExt, HfCandBpJPDaus>;
967858

968859
namespace hf_cand_casc_lf
969860
{
970-
// mapping of decay types
971-
enum DecayType2Prong { XiczeroOmegaczeroToXiPi = 0,
972-
OmegaczeroToOmegaPi,
973-
OmegaczeroToOmegaK,
974-
N2ProngDecays }; // always keep N2ProngDecays at the end
975861
// mapping of construct method
976862
enum ConstructMethod { DcaFitter = 0,
977863
KfParticle };
978-
// mapping of decay types
979-
enum DecayType3Prong { XicplusToXiPiPi = 0,
980-
N3ProngDecays }; // always keep N3ProngDecays at the end
981864
} // namespace hf_cand_casc_lf
982865

983866
namespace hf_cand_x

‎PWGHF/DataModel/CandidateSkimmingTables.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,21 @@ enum DecayType {
375375
};
376376
} // namespace hf_cand_dstar
377377

378+
namespace hf_cand_casc_lf
379+
{
380+
enum DecayType2Prong {
381+
XiczeroOmegaczeroToXiPi = 0,
382+
OmegaczeroToOmegaPi,
383+
OmegaczeroToOmegaK,
384+
N2ProngDecays
385+
}; // always keep N2ProngDecays at the end
386+
387+
enum DecayType3Prong {
388+
XicplusToXiPiPi = 0,
389+
N3ProngDecays
390+
}; // always keep N3ProngDecays at the end
391+
} // namespace hf_cand_casc_lf
392+
378393
} // namespace o2::aod
379394

380395
#endif // PWGHF_DATAMODEL_CANDIDATESKIMMINGTABLES_H_

0 commit comments

Comments
 (0)