Skip to content

Commit b9e2e14

Browse files
fcatalan92fcatalan92
committed
Address Vit's comments
1 parent ebabcdb commit b9e2e14

File tree

1 file changed

+55
-45
lines changed

1 file changed

+55
-45
lines changed

‎PWGHF/TableProducer/treeCreatorOmegac0ToOmegaPi.cxx‎

Lines changed: 55 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -231,15 +231,6 @@ DECLARE_SOA_TABLE(HfKfOmegacLites, "AOD", "HFKFOMEGACLITE",
231231
full::FlagMcMatchRec, full::OriginMcRec, full::CollisionMatched, hf_track_index::HFflag, collision::NumContrib, cent::CentFT0M);
232232
} // namespace o2::aod
233233

234-
/// Evaluate centrality/multiplicity percentile (centrality estimator is automatically selected based on the used table)
235-
/// \param candidate is candidate
236-
/// \return centrality/multiplicity percentile of the collision
237-
template <typename Coll>
238-
float evaluateCentralityColl(const Coll& collision)
239-
{
240-
return o2::hf_centrality::getCentralityColl<Coll>(collision);
241-
}
242-
243234
/// Writes the full information in an output TTree
244235
struct HfTreeCreatorOmegac0ToOmegaPi {
245236

@@ -269,23 +260,23 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
269260
{
270261
}
271262

272-
template <typename Colls>
273-
void fillEvent(const Colls& collision, float cutZPv)
263+
template <typename C>
264+
void fillEvent(const C& collision, float cutZPv)
274265
{
275266
rowEv(collision.sel8(), std::abs(collision.posZ()) < cutZPv);
276267
}
277268

278-
template <typename Cands, typename Colls>
279-
void fillCandidateLite(const Cands& candidate, const Colls&, int8_t flagMc, int8_t originMc, bool collisionMatched, float centFt0m)
269+
template <typename P, typename C>
270+
void fillCandidateLite(const P& candidate, const C&, int8_t flagMc, int8_t originMc, bool collisionMatched, float centFt0m)
280271
{
281272
if (candidate.resultSelections() && candidate.statusPidCharmBaryon() && candidate.statusInvMassLambda() && candidate.statusInvMassCascade() && candidate.statusInvMassCharmBaryon()) {
282273

283274
rowCandidateLite(
284275
candidate.xPv(),
285276
candidate.yPv(),
286277
candidate.zPv(),
287-
candidate.template collision_as<Colls>().numContrib(),
288-
candidate.template collision_as<Colls>().chi2(),
278+
candidate.template collision_as<C>().numContrib(),
279+
candidate.template collision_as<C>().chi2(),
289280
centFt0m,
290281
candidate.xDecayVtxCharmBaryon(),
291282
candidate.yDecayVtxCharmBaryon(),
@@ -351,8 +342,8 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
351342
}
352343
}
353344

354-
template <typename Cands, typename Colls>
355-
void fillKfCandidate(const Cands& candidate, const Colls&, int8_t flagMc, int8_t originMc, bool collisionMatched, float centFt0m)
345+
template <typename P, typename C>
346+
void fillKfCandidate(const P& candidate, const C&, int8_t flagMc, int8_t originMc, bool collisionMatched, float centFt0m)
356347
{
357348
if (candidate.resultSelections() && candidate.statusPidCharmBaryon() && candidate.statusInvMassLambda() && candidate.statusInvMassCascade() && candidate.statusInvMassCharmBaryon()) {
358349

@@ -417,13 +408,13 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
417408
originMc,
418409
collisionMatched,
419410
candidate.hfflag(),
420-
candidate.template collision_as<Colls>().numContrib(),
411+
candidate.template collision_as<C>().numContrib(),
421412
centFt0m);
422413
}
423414
}
424415

425-
template <typename Cands, typename Colls>
426-
void fillKfCandidateLite(const Cands& candidate, const Colls&, int8_t flagMc, int8_t originMc, bool collisionMatched, float centFt0m)
416+
template <typename P, typename C>
417+
void fillKfCandidateLite(const P& candidate, const C&, int8_t flagMc, int8_t originMc, bool collisionMatched, float centFt0m)
427418
{
428419
if (candidate.resultSelections() && candidate.statusPidCharmBaryon() && candidate.statusInvMassLambda() && candidate.statusInvMassCascade() && candidate.statusInvMassCharmBaryon()) {
429420

@@ -462,12 +453,14 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
462453
originMc,
463454
collisionMatched,
464455
candidate.hfflag(),
465-
candidate.template collision_as<Colls>().numContrib(),
456+
candidate.template collision_as<C>().numContrib(),
466457
centFt0m);
467458
}
468459
} // fillKfCandidateLite end
469460

470-
void processData(Colls const& collisions, CandSel const& candidates, Tracks const&)
461+
void processData(Colls const& collisions,
462+
CandSel const& candidates,
463+
Tracks const&)
471464
{
472465
// Filling event properties
473466
rowEv.reserve(collisions.size());
@@ -483,7 +476,8 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
483476
}
484477
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processData, "Process data", false);
485478

486-
void processKfData(Colls const& collisions, CandKfSel const& candidates)
479+
void processKfData(Colls const& collisions,
480+
CandKfSel const& candidates)
487481
{
488482
// Filling event properties
489483
rowEv.reserve(collisions.size());
@@ -499,7 +493,8 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
499493
}
500494
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKfData, "Process KF data", false);
501495

502-
void processKfDataLite(Colls const& collisions, CandKfSel const& candidates)
496+
void processKfDataLite(Colls const& collisions,
497+
CandKfSel const& candidates)
503498
{
504499
// Filling event properties
505500
rowEv.reserve(collisions.size());
@@ -515,7 +510,9 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
515510
}
516511
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKfDataLite, "Process KF data lite", false);
517512

518-
void processDataCent(CollsWithFT0M const& collisions, CandSel const& candidates, Tracks const&)
513+
void processDataCent(CollsWithFT0M const& collisions,
514+
CandSel const& candidates,
515+
Tracks const&)
519516
{
520517
// Filling event properties
521518
rowEv.reserve(collisions.size());
@@ -527,13 +524,14 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
527524
rowCandidateLite.reserve(candidates.size());
528525
for (const auto& candidate : candidates) {
529526
auto collision = candidate.collision_as<CollsWithFT0M>();
530-
float centFt0m = evaluateCentralityColl(collision);
527+
float centFt0m = o2::hf_centrality::getCentralityColl(collision);
531528
fillCandidateLite(candidate, collisions, -7, RecoDecay::OriginType::None, false, centFt0m);
532529
}
533530
}
534531
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processDataCent, "Process data with FT0M info", false);
535532

536-
void processKfDataCent(CollsWithFT0M const& collisions, CandKfSel const& candidates)
533+
void processKfDataCent(CollsWithFT0M const& collisions,
534+
CandKfSel const& candidates)
537535
{
538536
// Filling event properties
539537
rowEv.reserve(collisions.size());
@@ -545,13 +543,14 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
545543
rowKfCandidateFull.reserve(candidates.size());
546544
for (const auto& candidate : candidates) {
547545
auto collision = candidate.collision_as<CollsWithFT0M>();
548-
float centFt0m = evaluateCentralityColl(collision);
546+
float centFt0m = o2::hf_centrality::getCentralityColl(collision);
549547
fillKfCandidate(candidate, collisions, -7, RecoDecay::OriginType::None, false, centFt0m);
550548
}
551549
}
552550
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKfDataCent, "Process KF data with FT0M info", false);
553551

554-
void processKfDataCentLite(CollsWithFT0M const& collisions, CandKfSel const& candidates)
552+
void processKfDataCentLite(CollsWithFT0M const& collisions,
553+
CandKfSel const& candidates)
555554
{
556555
// Filling event properties
557556
rowEv.reserve(collisions.size());
@@ -563,13 +562,15 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
563562
rowKfCandidateFull.reserve(candidates.size());
564563
for (const auto& candidate : candidates) {
565564
auto collision = candidate.collision_as<CollsWithFT0M>();
566-
float centFt0m = evaluateCentralityColl(collision);
565+
float centFt0m = o2::hf_centrality::getCentralityColl(collision);
567566
fillKfCandidateLite(candidate, collisions, -7, RecoDecay::OriginType::None, false, centFt0m);
568567
}
569568
}
570569
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKfDataCentLite, "Process KF data lite with FT0M info", false);
571570

572-
void processMc(Colls const& collisions, CandMcSel const& candidates, Tracks const&)
571+
void processMc(Colls const& collisions,
572+
CandMcSel const& candidates,
573+
Tracks const&)
573574
{
574575
// Filling event properties
575576
rowEv.reserve(collisions.size());
@@ -580,15 +581,16 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
580581
// Filling candidate properties
581582
rowCandidateLite.reserve(candidates.size());
582583
for (const auto& candidate : candidates) {
583-
if (keepOnlyMcSignal && candidate.originMcRec() == 0) {
584+
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
584585
continue;
585586
}
586587
fillCandidateLite(candidate, collisions, candidate.flagMcMatchRec(), candidate.originMcRec(), candidate.collisionMatched(), -1.);
587588
}
588589
}
589590
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processMc, "Process MC", false);
590591

591-
void processKFMc(Colls const& collisions, CandKfMcSel const& candidates)
592+
void processKFMc(Colls const& collisions,
593+
CandKfMcSel const& candidates)
592594
{
593595
// Filling event properties
594596
rowEv.reserve(collisions.size());
@@ -599,15 +601,16 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
599601
// Filling candidate properties
600602
rowCandidateLite.reserve(candidates.size());
601603
for (const auto& candidate : candidates) {
602-
if (keepOnlyMcSignal && candidate.originMcRec() == 0) {
604+
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
603605
continue;
604606
}
605607
fillKfCandidate(candidate, collisions, candidate.flagMcMatchRec(), candidate.originMcRec(), candidate.collisionMatched(), -1.);
606608
}
607609
}
608610
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKFMc, "Process KF MC", false);
609611

610-
void processKFMcLite(Colls const& collisions, CandKfMcSel const& candidates)
612+
void processKFMcLite(Colls const& collisions,
613+
CandKfMcSel const& candidates)
611614
{
612615
// Filling event properties
613616
rowEv.reserve(collisions.size());
@@ -618,15 +621,18 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
618621
// Filling candidate properties
619622
rowCandidateLite.reserve(candidates.size());
620623
for (const auto& candidate : candidates) {
621-
if (keepOnlyMcSignal && candidate.originMcRec() == 0) {
624+
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
622625
continue;
623626
}
624627
fillKfCandidateLite(candidate, collisions, candidate.flagMcMatchRec(), candidate.originMcRec(), candidate.collisionMatched(), -1.);
625628
}
626629
}
627630
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKFMcLite, "Process KF MC Lite", false);
628631

629-
void processMcCent(CollsWithMcLabels const& collisions, CandMcSel const& candidates, Tracks const&, McCollsWithFT0M const&)
632+
void processMcCent(CollsWithMcLabels const& collisions,
633+
CandMcSel const& candidates,
634+
Tracks const&,
635+
McCollsWithFT0M const&)
630636
{
631637
// Filling event properties
632638
rowEv.reserve(collisions.size());
@@ -637,17 +643,19 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
637643
// Filling candidate properties
638644
rowCandidateLite.reserve(candidates.size());
639645
for (const auto& candidate : candidates) {
640-
if (keepOnlyMcSignal && candidate.originMcRec() == 0) {
646+
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
641647
continue;
642648
}
643649
auto mcCollision = candidate.collision_as<CollsWithMcLabels>().mcCollision_as<McCollsWithFT0M>();
644-
float centFt0m = evaluateCentralityColl(mcCollision);
650+
float centFt0m = o2::hf_centrality::getCentralityColl(mcCollision);
645651
fillCandidateLite(candidate, collisions, candidate.flagMcMatchRec(), candidate.originMcRec(), candidate.collisionMatched(), centFt0m);
646652
}
647653
}
648654
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processMcCent, "Process MC with FT0M info", false);
649655

650-
void processKFMcCent(CollsWithMcLabels const& collisions, CandKfMcSel const& candidates, McCollsWithFT0M const&)
656+
void processKFMcCent(CollsWithMcLabels const& collisions,
657+
CandKfMcSel const& candidates,
658+
McCollsWithFT0M const&)
651659
{
652660
// Filling event properties
653661
rowEv.reserve(collisions.size());
@@ -658,17 +666,19 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
658666
// Filling candidate properties
659667
rowCandidateLite.reserve(candidates.size());
660668
for (const auto& candidate : candidates) {
661-
if (keepOnlyMcSignal && candidate.originMcRec() == 0) {
669+
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
662670
continue;
663671
}
664672
auto mcCollision = candidate.collision_as<CollsWithMcLabels>().mcCollision_as<McCollsWithFT0M>();
665-
float centFt0m = evaluateCentralityColl(mcCollision);
673+
float centFt0m = o2::hf_centrality::getCentralityColl(mcCollision);
666674
fillKfCandidate(candidate, collisions, candidate.flagMcMatchRec(), candidate.originMcRec(), candidate.collisionMatched(), centFt0m);
667675
}
668676
}
669677
PROCESS_SWITCH(HfTreeCreatorOmegac0ToOmegaPi, processKFMcCent, "Process KF MC with FT0M info", false);
670678

671-
void processKFMcCentLite(CollsWithMcLabels const& collisions, CandKfMcSel const& candidates, McCollsWithFT0M const&)
679+
void processKFMcCentLite(CollsWithMcLabels const& collisions,
680+
CandKfMcSel const& candidates,
681+
McCollsWithFT0M const&)
672682
{
673683
// Filling event properties
674684
rowEv.reserve(collisions.size());
@@ -679,11 +689,11 @@ struct HfTreeCreatorOmegac0ToOmegaPi {
679689
// Filling candidate properties
680690
rowCandidateLite.reserve(candidates.size());
681691
for (const auto& candidate : candidates) {
682-
if (keepOnlyMcSignal && candidate.originMcRec() == 0) {
692+
if (keepOnlyMcSignal && candidate.originMcRec() == RecoDecay::OriginType::None) {
683693
continue;
684694
}
685695
auto mcCollision = candidate.collision_as<CollsWithMcLabels>().mcCollision_as<McCollsWithFT0M>();
686-
float centFt0m = evaluateCentralityColl(mcCollision);
696+
float centFt0m = o2::hf_centrality::getCentralityColl(mcCollision);
687697
fillKfCandidateLite(candidate, collisions, candidate.flagMcMatchRec(), candidate.originMcRec(), candidate.collisionMatched(), centFt0m);
688698
}
689699
}

0 commit comments

Comments
 (0)