Skip to content

Commit 7c32a3c

Browse files
author
Valerio Di Bella
committed
Cleaning of include and function
1 parent c5bc9ce commit 7c32a3c

File tree

3 files changed

+111
-251
lines changed

3 files changed

+111
-251
lines changed

‎PWGHF/HFC/DataModel/ReducedDMesonPairsTables.h‎

Lines changed: 93 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,11 @@
1414
/// \note used to fold (unfold) track and primary vertex information by writing (reading) AO2Ds
1515
///
1616
/// \author Valerio DI BELLA <valerio.di.bella@cern.ch>, IPHC Strasbourg
17-
/// \author Iouri BELIKOV <jouri.belikov@cern.ch>, IPHC Strasbourg
1817

19-
#ifndef PWGHF_D2H_DATAMODEL_REDUCEDDATAMODEL_H_
20-
#define PWGHF_D2H_DATAMODEL_REDUCEDDATAMODEL_H_
18+
#ifndef PWGHF_D2H_DATAMODEL_REDUCEDMESONPAIRSTABLES_H_
19+
#define PWGHF_D2H_DATAMODEL_REDUCEDMESONPAIRSTABLES_H_
2120

2221
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
23-
#include "PWGHF/Utils/utilsEvSelHf.h"
24-
#include "PWGHF/Utils/utilsPid.h"
25-
26-
#include "Common/Core/RecoDecay.h"
27-
#include "Common/DataModel/Centrality.h"
28-
#include "Common/DataModel/EventSelection.h"
29-
#include "Common/DataModel/PIDResponseTOF.h"
30-
#include "Common/DataModel/PIDResponseTPC.h"
31-
#include "Common/DataModel/Qvectors.h"
32-
33-
#include <CommonConstants/MathConstants.h>
34-
#include <CommonConstants/PhysicsConstants.h>
35-
#include <Framework/ASoA.h>
36-
#include <Framework/AnalysisDataModel.h>
37-
38-
#include <array>
39-
#include <cmath>
40-
#include <cstdint>
41-
#include <cstdlib>
4222

4323
namespace o2::aod
4424
{
@@ -48,7 +28,7 @@ DECLARE_SOA_TABLE(HfCandDpFullEvs, "AOD", "HFCANDDPFULLEV",
4828
collision::PosY,
4929
collision::PosZ);
5030

51-
namespace hf_pair_reduced
31+
namespace full
5232
{
5333
DECLARE_SOA_COLUMN(RSecondaryVertex, rSecondaryVertex, float); //! Radius of secondary vertex (cm)
5434
DECLARE_SOA_COLUMN(PtProng0, ptProng0, float); //! Transverse momentum of prong0 (GeV/c)
@@ -102,56 +82,56 @@ DECLARE_SOA_COLUMN(RunNumber, runNumber, int); //! Run number
10282
// ML scores
10383
DECLARE_SOA_COLUMN(MlScore0, mlScore0, float); //! ML score of the first configured index
10484
DECLARE_SOA_COLUMN(MlScore1, mlScore1, float); //! ML score of the second configured index
105-
} // namespace hf_pair_reduced
85+
} // namespace full
10686
DECLARE_SOA_TABLE(HfCandDpMls, "AOD", "HFCANDDPML",
107-
hf_pair_reduced::MlScore0,
108-
hf_pair_reduced::MlScore1)
87+
full::MlScore0,
88+
full::MlScore1)
10989

11090
DECLARE_SOA_TABLE(HfCandDpLites, "AOD", "HFCANDDPLITE",
11191
hf_cand::Chi2PCA,
112-
hf_pair_reduced::DecayLength,
113-
hf_pair_reduced::DecayLengthXY,
114-
hf_pair_reduced::DecayLengthNormalised,
115-
hf_pair_reduced::DecayLengthXYNormalised,
116-
hf_pair_reduced::PtProng0,
117-
hf_pair_reduced::PtProng1,
118-
hf_pair_reduced::PtProng2,
92+
full::DecayLength,
93+
full::DecayLengthXY,
94+
full::DecayLengthNormalised,
95+
full::DecayLengthXYNormalised,
96+
full::PtProng0,
97+
full::PtProng1,
98+
full::PtProng2,
11999
hf_cand::ImpactParameter0,
120100
hf_cand::ImpactParameter1,
121101
hf_cand::ImpactParameter2,
122102
hf_cand::ImpactParameterZ0,
123103
hf_cand::ImpactParameterZ1,
124104
hf_cand::ImpactParameterZ2,
125-
hf_pair_reduced::NSigTpcPi0,
126-
hf_pair_reduced::NSigTpcKa0,
127-
hf_pair_reduced::NSigTofPi0,
128-
hf_pair_reduced::NSigTofKa0,
129-
hf_pair_reduced::NSigTpcTofPi0,
130-
hf_pair_reduced::NSigTpcTofKa0,
131-
hf_pair_reduced::NSigTpcPi1,
132-
hf_pair_reduced::NSigTpcKa1,
133-
hf_pair_reduced::NSigTofPi1,
134-
hf_pair_reduced::NSigTofKa1,
135-
hf_pair_reduced::NSigTpcTofPi1,
136-
hf_pair_reduced::NSigTpcTofKa1,
137-
hf_pair_reduced::NSigTpcPi2,
138-
hf_pair_reduced::NSigTpcKa2,
139-
hf_pair_reduced::NSigTofPi2,
140-
hf_pair_reduced::NSigTofKa2,
141-
hf_pair_reduced::NSigTpcTofPi2,
142-
hf_pair_reduced::NSigTpcTofKa2,
143-
hf_pair_reduced::CandidateSelFlag,
144-
hf_pair_reduced::M,
145-
hf_pair_reduced::Pt,
146-
hf_pair_reduced::Cpa,
147-
hf_pair_reduced::CpaXY,
148-
hf_pair_reduced::MaxNormalisedDeltaIP,
149-
hf_pair_reduced::Eta,
150-
hf_pair_reduced::Phi,
151-
hf_pair_reduced::Y,
152-
hf_pair_reduced::Centrality,
105+
full::NSigTpcPi0,
106+
full::NSigTpcKa0,
107+
full::NSigTofPi0,
108+
full::NSigTofKa0,
109+
full::NSigTpcTofPi0,
110+
full::NSigTpcTofKa0,
111+
full::NSigTpcPi1,
112+
full::NSigTpcKa1,
113+
full::NSigTofPi1,
114+
full::NSigTofKa1,
115+
full::NSigTpcTofPi1,
116+
full::NSigTpcTofKa1,
117+
full::NSigTpcPi2,
118+
full::NSigTpcKa2,
119+
full::NSigTofPi2,
120+
full::NSigTofKa2,
121+
full::NSigTpcTofPi2,
122+
full::NSigTpcTofKa2,
123+
full::CandidateSelFlag,
124+
full::M,
125+
full::Pt,
126+
full::Cpa,
127+
full::CpaXY,
128+
full::MaxNormalisedDeltaIP,
129+
full::Eta,
130+
full::Phi,
131+
full::Y,
132+
full::Centrality,
153133
collision::NumContrib,
154-
hf_pair_reduced::HfCandDpFullEvId,
134+
full::HfCandDpFullEvId,
155135
hf_cand_3prong::FlagMcMatchRec,
156136
hf_cand_3prong::OriginMcRec,
157137
hf_cand_3prong::FlagMcDecayChanRec)
@@ -167,20 +147,20 @@ DECLARE_SOA_TABLE(HfCandDpFulls, "AOD", "HFCANDDPFULL",
167147
hf_cand::ErrorDecayLength,
168148
hf_cand::ErrorDecayLengthXY,
169149
hf_cand::Chi2PCA,
170-
hf_pair_reduced::RSecondaryVertex,
171-
hf_pair_reduced::DecayLength,
172-
hf_pair_reduced::DecayLengthXY,
173-
hf_pair_reduced::DecayLengthNormalised,
174-
hf_pair_reduced::DecayLengthXYNormalised,
175-
hf_pair_reduced::ImpactParameterNormalised0,
176-
hf_pair_reduced::PtProng0,
177-
hf_pair_reduced::PProng0,
178-
hf_pair_reduced::ImpactParameterNormalised1,
179-
hf_pair_reduced::PtProng1,
180-
hf_pair_reduced::PProng1,
181-
hf_pair_reduced::ImpactParameterNormalised2,
182-
hf_pair_reduced::PtProng2,
183-
hf_pair_reduced::PProng2,
150+
full::RSecondaryVertex,
151+
full::DecayLength,
152+
full::DecayLengthXY,
153+
full::DecayLengthNormalised,
154+
full::DecayLengthXYNormalised,
155+
full::ImpactParameterNormalised0,
156+
full::PtProng0,
157+
full::PProng0,
158+
full::ImpactParameterNormalised1,
159+
full::PtProng1,
160+
full::PProng1,
161+
full::ImpactParameterNormalised2,
162+
full::PtProng2,
163+
full::PProng2,
184164
hf_cand::PxProng0,
185165
hf_cand::PyProng0,
186166
hf_cand::PzProng0,
@@ -202,52 +182,52 @@ DECLARE_SOA_TABLE(HfCandDpFulls, "AOD", "HFCANDDPFULL",
202182
hf_cand::ErrorImpactParameterZ0,
203183
hf_cand::ErrorImpactParameterZ1,
204184
hf_cand::ErrorImpactParameterZ2,
205-
hf_pair_reduced::NSigTpcPi0,
206-
hf_pair_reduced::NSigTpcKa0,
207-
hf_pair_reduced::NSigTofPi0,
208-
hf_pair_reduced::NSigTofKa0,
209-
hf_pair_reduced::NSigTpcTofPi0,
210-
hf_pair_reduced::NSigTpcTofKa0,
211-
hf_pair_reduced::NSigTpcPi1,
212-
hf_pair_reduced::NSigTpcKa1,
213-
hf_pair_reduced::NSigTofPi1,
214-
hf_pair_reduced::NSigTofKa1,
215-
hf_pair_reduced::NSigTpcTofPi1,
216-
hf_pair_reduced::NSigTpcTofKa1,
217-
hf_pair_reduced::NSigTpcPi2,
218-
hf_pair_reduced::NSigTpcKa2,
219-
hf_pair_reduced::NSigTofPi2,
220-
hf_pair_reduced::NSigTofKa2,
221-
hf_pair_reduced::NSigTpcTofPi2,
222-
hf_pair_reduced::NSigTpcTofKa2,
223-
hf_pair_reduced::CandidateSelFlag,
224-
hf_pair_reduced::M,
225-
hf_pair_reduced::Pt,
226-
hf_pair_reduced::P,
227-
hf_pair_reduced::Cpa,
228-
hf_pair_reduced::CpaXY,
229-
hf_pair_reduced::MaxNormalisedDeltaIP,
230-
hf_pair_reduced::Ct,
231-
hf_pair_reduced::Eta,
232-
hf_pair_reduced::Phi,
233-
hf_pair_reduced::Y,
234-
hf_pair_reduced::E,
235-
hf_pair_reduced::Centrality,
236-
hf_pair_reduced::HfCandDpFullEvId,
185+
full::NSigTpcPi0,
186+
full::NSigTpcKa0,
187+
full::NSigTofPi0,
188+
full::NSigTofKa0,
189+
full::NSigTpcTofPi0,
190+
full::NSigTpcTofKa0,
191+
full::NSigTpcPi1,
192+
full::NSigTpcKa1,
193+
full::NSigTofPi1,
194+
full::NSigTofKa1,
195+
full::NSigTpcTofPi1,
196+
full::NSigTpcTofKa1,
197+
full::NSigTpcPi2,
198+
full::NSigTpcKa2,
199+
full::NSigTofPi2,
200+
full::NSigTofKa2,
201+
full::NSigTpcTofPi2,
202+
full::NSigTpcTofKa2,
203+
full::CandidateSelFlag,
204+
full::M,
205+
full::Pt,
206+
full::P,
207+
full::Cpa,
208+
full::CpaXY,
209+
full::MaxNormalisedDeltaIP,
210+
full::Ct,
211+
full::Eta,
212+
full::Phi,
213+
full::Y,
214+
full::E,
215+
full::Centrality,
216+
full::HfCandDpFullEvId,
237217
hf_cand_3prong::FlagMcMatchRec,
238218
hf_cand_3prong::OriginMcRec,
239219
hf_cand_3prong::FlagMcDecayChanRec);
240220

241221
DECLARE_SOA_TABLE(HfCandDpFullPs, "AOD", "HFCANDDPFULLP",
242-
hf_pair_reduced::Pt,
243-
hf_pair_reduced::Eta,
244-
hf_pair_reduced::Phi,
245-
hf_pair_reduced::Y,
222+
full::Pt,
223+
full::Eta,
224+
full::Phi,
225+
full::Y,
246226
hf_cand_3prong::FlagMcMatchGen,
247227
hf_cand_3prong::FlagMcDecayChanGen,
248228
hf_cand_3prong::OriginMcGen);
249229
} // namespace o2::aod
250230

251231

252232

253-
#endif // PWGHF_D2H_DATAMODEL_REDUCEDDATAMODEL_H_
233+
#endif // PWGHF_D2H_DATAMODEL_REDUCEDMESONPAIRSTABLES_H_

0 commit comments

Comments
 (0)