Skip to content

Commit f26f8b8

Browse files
mfagginmfaggin
committed
Add values, remove BIT and remove legacy channels.
1 parent bed5f9d commit f26f8b8

File tree

4 files changed

+21
-30
lines changed

4 files changed

+21
-30
lines changed

‎PWGHF/Core/DecayChannels.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,14 @@ namespace hf_cand_sigmac
265265
{
266266
enum DecayChannelMain : HfDecayChannel {
267267
// Σc0(2455) → Λc+ π- → p K- π+ π-
268-
Sc0ToPKPiPi = 0,
268+
Sc0ToPKPiPi = 1,
269269
// Σc++(2455) → Λc+ π+ → p K- π+ π+
270-
ScplusplusToPKPiPi,
270+
ScplusplusToPKPiPi = 2,
271271
// Σc0(2520) → Λc+ π- → p K- π+ π-
272-
ScStar0ToPKPiPi,
272+
ScStar0ToPKPiPi = 3,
273273
// Σc++(2520) → Λc+ π+ → p K- π+ π+
274-
ScStarPlusPlusToPKPiPi
274+
ScStarPlusPlusToPKPiPi = 4,
275+
NChannelsMain = ScStarPlusPlusToPKPiPi // last channel
275276
};
276277
} // namespace hf_cand_sigmac
277278

‎PWGHF/Core/DecayChannelsLegacy.h‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,6 @@ enum DecayType {
5050
};
5151
} // namespace hf_cand_dstar
5252

53-
namespace hf_cand_sigmac
54-
{
55-
enum DecayType {
56-
Sc0ToPKPiPi = 0,
57-
ScplusplusToPKPiPi,
58-
ScStar0ToPKPiPi,
59-
ScStarPlusPlusToPKPiPi
60-
};
61-
} // namespace hf_cand_sigmac
62-
6353
namespace hf_cand_b0
6454
{
6555
enum DecayType {

‎PWGHF/D2H/Tasks/taskSigmac.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -602,10 +602,10 @@ struct HfTaskSigmac {
602602
for (const auto& particle : mcParticlesSc) {
603603

604604
/// reject immediately particles different from Σc0,++
605-
bool const isSc0Gen = (std::abs(particle.flagMcMatchGen()) == BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi));
606-
bool const isScStar0Gen = (std::abs(particle.flagMcMatchGen()) == BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStar0ToPKPiPi));
607-
bool const isScPlusPlusGen = (std::abs(particle.flagMcMatchGen()) == BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi));
608-
bool const isScStarPlusPlusGen = (std::abs(particle.flagMcMatchGen()) == BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStarPlusPlusToPKPiPi));
605+
bool const isSc0Gen = (std::abs(particle.flagMcMatchGen()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi);
606+
bool const isScStar0Gen = (std::abs(particle.flagMcMatchGen()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStar0ToPKPiPi);
607+
bool const isScPlusPlusGen = (std::abs(particle.flagMcMatchGen()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi);
608+
bool const isScStarPlusPlusGen = (std::abs(particle.flagMcMatchGen()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStarPlusPlusToPKPiPi);
609609
if (!isSc0Gen && !isScPlusPlusGen && !isScStar0Gen && !isScStarPlusPlusGen) {
610610
continue;
611611
}
@@ -798,10 +798,10 @@ struct HfTaskSigmac {
798798

799799
// candidateLc.flagMcDecayChanRec();
800800

801-
bool const isTrueSc0Reco = std::abs(candSc.flagMcMatchRec()) == BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi);
802-
bool const isTrueScStar0Reco = std::abs(candSc.flagMcMatchRec()) == BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStar0ToPKPiPi);
803-
bool const isTrueScPlusPlusReco = std::abs(candSc.flagMcMatchRec()) == BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi);
804-
bool const isTrueScStarPlusPlusReco = std::abs(candSc.flagMcMatchRec()) == BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStarPlusPlusToPKPiPi);
801+
bool const isTrueSc0Reco = std::abs(candSc.flagMcMatchRec()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi;
802+
bool const isTrueScStar0Reco = std::abs(candSc.flagMcMatchRec()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStar0ToPKPiPi;
803+
bool const isTrueScPlusPlusReco = std::abs(candSc.flagMcMatchRec()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi;
804+
bool const isTrueScStarPlusPlusReco = std::abs(candSc.flagMcMatchRec()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStarPlusPlusToPKPiPi;
805805
int sigmacSpecies = -1;
806806
if ((isTrueSc0Reco || isTrueScStar0Reco) && (chargeSc == o2::aod::hf_cand_sigmac::ChargeNull)) {
807807
/// Reconstructed Σc0 signal

‎PWGHF/TableProducer/candidateCreatorSigmac0plusplus.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ struct HfCandidateSigmac0plusplusMc {
518518
/// look for Σc0(2455)
519519
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kSigmaC0, std::array{+kProton, -kKPlus, +kPiPlus, -kPiPlus}, true, &sign, 3);
520520
if (indexRec > -1) { /// due to (*) no need to check anything for LambdaC
521-
flag = sign * BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi);
521+
flag = sign * o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi;
522522
}
523523
auto particle = mcParticles.rawIteratorAt(indexRec);
524524
particleAntiparticle = isParticleAntiparticle(particle, Pdg::kSigmaC0);
@@ -527,7 +527,7 @@ struct HfCandidateSigmac0plusplusMc {
527527
if (flag == 0) {
528528
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kSigmaCStar0, std::array{+kProton, -kKPlus, +kPiPlus, -kPiPlus}, true, &sign, 3);
529529
if (indexRec > -1) { /// due to (*) no need to check anything for LambdaC
530-
flag = sign * BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStar0ToPKPiPi);
530+
flag = sign * o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStar0ToPKPiPi;
531531
}
532532
if (particleAntiparticle < 0) {
533533
auto particle = mcParticles.rawIteratorAt(indexRec);
@@ -545,7 +545,7 @@ struct HfCandidateSigmac0plusplusMc {
545545
/// look for Σc++(2455)
546546
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kSigmaCPlusPlus, std::array{+kProton, -kKPlus, +kPiPlus, +kPiPlus}, true, &sign, 3);
547547
if (indexRec > -1) { /// due to (*) no need to check anything for LambdaC
548-
flag = sign * BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi);
548+
flag = sign * o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi;
549549
}
550550
auto particle = mcParticles.rawIteratorAt(indexRec);
551551
particleAntiparticle = isParticleAntiparticle(particle, Pdg::kSigmaCPlusPlus);
@@ -554,7 +554,7 @@ struct HfCandidateSigmac0plusplusMc {
554554
if (flag == 0) {
555555
indexRec = RecoDecay::getMatchedMCRec(mcParticles, arrayDaughters, Pdg::kSigmaCStarPlusPlus, std::array{+kProton, -kKPlus, +kPiPlus, +kPiPlus}, true, &sign, 3);
556556
if (indexRec > -1) { /// due to (*) no need to check anything for LambdaC
557-
flag = sign * BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStarPlusPlusToPKPiPi);
557+
flag = sign * o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStarPlusPlusToPKPiPi;
558558
}
559559
if (particleAntiparticle < 0) {
560560
auto particle = mcParticles.rawIteratorAt(indexRec);
@@ -613,7 +613,7 @@ struct HfCandidateSigmac0plusplusMc {
613613
}
614614
if (std::abs(daughter.flagMcMatchGen()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::LcToPKPi) {
615615
/// Λc+ daughter decaying in pK-π+ found!
616-
flag = sign * BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi);
616+
flag = sign * o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi;
617617
particleAntiparticle = isParticleAntiparticle(particle, Pdg::kSigmaC0);
618618
break;
619619
}
@@ -627,7 +627,7 @@ struct HfCandidateSigmac0plusplusMc {
627627
}
628628
if (std::abs(daughter.flagMcMatchGen()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::LcToPKPi) {
629629
/// Λc+ daughter decaying in pK-π+ found!
630-
flag = sign * BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi);
630+
flag = sign * o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi;
631631
particleAntiparticle = isParticleAntiparticle(particle, Pdg::kSigmaCPlusPlus);
632632
break;
633633
}
@@ -645,7 +645,7 @@ struct HfCandidateSigmac0plusplusMc {
645645
}
646646
if (std::abs(daughter.flagMcMatchGen()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::LcToPKPi) {
647647
/// Λc+ daughter decaying in pK-π+ found!
648-
flag = sign * BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStar0ToPKPiPi);
648+
flag = sign * o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStar0ToPKPiPi;
649649
particleAntiparticle = isParticleAntiparticle(particle, Pdg::kSigmaCStar0);
650650
break;
651651
}
@@ -659,7 +659,7 @@ struct HfCandidateSigmac0plusplusMc {
659659
}
660660
if (std::abs(daughter.flagMcMatchGen()) == o2::hf_decay::hf_cand_3prong::DecayChannelMain::LcToPKPi) {
661661
/// Λc+ daughter decaying in pK-π+ found!
662-
flag = sign * BIT(o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStarPlusPlusToPKPiPi);
662+
flag = sign * o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStarPlusPlusToPKPiPi;
663663
particleAntiparticle = isParticleAntiparticle(particle, Pdg::kSigmaCStarPlusPlus);
664664
break;
665665
}

0 commit comments

Comments
 (0)