improve clarity in reduced tables for correlations

Author: apalasciano

PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h

@@ -47,16 +47,17 @@ using HfcRedCollision = HfcRedCollisions::iterator;
 
 namespace hf_candidate_reduced
 {
-DECLARE_SOA_INDEX_COLUMN(HfcRedCollision, hfcRedCollision); //! ReducedCollision index
-DECLARE_SOA_COLUMN(Prong0Id, prong0Id, int);                //! Prong 0 index
-DECLARE_SOA_COLUMN(Prong1Id, prong1Id, int);                //! Prong 1 index
-DECLARE_SOA_COLUMN(Prong2Id, prong2Id, int);                //! Prong2 index
-DECLARE_SOA_COLUMN(PhiCand, phiCand, float);                //! Phi of the candidate
-DECLARE_SOA_COLUMN(EtaCand, etaCand, float);                //! Eta of the candidate
-DECLARE_SOA_COLUMN(PtCand, ptCand, float);                  //! Pt of the candidate
-DECLARE_SOA_COLUMN(InvMass, invMass, float);                //! Invariant mass of charm candidate
-DECLARE_SOA_COLUMN(BdtScorePrompt, bdtScorePrompt, float);  //! BDT output score for prompt hypothesis
-DECLARE_SOA_COLUMN(BdtScoreBkg, bdtScoreBkg, float);        //! BDT output score for background hypothesis
+DECLARE_SOA_INDEX_COLUMN(HfcRedCollision, hfcRedCollision);      //! ReducedCollision index
+DECLARE_SOA_COLUMN(Prong0Id, prong0Id, int);                     //! Prong 0 index
+DECLARE_SOA_COLUMN(Prong1Id, prong1Id, int);                     //! Prong 1 index
+DECLARE_SOA_COLUMN(Prong2Id, prong2Id, int);                     //! Prong2 index
+DECLARE_SOA_COLUMN(PhiCand, phiCand, float);                     //! Phi of the candidate
+DECLARE_SOA_COLUMN(EtaCand, etaCand, float);                     //! Eta of the candidate
+DECLARE_SOA_COLUMN(PtCand, ptCand, float);                       //! Pt of the candidate
+DECLARE_SOA_COLUMN(InvMass, invMass, float);                     //! Invariant mass of charm candidate
+DECLARE_SOA_COLUMN(BdtScorePrompt, bdtScorePrompt, float);       //! BDT output score for prompt hypothesis
+DECLARE_SOA_COLUMN(BdtScoreNonPrompt, bdtScoreNonPrompt, float); //! BDT output score for non-prompt hypothesis
+DECLARE_SOA_COLUMN(BdtScoreBkg, bdtScoreBkg, float);             //! BDT output score for background hypothesis
 } // namespace hf_candidate_reduced
 DECLARE_SOA_TABLE(HcCandReduceds, "AOD", "HCCANDREDUCED", //! Table with charm hadron candidate info
                   soa::Index<>,
@@ -72,8 +73,9 @@ DECLARE_SOA_TABLE(HcCandReduceds, "AOD", "HCCANDREDUCED", //! Table with charm h
 DECLARE_SOA_TABLE(HcCandSelInfos, "AOD", "HCCANDSELINFO", //! Table with charm hadron candidate selection info
                   soa::Index<>,
                   aod::hf_candidate_reduced::HfcRedCollisionId,
+                  aod::hf_candidate_reduced::BdtScoreBkg,
                   aod::hf_candidate_reduced::BdtScorePrompt,
-                  aod::hf_candidate_reduced::BdtScoreBkg);
+                  aod::hf_candidate_reduced::BdtScoreNonPrompt);
 
 namespace hf_assoc_track_reduced
 {

PWGHF/HFC/TableProducer/correlatorDplusHadrons.cxx

@@ -569,7 +569,8 @@ struct HfCorrelatorDplusHadrons {
             outputMl[iclass] = candidate.mlProbDplusToPiKPi()[classMl->at(iclass)];
           }
           candReduced(indexHfcReducedCollision, candidate.phi(), candidate.eta(), candidate.pt(), HfHelper::invMassDplusToPiKPi(candidate), candidate.prong0Id(), candidate.prong1Id(), candidate.prong2Id());
-          candSelInfo(indexHfcReducedCollision, outputMl[0], outputMl[2]);
+          // Check compatibility with the candidate selector options: BdtScoreBkg, BdtScorePrompt, BdtScoreNonPrompt
+          candSelInfo(indexHfcReducedCollision, outputMl[0], outputMl[1], outputMl[2]);
         }
       }
 

PWGHF/HFC/TableProducer/correlatorDsHadrons.cxx

@@ -859,13 +859,14 @@ struct HfCorrelatorDsHadrons {
             outputMl[iclass] = candidate.mlProbDsToKKPi()[classMl->at(iclass)];
           }
           candReduced(indexHfcReducedCollision, candidate.phi(), candidate.eta(), candidate.pt() * chargeDs, HfHelper::invMassDsToKKPi(candidate), candidate.prong0Id(), candidate.prong1Id(), candidate.prong2Id());
-          candSelInfo(indexHfcReducedCollision, outputMl[0], outputMl[2]);
+          // Check compatibility with the candidate selector options; candSelInfo considers BdtScoreBkg, BdtScorePrompt, BdtScoreNonPrompt
+          candSelInfo(indexHfcReducedCollision, outputMl[2], outputMl[0], outputMl[1]); // bkg, prompt, non-prompt (Ds convention: outputMl[0] = prompt, outputMl[2] = bkg)
         } else if (candidate.isSelDsToPiKK() >= selectionFlagDs) {
           for (unsigned int iclass = 0; iclass < classMl->size(); iclass++) {
             outputMl[iclass] = candidate.mlProbDsToPiKK()[classMl->at(iclass)];
           }
           candReduced(indexHfcReducedCollision, candidate.phi(), candidate.eta(), candidate.pt() * chargeDs, HfHelper::invMassDsToPiKK(candidate), candidate.prong0Id(), candidate.prong1Id(), candidate.prong2Id());
-          candSelInfo(indexHfcReducedCollision, outputMl[0], outputMl[2]);
+          candSelInfo(indexHfcReducedCollision, outputMl[2], outputMl[0], outputMl[1]); // bkg, prompt, non-prompt (Ds convention: outputMl[0] = prompt, outputMl[2] = bkg)
         }
       }