Template utility class to unique table types

Author: vkucera

PWGHF/TableProducer/derivedDataCreatorBplusToD0Pi.cxx

@@ -44,7 +44,16 @@ using namespace o2::analysis::hf_derived;
 
 /// Writes the full information in an output TTree
 struct HfDerivedDataCreatorBplusToD0Pi {
-  ProducesHfDerivedData rowsCommon;
+  ProducesHfDerivedData<
+    o2::aod::HfBplusBases,
+    o2::aod::HfBplusCollBases,
+    o2::aod::HfBplusCollIds,
+    o2::aod::HfBplusMcCollBases,
+    o2::aod::HfBplusMcCollIds,
+    o2::aod::HfBplusMcRCollIds,
+    o2::aod::HfBplusPBases,
+    o2::aod::HfBplusPIds
+  > rowsCommon;
   // Candidates
   Produces<o2::aod::HfBplusPars> rowCandidatePar;
   Produces<o2::aod::HfBplusParD0s> rowCandidateParD0;
@@ -60,6 +69,7 @@ struct HfDerivedDataCreatorBplusToD0Pi {
   Configurable<bool> fillCandidatePar{"fillCandidatePar", true, "Fill candidate parameters"};
   Configurable<bool> fillCandidateParD0{"fillCandidateParD0", true, "Fill D0 candidate parameters"};
   Configurable<bool> fillCandidateParE{"fillCandidateParE", true, "Fill candidate extended parameters"};
+  Configurable<bool> fillCandidateSel{"fillCandidateSel", true, "Fill candidate selection flags"};
   Configurable<bool> fillCandidateMl{"fillCandidateMl", true, "Fill candidate selection ML scores"};
   Configurable<bool> fillCandidateMlD0{"fillCandidateMlD0", true, "Fill D0 candidate selection ML scores"};
   Configurable<bool> fillCandidateId{"fillCandidateId", true, "Fill original indices from the candidate table"};

PWGHF/TableProducer/derivedDataCreatorD0ToKPi.cxx

@@ -44,7 +44,16 @@ using namespace o2::analysis::hf_derived;
 
 /// Writes the full information in an output TTree
 struct HfDerivedDataCreatorD0ToKPi {
-  ProducesHfDerivedData rowsCommon;
+  ProducesHfDerivedData<
+    o2::aod::HfD0Bases,
+    o2::aod::HfD0CollBases,
+    o2::aod::HfD0CollIds,
+    o2::aod::HfD0McCollBases,
+    o2::aod::HfD0McCollIds,
+    o2::aod::HfD0McRCollIds,
+    o2::aod::HfD0PBases,
+    o2::aod::HfD0PIds
+  > rowsCommon;
   // Candidates
   Produces<o2::aod::HfD0Pars> rowCandidatePar;
   Produces<o2::aod::HfD0ParEs> rowCandidateParE;

PWGHF/TableProducer/derivedDataCreatorLcToPKPi.cxx

@@ -42,7 +42,16 @@ using namespace o2::analysis::hf_derived;
 
 /// Writes the full information in an output TTree
 struct HfDerivedDataCreatorLcToPKPi {
-  ProducesHfDerivedData rowsCommon;
+  ProducesHfDerivedData<
+    o2::aod::HfLcBases,
+    o2::aod::HfLcCollBases,
+    o2::aod::HfLcCollIds,
+    o2::aod::HfLcMcCollBases,
+    o2::aod::HfLcMcCollIds,
+    o2::aod::HfLcMcRCollIds,
+    o2::aod::HfLcPBases,
+    o2::aod::HfLcPIds
+  > rowsCommon;
   // Candidates
   Produces<o2::aod::HfLcPars> rowCandidatePar;
   Produces<o2::aod::HfLcParEs> rowCandidateParE;

PWGHF/Utils/utilsDerivedData.h

@@ -64,19 +64,29 @@ struct ConfigurableHfDerivedData : o2::framework::ConfigurableGroup {
   o2::framework::Configurable<bool> fillParticleId{"fillParticleId", true, "Fill original MC indices"};
 };
 
+template <
+  typename HfBases,
+  typename HfCollBases,
+  typename HfCollIds,
+  typename HfMcCollBases,
+  typename HfMcCollIds,
+  typename HfMcRCollIds,
+  typename HfPBases,
+  typename HfPIds
+>
 struct ProducesHfDerivedData : o2::framework::ProducesGroup {
   // Candidates
-  o2::framework::Produces<o2::aod::HfBases> rowCandidateBase;
+  o2::framework::Produces<HfBases> rowCandidateBase;
   // Collisions
-  o2::framework::Produces<o2::aod::HfCollBases> rowCollBase;
-  o2::framework::Produces<o2::aod::HfCollIds> rowCollId;
+  o2::framework::Produces<HfCollBases> rowCollBase;
+  o2::framework::Produces<HfCollIds> rowCollId;
   // MC collisions
-  o2::framework::Produces<o2::aod::HfMcCollBases> rowMcCollBase;
-  o2::framework::Produces<o2::aod::HfMcCollIds> rowMcCollId;
-  o2::framework::Produces<o2::aod::HfMcRCollIds> rowMcRCollId;
+  o2::framework::Produces<HfMcCollBases> rowMcCollBase;
+  o2::framework::Produces<HfMcCollIds> rowMcCollId;
+  o2::framework::Produces<HfMcRCollIds> rowMcRCollId;
   // MC particles
-  o2::framework::Produces<o2::aod::HfPBases> rowParticleBase;
-  o2::framework::Produces<o2::aod::HfPIds> rowParticleId;
+  o2::framework::Produces<HfPBases> rowParticleBase;
+  o2::framework::Produces<HfPIds> rowParticleId;
 
   ConfigurableHfDerivedData const* conf;
   std::map<int, std::vector<int>> matchedCollisions; // indices of derived reconstructed collisions matched to the global indices of MC collisions
@@ -165,7 +175,8 @@ struct ProducesHfDerivedData : o2::framework::ProducesGroup {
       rowMcCollBase(
         mcCollision.posX(),
         mcCollision.posY(),
-        mcCollision.posZ());
+        mcCollision.posZ(),
+        mcCollision.centFT0M());
     }
     if (conf->fillMcCollId.value) {
       rowMcCollId(