[PWGJE] Fixing O2 build errors in jetCorrelationD0

PWGJE/Tasks/jetCorrelationD0.cxx

@@ -33,13 +33,12 @@
 
 #include <Rtypes.h>
 
+#include <cmath>
 #include <cstdint>
 #include <cstdlib>
 #include <string>
 #include <vector>
 
-#include <math.h>
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -86,8 +85,7 @@ DECLARE_SOA_COLUMN(D0MD, d0MD, float);
 DECLARE_SOA_COLUMN(D0PtD, d0PtD, float);
 DECLARE_SOA_COLUMN(D0EtaD, d0EtaD, float);
 DECLARE_SOA_COLUMN(D0PhiD, d0PhiD, float);
-DECLARE_SOA_COLUMN(D0MatchedFrom, d0MatchedFrom, int);
-DECLARE_SOA_COLUMN(D0SelectedAs, d0SelectedAs, int);
+DECLARE_SOA_COLUMN(D0Category, d0Category, int);
 DECLARE_SOA_COLUMN(D0DecayChannel, d0DecayChannel, int8_t);
 } // namespace d0Info
 
@@ -114,9 +112,7 @@ DECLARE_SOA_TABLE(D0McDTables, "AOD", "D0MCDTABLE",
                   d0Info::D0Eta,
                   d0Info::D0Phi,
                   d0Info::D0Y,
-                  d0Info::D0MatchedFrom,
-                  d0Info::D0SelectedAs,
-                  d0Info::D0DecayChannel);
+                  d0Info::D0Category);
 
 DECLARE_SOA_TABLE(D0McPTables, "AOD", "D0MCPTABLE",
                   o2::soa::Index<>,
@@ -357,17 +353,36 @@ struct JetCorrelationD0 {
 
       int matchedFrom = 0;
       int selectedAs = 0;
+      int category = -1; // -1 undefined, 0 signal, 1 reflection, 2-5 correlated backgrounds
+      constexpr int kD0ToKPi = 1;
+      constexpr int kD0ToKPiPi = 2;
+      constexpr int kD0ToPiPi = 3;
+      constexpr int kD0ToPiPiPi = 4;
+      constexpr int kD0ToKK = 5;
 
       if (d0DecayChannel > 0) { // matched to a D0 on truth level (any channel)
         matchedFrom = 1;
       } else if (d0DecayChannel < 0) { // matched to a D0bar on truth level (any channel)
         matchedFrom = -1;
       }
-      if (d0Candidate.candidateSelFlag() & BIT(0)) { // CandidateSelFlag == BIT(0) -> selected as D0
+      if ((d0Candidate.candidateSelFlag() & BIT(0)) != 0) { // CandidateSelFlag == BIT(0) -> selected as D0
         selectedAs = 1;
-      } else if (d0Candidate.candidateSelFlag() & BIT(1)) { // CandidateSelFlag == BIT(1) -> selected as D0bar
+      } else if ((d0Candidate.candidateSelFlag() & BIT(1)) != 0) { // CandidateSelFlag == BIT(1) -> selected as D0bar
         selectedAs = -1;
       }
+      if ((std::abs(d0DecayChannel) == kD0ToKPi) && (matchedFrom != 0) && (selectedAs == matchedFrom)) {
+        category = 0; // signal -> D0 or D0bar, π+ K−
+      } else if ((d0DecayChannel == kD0ToKPi) && (selectedAs == -1 * matchedFrom)) {
+        category = 1; // reflection
+      } else if (d0DecayChannel == kD0ToKPiPi) {
+        category = 2; // corr bkg: π+ K− π0
+      } else if (d0DecayChannel == kD0ToPiPi) {
+        category = 3; // corr bkg: π+ π−
+      } else if (d0DecayChannel == kD0ToPiPiPi) {
+        category = 4; // corr bkg: π+ π− π0
+      } else if (d0DecayChannel == kD0ToKK) {
+        category = 5; // corr bkg: K+ K−
+      }
 
       tableD0McDetector(tableCollision.lastIndex(), // might want to add some more detector level D0 quantities like prompt or non prompt info
                         scores[2],
@@ -378,9 +393,7 @@ struct JetCorrelationD0 {
                         d0Candidate.eta(),
                         d0Candidate.phi(),
                         d0Candidate.y(),
-                        matchedFrom,
-                        selectedAs,
-                        d0DecayChannel);
+                        category);
       for (const auto& jet : jets) {
         if (jet.pt() < jetPtCutMin) {
           continue;