Skip to content

Commit 9639352

Browse files
committed
Fix compilation errors
1 parent 01ad7b2 commit 9639352

2 files changed

Lines changed: 35 additions & 15 deletions

File tree

‎PWGHF/DataModel/CandidateReconstructionTablesQa.h‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ DECLARE_SOA_COLUMN(YV0Vertex, yV0Vertex, float);
4040
DECLARE_SOA_COLUMN(ZV0Vertex, zV0Vertex, float);
4141
DECLARE_SOA_COLUMN(MassCascade, massCascade, float);
4242
DECLARE_SOA_COLUMN(MassLambda, massLambda, float);
43+
DECLARE_SOA_COLUMN(EtaCascade, etaCascade, float);
44+
DECLARE_SOA_COLUMN(EtaV0, etaV0, float);
4345
DECLARE_SOA_COLUMN(CpaCascade, cpaCascade, float);
4446
DECLARE_SOA_COLUMN(CpaXYCascade, cpaXYCascade, float);
4547
DECLARE_SOA_COLUMN(CpaV0, cpaV0, float);
@@ -117,7 +119,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Chi2TopoOverNdfV0ToCascade, chi2TopoOverNdfV0ToCascad
117119

118120
// Common QA candidate table for XiPi, OmegaPi and OmegaK
119121
// Convention: Prong0 is the Cascade, Prong1 is the bachelor track
120-
DECLARE_SOA_TABLE(HfCandCascBachBaseQa, "AOD", "HFCANDCASCBACHBASEQA",
122+
DECLARE_SOA_TABLE(HfCandCascBachBaseQa, "AOD", "HFCASCBACHBASE",
121123
o2::soa::Index<>,
122124
hf_cand::CollisionId,
123125
collision::PosX, collision::PosY, collision::PosZ,
@@ -171,13 +173,13 @@ DECLARE_SOA_TABLE(HfCandCascBachBaseQa, "AOD", "HFCANDCASCBACHBASEQA",
171173
hf_cand::ImpactParameterZNormalised1<hf_cand::ImpactParameterZ1, hf_cand::ErrorImpactParameterZ1>);
172174

173175
// extended table with expression columns that can be used as arguments of dynamic columns
174-
DECLARE_SOA_EXTENDED_TABLE_USER(HfCandCascBachExtQa, HfCandCascBachBaseQa, "HFCANDCASCBACHEXTQA",
176+
DECLARE_SOA_EXTENDED_TABLE_USER(HfCandCascBachExtQa, HfCandCascBachBaseQa, "HFCASCBACHEXT",
175177
hf_cand_2prong::Px, hf_cand_2prong::Py, hf_cand_2prong::Pz);
176178

177179
using HfCandCascBachQa = HfCandCascBachExtQa;
178180

179181
// KF specific information for HfCandCascBach
180-
DECLARE_SOA_TABLE(HfCandCascBachKfQa, "AOD", "HFCANDCASCBACHKFQA",
182+
DECLARE_SOA_TABLE(HfCandCascBachKfQa, "AOD", "HFCASCBACHKF",
181183
hf_cand_casc_bach_qa::Chi2Geo, hf_cand_casc_bach_qa::Chi2GeoCascade, hf_cand_casc_bach_qa::Chi2GeoV0,
182184
hf_cand_casc_bach_qa::NdfGeo, hf_cand_casc_bach_qa::NdfGeoCascade, hf_cand_casc_bach_qa::NdfGeoV0,
183185
hf_cand_casc_bach_qa::DecayLengthNormKf, hf_cand_casc_bach_qa::DecayLengthNormKfCascade, hf_cand_casc_bach_qa::DecayLengthNormKfV0,
@@ -196,7 +198,7 @@ DECLARE_SOA_TABLE(HfCandCascBachKfQa, "AOD", "HFCANDCASCBACHKFQA",
196198
hf_cand_casc_bach_qa::Chi2TopoOverNdfV0ToCascade<hf_cand_casc_bach_qa::Chi2TopoV0ToCascade, hf_cand_casc_bach_qa::NdfTopoV0ToCascade>);
197199

198200
// table with results of reconstruction level MC matching
199-
DECLARE_SOA_TABLE(HfCandCascBachMCRecQa, "AOD", "HFCANDCASCBACHMCRECQA", //!
201+
DECLARE_SOA_TABLE(HfCandCascBachMCRecQa, "AOD", "HFCASCBACHMCREC", //!
200202
hf_cand_mc_flag::FlagMcMatchRec,
201203
hf_cand_mc_flag::OriginMcRec,
202204
hf_cand_mc_flag::FlagMcDecayChanRec,
@@ -206,7 +208,7 @@ DECLARE_SOA_TABLE(HfCandCascBachMCRecQa, "AOD", "HFCANDCASCBACHMCRECQA", //!
206208
hf_cand_mc_flag::NInteractionsWithMaterial);
207209

208210
// table with results of generator level MC matching
209-
DECLARE_SOA_TABLE(HfCandCascBachMCGenQa, "AOD", "HFCANDCASCBACHMCGENQA", //!
211+
DECLARE_SOA_TABLE(HfCandCascBachMCGenQa, "AOD", "HFCASCBACHMCGEN", //!
210212
hf_cand_mc_flag::FlagMcMatchGen,
211213
hf_cand_mc_flag::OriginMcGen,
212214
hf_cand_mc_flag::FlagMcDecayChanGen,
@@ -321,4 +323,20 @@ enum DecayChannelMain : HfDecayChannel {
321323

322324
} // namespace o2::hf_decay
323325

326+
// TODO: remove once the candidate creator is updated
327+
namespace o2::aod
328+
{
329+
namespace hf_cand_xic0_omegac0
330+
{
331+
enum DecayType {
332+
XiczeroToXiPi = 0,
333+
OmegaczeroToXiPi,
334+
OmegaczeroToOmegaPi,
335+
OmegaczeroToOmegaK,
336+
OmegaczeroToOmegaPiOneMu,
337+
XiczeroToOmegaK
338+
};
339+
} // namespace hf_cand_xic0_omegac0
340+
} // namespace o2::aod
341+
324342
#endif // PWGHF_DATAMODEL_CANDIDATERECONSTRUCTIONTABLESQA_H_

‎PWGHF/TableProducer/candidateCreatorXic0Omegac0Qa.cxx‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ using namespace o2::constants::physics;
8484
using namespace o2::hf_evsel;
8585

8686
struct HfCandidateCreatorXic0Omegac0Qa {
87-
Produces<aod::HfCandCascBachQa> rowCandCascBatch;
87+
Produces<aod::HfCandCascBachBaseQa> rowCandCascBatch;
8888
// Additional information for candidates created with KFParticle
8989
Produces<aod::HfCandCascBachKfQa> rowCandCascBatchKf;
9090

@@ -634,7 +634,9 @@ struct HfCandidateCreatorXic0Omegac0Qa {
634634
// get SV Properties
635635
auto const& secondaryVertex = df.getPCACandidate();
636636
auto covMatrixSV = df.calcPCACovMatrixFlat();
637-
std::array<float, 3> svCoord = {secondaryVertex[0], secondaryVertex[1], secondaryVertex[2]};
637+
std::array<float, 3> svCoord = {static_cast<float>(secondaryVertex[0]),
638+
static_cast<float>(secondaryVertex[1]),
639+
static_cast<float>(secondaryVertex[2])};
638640

639641
float phi, theta;
640642
getPointDirection(std::array{primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ()}, secondaryVertex, phi, theta);
@@ -982,9 +984,9 @@ struct HfCandidateCreatorXic0Omegac0Qa {
982984
// TODO: check if the impact parameter can be calculated from KFParticle directly
983985
auto primaryVertex = getPrimaryVertex(collision);
984986
o2::dataformats::DCA impactParameterV0DauPos, impactParameterV0DauNeg, impactParameterCascBach;
985-
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, trackParCovV0DauPos, 2.f, matCorr, &impactParameterV0DauPos);
986-
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, trackParCovV0DauNeg, 2.f, matCorr, &impactParameterV0DauNeg);
987-
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, trackParCovBach, 2.f, matCorr, &impactParameterCascBach);
987+
o2::base::Propagator::Instance()->propagateToDCABxByBz(primaryVertex, trackParCovV0DauPos, 2.f, matCorr, &impactParameterV0DauPos);
988+
o2::base::Propagator::Instance()->propagateToDCABxByBz(primaryVertex, trackParCovV0DauNeg, 2.f, matCorr, &impactParameterV0DauNeg);
989+
o2::base::Propagator::Instance()->propagateToDCABxByBz(primaryVertex, trackParCovBach, 2.f, matCorr, &impactParameterCascBach);
988990

989991
o2::dataformats::DCA impactParameterCasc, impactParameterCharmBach;
990992
o2::base::Propagator::Instance()->propagateToDCABxByBz(primaryVertex, trackParCovCasc, 2.f, matCorr, &impactParameterCasc);
@@ -1385,10 +1387,10 @@ struct HfCandidateCreatorXic0Omegac0QaMc {
13851387
std::array<int, 4> pdgOfCharmBachelor{+kPiPlus, +kPiPlus, +kPiPlus, +kKPlus};
13861388
std::array<int, 4> pdgOfBachelor{+kPiMinus, +kPiMinus, +kKMinus, +kKMinus};
13871389

1388-
std::array<int8_t, 4> newDecayChannel{hf_cand_casc_bach_qa::DecayChannelMain::Xic0ToXiPi,
1389-
hf_cand_casc_bach_qa::DecayChannelMain::Omegac0ToXiPi,
1390-
hf_cand_casc_bach_qa::DecayChannelMain::Omegac0ToOmegaPi,
1391-
hf_cand_casc_bach_qa::DecayChannelMain::Omegac0ToOmegaKa};
1390+
std::array<int8_t, 4> newDecayChannel{o2::hf_decay::hf_cand_casc_bach_qa::DecayChannelMain::Xic0ToXiPi,
1391+
o2::hf_decay::hf_cand_casc_bach_qa::DecayChannelMain::Omegac0ToXiPi,
1392+
o2::hf_decay::hf_cand_casc_bach_qa::DecayChannelMain::Omegac0ToOmegaPi,
1393+
o2::hf_decay::hf_cand_casc_bach_qa::DecayChannelMain::Omegac0ToOmegaK};
13921394

13931395
// Table aliases
13941396
using TracksWMcIU = soa::Join<aod::TracksIU, McTrackLabels>;
@@ -1425,7 +1427,7 @@ struct HfCandidateCreatorXic0Omegac0QaMc {
14251427
McCollisions const& mcCollisions,
14261428
BCsInfo const&)
14271429
{
1428-
// Match reconstructed candidates //
1430+
// Match reconstructed candidates
14291431
for (const auto& candidate : candidates) {
14301432
int indexRecCharmBaryon = -1;
14311433
int indexRecCascade = -1;

0 commit comments

Comments
 (0)