Remove again legacy channels and fix HFC code.

Author: mfaggin

PWGHF/Core/DecayChannelsLegacy.h

@@ -50,16 +50,6 @@ enum DecayType {
 };
 } // namespace hf_cand_dstar
 
-namespace hf_cand_sigmac
-{
-enum DecayType {
-  Sc0ToPKPiPi = 0,
-  ScplusplusToPKPiPi,
-  ScStar0ToPKPiPi,
-  ScStarPlusPlusToPKPiPi
-};
-} // namespace hf_cand_sigmac
-
 namespace hf_cand_b0
 {
 enum DecayType {

PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx

@@ -829,8 +829,8 @@ struct HfCorrelatorLcScHadrons {
           //   (TESTBIT(std::abs(candidate.flagMcMatchRec()), aod::hf_cand_sigmac::DecayType::Sc0ToPKPiPi) && chargeCand == 0) ||
           //   (TESTBIT(std::abs(candidate.flagMcMatchRec()), aod::hf_cand_sigmac::DecayType::ScplusplusToPKPiPi) && std::abs(chargeCand) == 2);
           isSignal =
-            (std::abs(candidate.flagMcMatchRec()) == (1 << aod::hf_cand_sigmac::DecayType::Sc0ToPKPiPi) && chargeCand == ChargeZero) ||
-            (std::abs(candidate.flagMcMatchRec()) == (1 << aod::hf_cand_sigmac::DecayType::ScplusplusToPKPiPi) && std::abs(chargeCand) == ChargeScPlusPlus);
+            (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi && chargeCand == ChargeZero) ||
+            (std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi && std::abs(chargeCand) == ChargeScPlusPlus);
 
           auto trackPos1 = candidateLc.template prong0_as<aod::TracksWMc>();
           auto trackPos2 = candidateLc.template prong2_as<aod::TracksWMc>();
@@ -1057,8 +1057,8 @@ struct HfCorrelatorLcScHadrons {
           }
           if constexpr (IsMcRec) {
             isSignal =
-              (TESTBIT(std::abs(candidate.flagMcMatchRec()), aod::hf_cand_sigmac::DecayType::Sc0ToPKPiPi) && chargeCand == ChargeZero) ||
-              (TESTBIT(std::abs(candidate.flagMcMatchRec()), aod::hf_cand_sigmac::DecayType::ScplusplusToPKPiPi) && std::abs(chargeCand) == ChargeScPlusPlus);
+              ((std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi) && chargeCand == ChargeZero) ||
+              ((std::abs(candidate.flagMcMatchRec()) == o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi) && std::abs(chargeCand) == ChargeScPlusPlus);
             signSoftPion = candidate.template prong1_as<aod::TracksWMc>().sign();
           } else {
             signSoftPion = candidate.template prong1_as<aod::Tracks>().sign();

PWGHF/HFC/Utils/utilsCorrelations.h

@@ -162,22 +162,22 @@ bool matchCandAndMass(McParticleType const& particle, double& massCand)
 
   // Map decay type to mass
   switch (matchGenFlag) {
-    case BIT(aod::hf_cand_sigmac::DecayType::Sc0ToPKPiPi): {
+    case o2::hf_decay::hf_cand_sigmac::DecayChannelMain::Sc0ToPKPiPi: {
       massCand = o2::constants::physics::MassSigmaC0;
       return true;
     }
 
-    case BIT(aod::hf_cand_sigmac::DecayType::ScStar0ToPKPiPi): {
+    case o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStar0ToPKPiPi: {
       massCand = o2::constants::physics::MassSigmaCStar0;
       return true;
     }
 
-    case BIT(aod::hf_cand_sigmac::DecayType::ScplusplusToPKPiPi): {
+    case o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScplusplusToPKPiPi: {
       massCand = o2::constants::physics::MassSigmaCPlusPlus;
       return true;
     }
 
-    case BIT(aod::hf_cand_sigmac::DecayType::ScStarPlusPlusToPKPiPi): {
+    case o2::hf_decay::hf_cand_sigmac::DecayChannelMain::ScStarPlusPlusToPKPiPi: {
       massCand = o2::constants::physics::MassSigmaCStarPlusPlus;
       return true;
     }