Skip to content

Commit 8520ec2

Browse files
mpucciompuccio
committed
Move table definition in data model
1 parent fb85df3 commit 8520ec2

4 files changed

Lines changed: 188 additions & 137 deletions

File tree

‎PWGLF/DataModel/LFHypernucleiTables.h‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
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+
///
13+
/// \file LFHypernucleiTables.h
14+
/// \brief Slim hypernuclei tables
15+
///
16+
17+
#include "Framework/AnalysisDataModel.h"
18+
#include "Framework/ASoAHelpers.h"
19+
20+
#ifndef PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
21+
#define PWGLF_DATAMODEL_LFHYPERNUCLEITABLES_H_
22+
23+
namespace o2::aod
24+
{
25+
namespace hyperrec
26+
{
27+
DECLARE_SOA_COLUMN(IsMatter, isMatter, bool); // bool: true for matter
28+
DECLARE_SOA_COLUMN(Pt, pt, float); // Momentum of the candidate (x direction)
29+
DECLARE_SOA_COLUMN(Phi, phi, float); // Momentum of the candidate (y direction)
30+
DECLARE_SOA_COLUMN(Eta, eta, float); // Momentum of the candidate (z direction)
31+
DECLARE_SOA_COLUMN(XDecVtx, xDecVtx, float); // Decay vertex of the candidate (x direction)
32+
DECLARE_SOA_COLUMN(YDecVtx, yDecVtx, float); // Decay vertex of the candidate (y direction)
33+
DECLARE_SOA_COLUMN(ZDecVtx, zDecVtx, float); // Decay vertex of the candidate (z direction)
34+
DECLARE_SOA_COLUMN(MassH3L, massH3L, float); // Squared mass w/ hypertriton mass hypo
35+
DECLARE_SOA_COLUMN(MassH4L, massH4L, float); // Squared mass w/ H4L mass hypo
36+
DECLARE_SOA_COLUMN(DcaV0Daug, dcaV0Daug, float); // DCA between daughters
37+
DECLARE_SOA_COLUMN(CosPA, cosPA, double); // Cosine of the pointing angle
38+
DECLARE_SOA_COLUMN(NSigmaHe, nSigmaHe, float); // Number of sigmas of the He daughter
39+
DECLARE_SOA_COLUMN(NTPCclusHe, nTPCclusHe, uint8_t); // Number of TPC clusters of the He daughter
40+
DECLARE_SOA_COLUMN(NTPCclusPi, nTPCclusPi, uint8_t); // Number of TPC clusters of the Pi daughter
41+
DECLARE_SOA_COLUMN(TPCsignalHe, tpcSignalHe, uint16_t); // TPC signal of the He daughter
42+
DECLARE_SOA_COLUMN(TPCsignalPi, tpcSignalPi, uint16_t); // TPC signal of the Pi daughter
43+
DECLARE_SOA_COLUMN(TPCmomHe, tpcMomHe, float); // TPC momentum of the He daughter
44+
DECLARE_SOA_COLUMN(TPCmomPi, tpcMomPi, float); // TPC momentum of the Pi daughter
45+
DECLARE_SOA_COLUMN(DcaHe, dcaHe, float); // DCA between He daughter and V0
46+
DECLARE_SOA_COLUMN(DcaPi, dcaPi, float); // DCA between pi daughter and V0
47+
DECLARE_SOA_COLUMN(GenPt, genPt, float); // Momentum of the candidate (x direction)
48+
DECLARE_SOA_COLUMN(GenPhi, genPhi, float); // Momentum of the candidate (y direction)
49+
DECLARE_SOA_COLUMN(GenEta, genEta, float); // Momentum of the candidate (z direction)
50+
DECLARE_SOA_COLUMN(GenXDecVtx, genXDecVtx, float); // Decay vertex of the candidate (x direction)
51+
DECLARE_SOA_COLUMN(GenYDecVtx, genYDecVtx, float); // Decay vertex of the candidate (y direction)
52+
DECLARE_SOA_COLUMN(GenZDecVtx, genZDecVtx, float); // Decay vertex of the candidate (z direction)
53+
DECLARE_SOA_COLUMN(IsReco, isReco, bool); // bool: true for reco
54+
DECLARE_SOA_COLUMN(IsSignal, isSignal, bool); // bool: true for signal
55+
} // namespace hyperrec
56+
57+
DECLARE_SOA_TABLE(DataHypCands, "AOD", "DATAHYPCANDS",
58+
o2::soa::Index<>,
59+
hyperrec::IsMatter,
60+
hyperrec::Pt,
61+
hyperrec::Phi,
62+
hyperrec::Eta,
63+
hyperrec::XDecVtx,
64+
hyperrec::YDecVtx,
65+
hyperrec::ZDecVtx,
66+
hyperrec::MassH3L,
67+
hyperrec::MassH4L,
68+
hyperrec::DcaV0Daug,
69+
hyperrec::CosPA,
70+
hyperrec::NSigmaHe,
71+
hyperrec::NTPCclusHe,
72+
hyperrec::NTPCclusPi,
73+
hyperrec::TPCmomHe,
74+
hyperrec::TPCmomPi,
75+
hyperrec::TPCsignalHe,
76+
hyperrec::TPCsignalPi,
77+
hyperrec::DcaHe,
78+
hyperrec::DcaPi);
79+
80+
DECLARE_SOA_TABLE(MCHypCands, "AOD", "MCHYPCANDS",
81+
o2::soa::Index<>,
82+
hyperrec::IsMatter,
83+
hyperrec::Pt,
84+
hyperrec::Phi,
85+
hyperrec::Eta,
86+
hyperrec::XDecVtx,
87+
hyperrec::YDecVtx,
88+
hyperrec::ZDecVtx,
89+
hyperrec::MassH3L,
90+
hyperrec::MassH4L,
91+
hyperrec::DcaV0Daug,
92+
hyperrec::CosPA,
93+
hyperrec::NSigmaHe,
94+
hyperrec::NTPCclusHe,
95+
hyperrec::NTPCclusPi,
96+
hyperrec::TPCmomHe,
97+
hyperrec::TPCmomPi,
98+
hyperrec::TPCsignalHe,
99+
hyperrec::TPCsignalPi,
100+
hyperrec::DcaHe,
101+
hyperrec::DcaPi,
102+
hyperrec::GenPt,
103+
hyperrec::GenPhi,
104+
hyperrec::GenEta,
105+
hyperrec::GenXDecVtx,
106+
hyperrec::GenYDecVtx,
107+
hyperrec::GenZDecVtx,
108+
hyperrec::IsReco,
109+
hyperrec::IsSignal);
110+
111+
using DataHypCand = DataHypCands::iterator;
112+
using MCHypCand = MCHypCands::iterator;
113+
114+
} // namespace o2::aod
115+
116+
#endif

‎PWGLF/DataModel/LFSlimNucleiTables.h‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
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+
///
13+
/// \file LFSlimNucleiTables.h
14+
/// \brief Slim nuclei tables
15+
///
16+
17+
#include "Framework/AnalysisDataModel.h"
18+
#include "Framework/ASoAHelpers.h"
19+
20+
#ifndef PWGLF_DATAMODEL_LFSLIMNUCLEITABLES_H_
21+
#define PWGLF_DATAMODEL_LFSLIMNUCLEITABLES_H_
22+
23+
namespace o2::aod
24+
{
25+
namespace NucleiTableNS
26+
{
27+
DECLARE_SOA_COLUMN(Pt, pt, float);
28+
DECLARE_SOA_COLUMN(Eta, eta, float);
29+
DECLARE_SOA_COLUMN(ITSclsMap, itsClsMap, uint8_t);
30+
DECLARE_SOA_COLUMN(TPCnCls, tpcNCls, uint8_t);
31+
DECLARE_SOA_COLUMN(DCAxy, dcaxy, int8_t);
32+
DECLARE_SOA_COLUMN(DCAz, dcaz, int8_t);
33+
DECLARE_SOA_COLUMN(Flags, flags, uint16_t);
34+
DECLARE_SOA_COLUMN(TPCnsigma, tpcnsigma, uint8_t);
35+
DECLARE_SOA_COLUMN(TOFmass, tofmass, uint8_t);
36+
DECLARE_SOA_COLUMN(gPt, genPt, float);
37+
DECLARE_SOA_COLUMN(gEta, genEta, float);
38+
DECLARE_SOA_COLUMN(PDGcode, pdgCode, int);
39+
40+
} // namespace NucleiTableNS
41+
DECLARE_SOA_TABLE(NucleiTable, "AOD", "NUCLEITABLE",
42+
NucleiTableNS::Pt,
43+
NucleiTableNS::Eta,
44+
NucleiTableNS::ITSclsMap,
45+
NucleiTableNS::TPCnCls,
46+
NucleiTableNS::DCAxy,
47+
NucleiTableNS::DCAz,
48+
NucleiTableNS::Flags,
49+
NucleiTableNS::TPCnsigma,
50+
NucleiTableNS::TOFmass)
51+
52+
DECLARE_SOA_TABLE(NucleiTableMC, "AOD", "NUCLEITABLEMC",
53+
NucleiTableNS::Pt,
54+
NucleiTableNS::Eta,
55+
NucleiTableNS::ITSclsMap,
56+
NucleiTableNS::TPCnCls,
57+
NucleiTableNS::DCAxy,
58+
NucleiTableNS::DCAz,
59+
NucleiTableNS::Flags,
60+
NucleiTableNS::TPCnsigma,
61+
NucleiTableNS::TOFmass,
62+
NucleiTableNS::gPt,
63+
NucleiTableNS::gEta,
64+
NucleiTableNS::PDGcode)
65+
66+
} // namespace o2::aod
67+
68+
#endif

‎PWGLF/TableProducer/hyperRecoTask.cxx‎

Lines changed: 2 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#include "DataFormatsTPC/BetheBlochAleph.h"
3333
#include "DCAFitter/DCAFitterN.h"
3434

35+
#include "PWGLF/DataModel/LFHypernucleiTables.h"
36+
3537
using namespace o2;
3638
using namespace o2::framework;
3739
using namespace o2::framework::expressions;
@@ -50,98 +52,6 @@ std::shared_ptr<TH2> hDeDx3HeSel;
5052
std::shared_ptr<TH2> hDeDxTot;
5153
} // namespace
5254

53-
namespace o2::aod
54-
{
55-
namespace hyperrec
56-
{
57-
DECLARE_SOA_COLUMN(IsMatter, isMatter, bool); // bool: true for matter
58-
DECLARE_SOA_COLUMN(Pt, pt, float); // Momentum of the candidate (x direction)
59-
DECLARE_SOA_COLUMN(Phi, phi, float); // Momentum of the candidate (y direction)
60-
DECLARE_SOA_COLUMN(Eta, eta, float); // Momentum of the candidate (z direction)
61-
DECLARE_SOA_COLUMN(XDecVtx, xDecVtx, float); // Decay vertex of the candidate (x direction)
62-
DECLARE_SOA_COLUMN(YDecVtx, yDecVtx, float); // Decay vertex of the candidate (y direction)
63-
DECLARE_SOA_COLUMN(ZDecVtx, zDecVtx, float); // Decay vertex of the candidate (z direction)
64-
DECLARE_SOA_COLUMN(MassH3L, massH3L, float); // Squared mass w/ hypertriton mass hypo
65-
DECLARE_SOA_COLUMN(MassH4L, massH4L, float); // Squared mass w/ H4L mass hypo
66-
DECLARE_SOA_COLUMN(DcaV0Daug, dcaV0Daug, float); // DCA between daughters
67-
DECLARE_SOA_COLUMN(CosPA, cosPA, double); // Cosine of the pointing angle
68-
DECLARE_SOA_COLUMN(NSigmaHe, nSigmaHe, float); // Number of sigmas of the He daughter
69-
DECLARE_SOA_COLUMN(NTPCclusHe, nTPCclusHe, uint8_t); // Number of TPC clusters of the He daughter
70-
DECLARE_SOA_COLUMN(NTPCclusPi, nTPCclusPi, uint8_t); // Number of TPC clusters of the Pi daughter
71-
DECLARE_SOA_COLUMN(TPCsignalHe, tpcSignalHe, uint16_t); // TPC signal of the He daughter
72-
DECLARE_SOA_COLUMN(TPCsignalPi, tpcSignalPi, uint16_t); // TPC signal of the Pi daughter
73-
DECLARE_SOA_COLUMN(TPCmomHe, tpcMomHe, float); // TPC momentum of the He daughter
74-
DECLARE_SOA_COLUMN(TPCmomPi, tpcMomPi, float); // TPC momentum of the Pi daughter
75-
DECLARE_SOA_COLUMN(DcaHe, dcaHe, float); // DCA between He daughter and V0
76-
DECLARE_SOA_COLUMN(DcaPi, dcaPi, float); // DCA between pi daughter and V0
77-
DECLARE_SOA_COLUMN(GenPt, genPt, float); // Momentum of the candidate (x direction)
78-
DECLARE_SOA_COLUMN(GenPhi, genPhi, float); // Momentum of the candidate (y direction)
79-
DECLARE_SOA_COLUMN(GenEta, genEta, float); // Momentum of the candidate (z direction)
80-
DECLARE_SOA_COLUMN(GenXDecVtx, genXDecVtx, float); // Decay vertex of the candidate (x direction)
81-
DECLARE_SOA_COLUMN(GenYDecVtx, genYDecVtx, float); // Decay vertex of the candidate (y direction)
82-
DECLARE_SOA_COLUMN(GenZDecVtx, genZDecVtx, float); // Decay vertex of the candidate (z direction)
83-
DECLARE_SOA_COLUMN(IsReco, isReco, bool); // bool: true for reco
84-
DECLARE_SOA_COLUMN(IsSignal, isSignal, bool); // bool: true for signal
85-
} // namespace hyperrec
86-
87-
DECLARE_SOA_TABLE(DataHypCands, "AOD", "DATAHYPCANDS",
88-
o2::soa::Index<>,
89-
hyperrec::IsMatter,
90-
hyperrec::Pt,
91-
hyperrec::Phi,
92-
hyperrec::Eta,
93-
hyperrec::XDecVtx,
94-
hyperrec::YDecVtx,
95-
hyperrec::ZDecVtx,
96-
hyperrec::MassH3L,
97-
hyperrec::MassH4L,
98-
hyperrec::DcaV0Daug,
99-
hyperrec::CosPA,
100-
hyperrec::NSigmaHe,
101-
hyperrec::NTPCclusHe,
102-
hyperrec::NTPCclusPi,
103-
hyperrec::TPCmomHe,
104-
hyperrec::TPCmomPi,
105-
hyperrec::TPCsignalHe,
106-
hyperrec::TPCsignalPi,
107-
hyperrec::DcaHe,
108-
hyperrec::DcaPi);
109-
110-
DECLARE_SOA_TABLE(MCHypCands, "AOD", "MCHYPCANDS",
111-
o2::soa::Index<>,
112-
hyperrec::IsMatter,
113-
hyperrec::Pt,
114-
hyperrec::Phi,
115-
hyperrec::Eta,
116-
hyperrec::XDecVtx,
117-
hyperrec::YDecVtx,
118-
hyperrec::ZDecVtx,
119-
hyperrec::MassH3L,
120-
hyperrec::MassH4L,
121-
hyperrec::DcaV0Daug,
122-
hyperrec::CosPA,
123-
hyperrec::NSigmaHe,
124-
hyperrec::NTPCclusHe,
125-
hyperrec::NTPCclusPi,
126-
hyperrec::TPCmomHe,
127-
hyperrec::TPCmomPi,
128-
hyperrec::TPCsignalHe,
129-
hyperrec::TPCsignalPi,
130-
hyperrec::DcaHe,
131-
hyperrec::DcaPi,
132-
hyperrec::GenPt,
133-
hyperrec::GenPhi,
134-
hyperrec::GenEta,
135-
hyperrec::GenXDecVtx,
136-
hyperrec::GenYDecVtx,
137-
hyperrec::GenZDecVtx,
138-
hyperrec::IsReco,
139-
hyperrec::IsSignal);
140-
141-
using DataHypCand = DataHypCands::iterator;
142-
using MCHypCand = MCHypCands::iterator;
143-
} // namespace o2::aod
144-
14555
struct hyperCandidate {
14656
float recoPt() const { return std::hypot(mom[0], mom[1]); }
14757
float recoPhi() const { return std::atan2(mom[1], mom[0]); }

‎PWGLF/TableProducer/nucleiSpectra.cxx‎

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747

4848
#include "ReconstructionDataFormats/Track.h"
4949

50+
#include "PWGLF/DataModel/LFSlimNucleiTables.h"
51+
5052
using namespace o2;
5153
using namespace o2::framework;
5254
using namespace o2::framework::expressions;
@@ -155,51 +157,6 @@ o2::base::MatLayerCylSet* lut = nullptr;
155157
std::vector<NucleusCandidate> candidates;
156158
} // namespace nuclei
157159

158-
namespace o2::aod
159-
{
160-
namespace NucleiTableNS
161-
{
162-
DECLARE_SOA_COLUMN(Pt, pt, float);
163-
DECLARE_SOA_COLUMN(Eta, eta, float);
164-
DECLARE_SOA_COLUMN(ITSclsMap, itsClsMap, uint8_t);
165-
DECLARE_SOA_COLUMN(TPCnCls, tpcNCls, uint8_t);
166-
DECLARE_SOA_COLUMN(DCAxy, dcaxy, int8_t);
167-
DECLARE_SOA_COLUMN(DCAz, dcaz, int8_t);
168-
DECLARE_SOA_COLUMN(Flags, flags, uint16_t);
169-
DECLARE_SOA_COLUMN(TPCnsigma, tpcnsigma, uint8_t);
170-
DECLARE_SOA_COLUMN(TOFmass, tofmass, uint8_t);
171-
DECLARE_SOA_COLUMN(gPt, genPt, float);
172-
DECLARE_SOA_COLUMN(gEta, genEta, float);
173-
DECLARE_SOA_COLUMN(PDGcode, pdgCode, int);
174-
175-
} // namespace NucleiTableNS
176-
DECLARE_SOA_TABLE(NucleiTable, "AOD", "NUCLEITABLE",
177-
NucleiTableNS::Pt,
178-
NucleiTableNS::Eta,
179-
NucleiTableNS::ITSclsMap,
180-
NucleiTableNS::TPCnCls,
181-
NucleiTableNS::DCAxy,
182-
NucleiTableNS::DCAz,
183-
NucleiTableNS::Flags,
184-
NucleiTableNS::TPCnsigma,
185-
NucleiTableNS::TOFmass)
186-
187-
DECLARE_SOA_TABLE(NucleiTableMC, "AOD", "NUCLEITABLEMC",
188-
NucleiTableNS::Pt,
189-
NucleiTableNS::Eta,
190-
NucleiTableNS::ITSclsMap,
191-
NucleiTableNS::TPCnCls,
192-
NucleiTableNS::DCAxy,
193-
NucleiTableNS::DCAz,
194-
NucleiTableNS::Flags,
195-
NucleiTableNS::TPCnsigma,
196-
NucleiTableNS::TOFmass,
197-
NucleiTableNS::gPt,
198-
NucleiTableNS::gEta,
199-
NucleiTableNS::PDGcode)
200-
201-
} // namespace o2::aod
202-
203160
struct nucleiSpectra {
204161
enum {
205162
kDeuteron = BIT(0),

0 commit comments

Comments
 (0)