PWGHF: unify data creators for B hadrons (#4891)

* PWGHF: unify data creators for B hadrons

* Reorder init and remove unwanted columns in collision table for Ds resonances

* Please consider the following formatting changes

* Fix typo

* Fix std vector copy

---------

Co-authored-by: ALICE Action Bot <alibuild@cern.ch>

Author: fgrosa

PWGHF/D2H/DataModel/ReducedDataModel.h

@@ -42,10 +42,13 @@ DECLARE_SOA_COLUMN(OriginalCollisionCount, originalCollisionCount, int); //! Siz
 } // namespace hf_reduced_collision
 
 DECLARE_SOA_TABLE(HfRedCollisions, "AOD", "HFREDCOLLISION", //! Table with collision for reduced workflow
-                  soa::Index<>,
+                  o2::soa::Index<>,
                   collision::PosX,
                   collision::PosY,
                   collision::PosZ,
+                  o2::soa::Marker<1>);
+
+DECLARE_SOA_TABLE(HfRedCollExtras, "AOD", "HFREDCOLLEXTRA", //! Table with collision extras for reduced workflow
                   collision::CovXX,
                   collision::CovXY,
                   collision::CovYY,
@@ -147,12 +150,15 @@ using HfRedTracks = HfRedTracksExt;
 
 namespace hf_charm_cand_reduced
 {
-DECLARE_SOA_COLUMN(InvMass, invMass, float);                   //! Invariant mass of 2prong candidate in GeV/c2
-DECLARE_SOA_COLUMN(InvMassD0, invMassD0, float);               //! Invariant mass of 2prong candidate in GeV/c2
-DECLARE_SOA_COLUMN(InvMassD0Bar, invMassD0Bar, float);         //! Invariant mass of 2prong candidate in GeV/c2
-DECLARE_SOA_COLUMN(MlScoreBkg, mlScoreBkg, float);             //! ML score for background class
-DECLARE_SOA_COLUMN(MlScorePrompt, mlScorePrompt, float);       //! ML score for prompt class
-DECLARE_SOA_COLUMN(MlScoreNonprompt, mlScoreNonprompt, float); //! ML score for non-prompt class
+DECLARE_SOA_COLUMN(InvMass, invMass, float);                                     //! Invariant mass of 2prong candidate in GeV/c2
+DECLARE_SOA_COLUMN(InvMassD0, invMassD0, float);                                 //! Invariant mass of 2prong candidate in GeV/c2
+DECLARE_SOA_COLUMN(InvMassD0Bar, invMassD0Bar, float);                           //! Invariant mass of 2prong candidate in GeV/c2
+DECLARE_SOA_COLUMN(MlScoreBkgMassHypo0, mlScoreBkgMassHypo0, float);             //! ML score for background class (mass hypothesis 0)
+DECLARE_SOA_COLUMN(MlScorePromptMassHypo0, mlScorePromptMassHypo0, float);       //! ML score for prompt class (mass hypothesis 0)
+DECLARE_SOA_COLUMN(MlScoreNonpromptMassHypo0, mlScoreNonpromptMassHypo0, float); //! ML score for non-prompt class (mass hypothesis 0)
+DECLARE_SOA_COLUMN(MlScoreBkgMassHypo1, mlScoreBkgMassHypo1, float);             //! ML score for background class (mass hypothesis 1)
+DECLARE_SOA_COLUMN(MlScorePromptMassHypo1, mlScorePromptMassHypo1, float);       //! ML score for prompt class (mass hypothesis 1)
+DECLARE_SOA_COLUMN(MlScoreNonpromptMassHypo1, mlScoreNonpromptMassHypo1, float); //! ML score for non-prompt class (mass hypothesis 1)
 } // namespace hf_charm_cand_reduced
 
 // CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
@@ -174,9 +180,12 @@ DECLARE_SOA_TABLE(HfRed2ProngsCov, "AOD", "HFRED2PRONGSCOV", //! Table with 2pro
                   o2::soa::Marker<1>);
 
 DECLARE_SOA_TABLE(HfRed2ProngsMl, "AOD", "HFRED2PRONGML", //! Table with 2prong candidate ML scores
-                  hf_charm_cand_reduced::MlScoreBkg,
-                  hf_charm_cand_reduced::MlScorePrompt,
-                  hf_charm_cand_reduced::MlScoreNonprompt);
+                  hf_charm_cand_reduced::MlScoreBkgMassHypo0,
+                  hf_charm_cand_reduced::MlScorePromptMassHypo0,
+                  hf_charm_cand_reduced::MlScoreNonpromptMassHypo0,
+                  hf_charm_cand_reduced::MlScoreBkgMassHypo1,
+                  hf_charm_cand_reduced::MlScorePromptMassHypo1,
+                  hf_charm_cand_reduced::MlScoreNonpromptMassHypo1);
 
 // CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
 // to call DECLARE_SOA_INDEX_COLUMN_FULL later on
@@ -197,10 +206,9 @@ DECLARE_SOA_TABLE(HfRed3ProngsCov, "AOD", "HFRED3PRONGSCOV", //! Table with 3pro
                   o2::soa::Marker<2>);
 
 DECLARE_SOA_TABLE(HfRed3ProngsMl, "AOD", "HFRED3PRONGML", //! Table with 3prong candidate ML scores
-                  hf_charm_cand_reduced::MlScoreBkg,
-                  hf_charm_cand_reduced::MlScorePrompt,
-                  hf_charm_cand_reduced::MlScoreNonprompt,
-                  o2::soa::Marker<1>);
+                  hf_charm_cand_reduced::MlScoreBkgMassHypo0,
+                  hf_charm_cand_reduced::MlScorePromptMassHypo0,
+                  hf_charm_cand_reduced::MlScoreNonpromptMassHypo0);
 
 // Beauty candidates prongs
 namespace hf_cand_b0_reduced

PWGHF/D2H/TableProducer/CMakeLists.txt

@@ -35,13 +35,8 @@ o2physics_add_dpl_workflow(candidate-selector-bplus-to-d0-pi-reduced
 
 # Data creators
 
-o2physics_add_dpl_workflow(data-creator-d0-pi-reduced
-                    SOURCES dataCreatorD0PiReduced.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
-                    COMPONENT_NAME Analysis)
-
-o2physics_add_dpl_workflow(data-creator-dplus-pi-reduced
-                    SOURCES dataCreatorDplusPiReduced.cxx
+o2physics_add_dpl_workflow(data-creator-charm-had-pi-reduced
+                    SOURCES dataCreatorCharmHadPiReduced.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
                     COMPONENT_NAME Analysis)
 

PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx

@@ -58,6 +58,8 @@ struct HfCandidateCreatorB0Reduced {
 
   o2::vertexing::DCAFitterN<2> df2; // fitter for B vertex (2-prong vertex fitter)
 
+  using HfRedCollisionsWithExtras = soa::Join<aod::HfRedCollisions, aod::HfRedCollExtras>;
+
   Preslice<soa::Join<aod::HfRed3Prongs, aod::HfRed3ProngsCov>> candsDPerCollision = hf_track_index_reduced::hfRedCollisionId;
   Preslice<soa::Join<aod::HfRed3Prongs, aod::HfRed3ProngsCov, aod::HfRed3ProngsMl>> candsDWithMlPerCollision = hf_track_index_reduced::hfRedCollisionId;
   Preslice<soa::Join<aod::HfRedTrackBases, aod::HfRedTracksCov>> tracksPionPerCollision = hf_track_index_reduced::hfRedCollisionId;
@@ -99,8 +101,8 @@ struct HfCandidateCreatorB0Reduced {
   /// \param tracksPionThisCollision pion tracks in this collision
   /// \param invMass2DPiMin minimum B0 invariant-mass
   /// \param invMass2DPiMax maximum B0 invariant-mass
-  template <bool withDmesMl, typename Cands, typename Pions>
-  void runCandidateCreation(aod::HfRedCollisions::iterator const& collision,
+  template <bool withDmesMl, typename Cands, typename Pions, typename Coll>
+  void runCandidateCreation(Coll const& collision,
                             Cands const& candsDThisColl,
                             Pions const& tracksPionThisCollision,
                             const float& invMass2DPiMin,
@@ -181,13 +183,13 @@ struct HfCandidateCreatorB0Reduced {
         rowCandidateProngs(candD.globalIndex(), trackPion.globalIndex());
 
         if constexpr (withDmesMl) {
-          rowCandidateDmesMlScores(candD.mlScoreBkg(), candD.mlScorePrompt(), candD.mlScoreNonprompt());
+          rowCandidateDmesMlScores(candD.mlScoreBkgMassHypo0(), candD.mlScorePromptMassHypo0(), candD.mlScoreNonpromptMassHypo0());
         }
       } // pi loop
     }   // D loop
   }
 
-  void processData(aod::HfRedCollisions const& collisions,
+  void processData(HfRedCollisionsWithExtras const& collisions,
                    soa::Join<aod::HfRed3Prongs, aod::HfRed3ProngsCov> const& candsD,
                    soa::Join<aod::HfRedTrackBases, aod::HfRedTracksCov> const& tracksPion,
                    aod::HfOrigColCounts const& collisionsCounter,
@@ -221,7 +223,7 @@ struct HfCandidateCreatorB0Reduced {
 
   PROCESS_SWITCH(HfCandidateCreatorB0Reduced, processData, "Process data without any ML score", true);
 
-  void processDataWithDmesMl(aod::HfRedCollisions const& collisions,
+  void processDataWithDmesMl(HfRedCollisionsWithExtras const& collisions,
                              soa::Join<aod::HfRed3Prongs, aod::HfRed3ProngsCov, aod::HfRed3ProngsMl> const& candsD,
                              soa::Join<aod::HfRedTrackBases, aod::HfRedTracksCov> const& tracksPion,
                              aod::HfOrigColCounts const& collisionsCounter,

PWGHF/D2H/TableProducer/candidateCreatorBplusReduced.cxx

@@ -56,6 +56,8 @@ struct HfCandidateCreatorBplusReduced {
   double bz{0.};
   o2::vertexing::DCAFitterN<2> df2; // fitter for B vertex (2-prong vertex fitter)
 
+  using HfRedCollisionsWithExtras = soa::Join<aod::HfRedCollisions, aod::HfRedCollExtras>;
+
   Preslice<soa::Join<aod::HfRed2Prongs, aod::HfRed2ProngsCov>> candsDPerCollision = hf_track_index_reduced::hfRedCollisionId;
   Preslice<soa::Join<aod::HfRedTracks, aod::HfRedTracksCov>> tracksPionPerCollision = hf_track_index_reduced::hfRedCollisionId;
 
@@ -84,7 +86,7 @@ struct HfCandidateCreatorBplusReduced {
     registry.add("hEvents", "Events;;entries", HistType::kTH1F, {{1, 0.5, 1.5}});
   }
 
-  void process(aod::HfRedCollisions const& collisions,
+  void process(HfRedCollisionsWithExtras const& collisions,
                soa::Join<aod::HfRed2Prongs, aod::HfRed2ProngsCov> const& candsD,
                soa::Join<aod::HfRedTrackBases, aod::HfRedTracksCov> const& tracksPion,
                aod::HfOrigColCounts const& collisionsCounter,