Move to central decay table

Author: fchinu

PWGHF/D2H/TableProducer/candidateCreatorBToJpsiReduced.cxx

@@ -401,7 +401,7 @@ struct HfCandidateCreatorBToJpsiReduced {
 }; // struct
 
 /// Extends the table base with expression columns and performs MC matching.
-struct HfCandidateCreatorBplusToJpsiReducedExpressions {
+struct HfCandidateCreatorBToJpsiReducedExpressions {
   Spawns<aod::HfCandBpJPExt> rowCandidateBPlus;
   Spawns<aod::HfCandBsJPExt> rowCandidateBs;
   Spawns<aod::HfRedBach0Ext> rowTracksExt0;
@@ -449,17 +449,17 @@ struct HfCandidateCreatorBplusToJpsiReducedExpressions {
   {
     fillMcRec<DecayChannel::BplusToJpsiK>(rowsJpsiKMcRec, candsBplus);
   }
-  PROCESS_SWITCH(HfCandidateCreatorBplusToJpsiReducedExpressions, processMcBPlus, "Process MC", false);
+  PROCESS_SWITCH(HfCandidateCreatorBToJpsiReducedExpressions, processMcBPlus, "Process MC", false);
 
   void processMcBs(HfMcRecRedJPPhis const& rowsJpsiPhiMcRec, HfRedBs2JpsiDaus const& Bs)
   {
     fillMcRec<DecayChannel::BsToJpsiPhi>(rowsJpsiPhiMcRec, Bs);
   }
-  PROCESS_SWITCH(HfCandidateCreatorBplusToJpsiReducedExpressions, processMcBs, "Process MC", false);
+  PROCESS_SWITCH(HfCandidateCreatorBToJpsiReducedExpressions, processMcBs, "Process MC", false);
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{adaptAnalysisTask<HfCandidateCreatorBToJpsiReduced>(cfgc),
-                      adaptAnalysisTask<HfCandidateCreatorBplusToJpsiReducedExpressions>(cfgc)};
+                      adaptAnalysisTask<HfCandidateCreatorBToJpsiReducedExpressions>(cfgc)};
 }

PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx

@@ -416,7 +416,7 @@ struct HfDataCreatorJpsiHadReduced {
           indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(particlesMc, std::array{vecDaughtersB[0], vecDaughtersB[1]}, Pdg::kJPsi, std::array{-kElectron, +kElectron}, true, &sign, 1);
         }
         if (indexRec > -1) {
-          flag = sign * BIT(static_cast<uint8_t>(hf_cand_bplus::DecayTypeBToJpsiMc::BplusToJpsiKToMuMuK));
+          flag = sign * o2::hf_decay::hf_cand_beauty::BplusToJpsiK;
         } else {
           debug = 1;
           LOGF(debug, "B+ decays in the expected final state but the condition on the intermediate state is not fulfilled");
@@ -448,7 +448,7 @@ struct HfDataCreatorJpsiHadReduced {
         if (indexRec > -1) {
           indexRec = RecoDecay::getMatchedMCRec<false, false, false, true, true>(particlesMc, std::array{vecDaughtersB[2], vecDaughtersB[3]}, Pdg::kPhi, std::array{-kKPlus, +kKPlus}, true, &sign, 1);
           if (indexRec > -1) {
-            flag = sign * BIT(static_cast<uint8_t>(hf_cand_bs::DecayTypeBToJpsiMc::BsToJpsiPhiToMuMuKK));
+            flag = sign * o2::hf_decay::hf_cand_beauty::BsToJpsiPhi;
           } else {
             debug = 1;
             LOGF(debug, "Bs decays in the expected final state but the condition on the phi intermediate state is not fulfilled");

PWGHF/D2H/Tasks/taskBplusToJpsiKReduced.cxx

@@ -309,7 +309,7 @@ struct HfTaskBplusToJpsiKReduced {
     if constexpr (doMc) {
       flagMcMatchRec = candidate.flagMcMatchRec();
       flagWrongCollision = candidate.flagWrongCollision();
-      isSignal = TESTBIT(std::abs(flagMcMatchRec), static_cast<int>(hf_cand_bplus::DecayTypeBToJpsiMc::BplusToJpsiKToMuMuK));
+      isSignal = std::abs(flagMcMatchRec) == o2::hf_decay::hf_cand_beauty::BplusToJpsiK;
     }
 
     SETBIT(statusBplus, SelectionStep::RecoSkims);

PWGHF/D2H/Tasks/taskBsToJpsiPhiReduced.cxx

@@ -339,7 +339,7 @@ struct HfTaskBsToJpsiPhiReduced {
     if constexpr (doMc) {
       flagMcMatchRec = candidate.flagMcMatchRec();
       flagWrongCollision = candidate.flagWrongCollision();
-      isSignal = TESTBIT(std::abs(flagMcMatchRec), static_cast<int>(hf_cand_bs::DecayTypeBToJpsiMc::BsToJpsiPhiToMuMuKK));
+      isSignal = flagMcMatchRec == o2::hf_decay::hf_cand_beauty::BsToJpsiPhi;
     }
 
     SETBIT(statusBs, SelectionStep::RecoSkims);