diff --git a/docs/datamodel/joinsAndIterators.md b/docs/datamodel/joinsAndIterators.md
index a7d0d9e9..d22df9e1 100644
--- a/docs/datamodel/joinsAndIterators.md
+++ b/docs/datamodel/joinsAndIterators.md
@@ -4,6 +4,7 @@ title: Joins and iterators
 ---
 
 <a name="Joins"></a>
+
 # List of joins and iterators
 
 The data model provides in addition to the set of tables also some predefined joines which are listed below.
@@ -1346,6 +1347,20 @@ Click on the labels to display the definitions. Click buttons to
     </ul>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::ReducedMFTExtra</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::ReducedMFTExtra = o2::aod::ReducedMFTsExtra::iterator</li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::ReducedMFTLabel</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::ReducedMFTLabel = o2::aod::ReducedMFTLabels::iterator</li>
+    </ul>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::ReducedMuon</button>
   <div class="panel">
     <ul>
@@ -2298,6 +2313,13 @@ Click on the labels to display the definitions. Click buttons to
     </ul>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::HfcRedCollision</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::HfcRedCollision = o2::aod::HfcRedCollisions::iterator</li>
+    </ul>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::HfDstarsWithPvRefitInfo</button>
   <div class="panel">
     <ul>
@@ -5308,6 +5330,13 @@ Click on the labels to display the definitions. Click buttons to
     </ul>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::StraMCCollisions</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::StraMCCollisions = o2::aod::StraMCCollisions_001</li>
+    </ul>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::StraMCCollision</button>
   <div class="panel">
     <ul>
@@ -5847,6 +5876,20 @@ Click on the labels to display the definitions. Click buttons to
     </ul>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::SGEvent</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::SGEvent = o2::aod::SGEvents::iterator</li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::SGTrack</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::SGTrack = o2::aod::SGTracks::iterator</li>
+    </ul>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::UDMcCollision</button>
   <div class="panel">
     <ul>
@@ -5903,6 +5946,13 @@ Click on the labels to display the definitions. Click buttons to
     </ul>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::UDCollisionSelExtra</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::UDCollisionSelExtra = o2::aod::UDCollisionSelExtras::iterator</li>
+    </ul>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::UDCollsLabel</button>
   <div class="panel">
     <ul>
@@ -6183,6 +6233,69 @@ Click on the labels to display the definitions. Click buttons to
     </ul>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::pidits::ITSNSigmaEl</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::pidits::ITSNSigmaEl = o2::ITSNSigmaElImp<o2::aod::track::ITSClusterSizes,o2::aod::track::P></li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::pidits::ITSNSigmaMu</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::pidits::ITSNSigmaMu = o2::ITSNSigmaMuImp<o2::aod::track::ITSClusterSizes,o2::aod::track::P></li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::pidits::ITSNSigmaPi</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::pidits::ITSNSigmaPi = o2::ITSNSigmaPiImp<o2::aod::track::ITSClusterSizes,o2::aod::track::P></li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::pidits::ITSNSigmaKa</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::pidits::ITSNSigmaKa = o2::ITSNSigmaKaImp<o2::aod::track::ITSClusterSizes,o2::aod::track::P></li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::pidits::ITSNSigmaPr</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::pidits::ITSNSigmaPr = o2::ITSNSigmaPrImp<o2::aod::track::ITSClusterSizes,o2::aod::track::P></li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::pidits::ITSNSigmaDe</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::pidits::ITSNSigmaDe = o2::ITSNSigmaDeImp<o2::aod::track::ITSClusterSizes,o2::aod::track::P></li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::pidits::ITSNSigmaTr</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::pidits::ITSNSigmaTr = o2::ITSNSigmaTrImp<o2::aod::track::ITSClusterSizes,o2::aod::track::P></li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::pidits::ITSNSigmaHe</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::pidits::ITSNSigmaHe = o2::ITSNSigmaHeImp<o2::aod::track::ITSClusterSizes,o2::aod::track::P></li>
+    </ul>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::pidits::ITSNSigmaAl</button>
+  <div class="panel">
+    <ul>
+        <li>o2::aod::pidits::ITSNSigmaAl = o2::ITSNSigmaAlImp<o2::aod::track::ITSClusterSizes,o2::aod::track::P></li>
+    </ul>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-map-pin"></i> o2::aod::femtodreamcollision::BitMaskType</button>
   <div class="panel">
     <ul>
diff --git a/docs/datamodel/pwgTables.md b/docs/datamodel/pwgTables.md
index 3e3f9d21..06eb80ac 100644
--- a/docs/datamodel/pwgTables.md
+++ b/docs/datamodel/pwgTables.md
@@ -4,7 +4,8 @@ title: PWG tables
 ---
 
 <a name="PWGs"></a>
-# List of tables defined by PWG specific tasks.
+
+# List of tables defined by PWG specific tasks
 
 Click on the labels to display the table content. Click buttons to
 <button class="openTables">show</button> / <button class="closeTables">close</button> all tables.
@@ -13,19 +14,22 @@ Click on the labels to display the table content. Click buttons to
 
 ## PWG-CF
 
-###  o2-analysis-cf-meanpt-fluctuations
+### o2-analysis-cf-meanpt-fluctuations
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/EbyEFluctuations/Tasks//MeanptFluctuations.cxx" target="_blank">MeanptFluctuations.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-cf-netproton-cumulants
+### o2-analysis-cf-netproton-cumulants
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/EbyEFluctuations/Tasks//NetProtonCumulants.cxx" target="_blank">NetProtonCumulants.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-cf-single-track-selector
+### o2-analysis-cf-single-track-selector
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/Femto3D/TableProducer//singleTrackSelector.cxx" target="_blank">singleTrackSelector.cxx</a>
 <div>
 
@@ -240,13 +244,15 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-single-track-selector-extra
+### o2-analysis-cf-single-track-selector-extra
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/Femto3D/TableProducer//singleTrackSelectorExtra.cxx" target="_blank">singleTrackSelectorExtra.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-cf-femtodream-producer-reduced
+### o2-analysis-cf-femtodream-producer-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/FemtoDream/TableProducer//femtoDreamProducerReducedTask.cxx" target="_blank">femtoDreamProducerReducedTask.cxx</a>
 <div>
 
@@ -888,7 +894,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-femtodream-producer
+### o2-analysis-cf-femtodream-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/FemtoDream/TableProducer//femtoDreamProducerTask.cxx" target="_blank">femtoDreamProducerTask.cxx</a>
 <div>
 
@@ -1620,7 +1627,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-femtouniverse-mctruth-producer
+### o2-analysis-cf-femtouniverse-mctruth-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/FemtoUniverse/TableProducer//femtoUniverseProducerMCTruthTask.cxx" target="_blank">femtoUniverseProducerMCTruthTask.cxx</a>
 <div>
 
@@ -1835,7 +1843,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-femtouniverse-producer-reduced
+### o2-analysis-cf-femtouniverse-producer-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/FemtoUniverse/TableProducer//femtoUniverseProducerReducedTask.cxx" target="_blank">femtoUniverseProducerReducedTask.cxx</a>
 <div>
 
@@ -2477,7 +2486,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-femtouniverse-producer
+### o2-analysis-cf-femtouniverse-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/FemtoUniverse/TableProducer//femtoUniverseProducerTask.cxx" target="_blank">femtoUniverseProducerTask.cxx</a>
 <div>
 
@@ -3332,7 +3342,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-femtouniverse-producer-v0
+### o2-analysis-cf-femtouniverse-producer-v0
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/FemtoUniverse/TableProducer//femtoUniverseProducerTaskV0Only.cxx" target="_blank">femtoUniverseProducerTaskV0Only.cxx</a>
 <div>
 
@@ -3851,7 +3862,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-femto-world-producer
+### o2-analysis-cf-femto-world-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/FemtoWorld/TableProducer//femtoWorldProducerTask.cxx" target="_blank">femtoWorldProducerTask.cxx</a>
 <div>
 
@@ -4409,7 +4421,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-jcatalyst
+### o2-analysis-cf-jcatalyst
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/JCorran/TableProducer//JCatalyst.cxx" target="_blank">JCatalyst.cxx</a>
 <div>
 
@@ -4535,7 +4548,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-dptdpt-filter
+### o2-analysis-cf-dptdpt-filter
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/TableProducer//dptdptfilter.cxx" target="_blank">dptdptfilter.cxx</a>
 <div>
 
@@ -4948,7 +4962,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-filter-correlations-2prong
+### o2-analysis-cf-filter-correlations-2prong
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/TableProducer//filter2Prong.cxx" target="_blank">filter2Prong.cxx</a>
 <div>
 
@@ -5041,7 +5056,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-filter-correlations
+### o2-analysis-cf-filter-correlations
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/TableProducer//filterCorrelations.cxx" target="_blank">filterCorrelations.cxx</a>
 <div>
 
@@ -5464,7 +5480,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-identifiedbf-filter
+### o2-analysis-cf-identifiedbf-filter
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/TwoParticleCorrelations/TableProducer//identifiedBfFilter.cxx" target="_blank">identifiedBfFilter.cxx</a>
 <div>
 
@@ -5877,7 +5894,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-twopartcorr-filter
+### o2-analysis-cf-twopartcorr-filter
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/TwoParticleCorrelations/TableProducer//twoParticleCorrelationsFiltering.cxx" target="_blank">twoParticleCorrelationsFiltering.cxx</a>
 <div>
 
@@ -6011,7 +6029,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-twopartcorr-skim
+### o2-analysis-cf-twopartcorr-skim
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/TwoParticleCorrelations/TableProducer//twoParticleCorrelationsFullSkimming.cxx" target="_blank">twoParticleCorrelationsFullSkimming.cxx</a>
 <div>
 
@@ -6302,7 +6321,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 </div>
 
-###  o2-analysis-cf-twopartcorr-notstored-skim
+### o2-analysis-cf-twopartcorr-notstored-skim
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF/TwoParticleCorrelations/TableProducer//twoParticleCorrelationsNotStoredSkimming.cxx" target="_blank">twoParticleCorrelationsNotStoredSkimming.cxx</a>
 <div>
 
@@ -6405,7 +6425,223 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGCF
 
 ## PWG-DQ
 
-###  o2-analysis-dq-table-maker
+### o2-analysis-dq-generated-quarkonia-mc
+
+Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/TableProducer//generatedQuarkoniaMC.cxx" target="_blank">generatedQuarkoniaMC.cxx</a>
+<div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::GeEtaC1S</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::generatedquarkoniamc::GeneratedEtaC1S</td>
+        <td></td>
+        <td>generatedEtaC1S</td>
+        <td>std::vector&lt;uint32_t&gt;</td>
+        <td>Eta(1S) binned generated data</td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::GeJPsi</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::generatedquarkoniamc::GeneratedJPsi</td>
+        <td></td>
+        <td>generatedJPsi</td>
+        <td>std::vector&lt;uint32_t&gt;</td>
+        <td>J/Psi binned generated data</td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::GeChiC0</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::generatedquarkoniamc::GeneratedChiC0</td>
+        <td></td>
+        <td>generatedChiC0</td>
+        <td>std::vector&lt;uint32_t&gt;</td>
+        <td>ChiC0(1P) binned generated data</td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::GeChiC1</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::generatedquarkoniamc::GeneratedChiC1</td>
+        <td></td>
+        <td>generatedChiC1</td>
+        <td>std::vector&lt;uint32_t&gt;</td>
+        <td>ChiC1(1P) binned generated data</td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::GeHC</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::generatedquarkoniamc::GeneratedHC</td>
+        <td></td>
+        <td>generatedHC</td>
+        <td>std::vector&lt;uint32_t&gt;</td>
+        <td>hC binned generated data</td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::GeChiC2</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::generatedquarkoniamc::GeneratedChiC2</td>
+        <td></td>
+        <td>generatedChiC2</td>
+        <td>std::vector&lt;uint32_t&gt;</td>
+        <td>ChiC2(1P) binned generated data</td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::GeEtaC2S</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::generatedquarkoniamc::GeneratedEtaC2S</td>
+        <td></td>
+        <td>generatedEtaC2S</td>
+        <td>std::vector&lt;uint32_t&gt;</td>
+        <td>EtaC(2S) binned generated data</td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::GePsi2S</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::generatedquarkoniamc::GeneratedPsi2S</td>
+        <td></td>
+        <td>generatedPsi2S</td>
+        <td>std::vector&lt;uint32_t&gt;</td>
+        <td>Psi(2S) binned generated data</td>
+      </tr>
+    </table>
+  </div>
+
+</div>
+
+### o2-analysis-dq-table-maker
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/TableProducer//tableMaker.cxx" target="_blank">tableMaker.cxx</a>
 <div>
 
@@ -7558,6 +7794,11 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
     <div>
       Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
     </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::ReducedMFTExtra = o2::aod::ReducedMFTsExtra::iterator</li>
+      </ul>
+    </div>
     <table class=DataModel>
       <tr>
         <th>Name</th>
@@ -8080,7 +8321,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
 
 </div>
 
-###  o2-analysis-dq-table-maker-jpsi-hf
+### o2-analysis-dq-table-maker-jpsi-hf
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/TableProducer//tableMakerJpsiHf.cxx" target="_blank">tableMakerJpsiHf.cxx</a>
 <div>
 
@@ -8623,7 +8865,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
 
 </div>
 
-###  o2-analysis-dq-table-maker-mc
+### o2-analysis-dq-table-maker-mc
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/TableProducer//tableMakerMC.cxx" target="_blank">tableMakerMC.cxx</a>
 <div>
 
@@ -10078,6 +10321,176 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
     </table>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::ReducedMFTs</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::ReducedMFT = o2::aod::ReducedMFTs::iterator</li>
+      </ul>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::soa::Index</td>
+        <td>GI</td>
+        <td>globalIndex</td>
+        <td>int64_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::ReducedEventId</td>
+        <td>I</td>
+        <td>reducedeventId</td>
+        <td>int32</td>
+        <td>Pointer into ReducedEvents</td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::FilteringFlags</td>
+        <td></td>
+        <td>filteringFlags</td>
+        <td>uint8_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::Pt</td>
+        <td></td>
+        <td>pt</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::Eta</td>
+        <td></td>
+        <td>eta</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::Phi</td>
+        <td></td>
+        <td>phi</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::ReducedMFTsExtra</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::ReducedMFTExtra = o2::aod::ReducedMFTsExtra::iterator</li>
+      </ul>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::MftClusterSizesAndTrackFlags</td>
+        <td></td>
+        <td>mftClusterSizesAndTrackFlags</td>
+        <td>uint64_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::Sign</td>
+        <td></td>
+        <td>sign</td>
+        <td>int</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::FwdDcaX</td>
+        <td></td>
+        <td>fwdDcaX</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::FwdDcaY</td>
+        <td></td>
+        <td>fwdDcaY</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::MftNClusters</td>
+        <td></td>
+        <td>mftNClusters</td>
+        <td>int</td>
+        <td></td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::ReducedMFTLabels</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
+    </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::ReducedMFTLabel = o2::aod::ReducedMFTLabels::iterator</li>
+      </ul>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::ReducedMCTrackId</td>
+        <td>I</td>
+        <td>reducedMCTrackId</td>
+        <td>int32</td>
+        <td>Pointer into ReducedMCTracks</td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::McMask</td>
+        <td></td>
+        <td>mcMask</td>
+        <td>uint16_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::reducedmft::McReducedFlags</td>
+        <td></td>
+        <td>mcReducedFlags</td>
+        <td>uint16_t</td>
+        <td></td>
+      </tr>
+    </table>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::ReducedMuons</button>
   <div class="panel">
     <div>
@@ -10547,7 +10960,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
 
 </div>
 
-###  o2-analysis-dq-table-maker-mc-with-assoc
+### o2-analysis-dq-table-maker-mc-with-assoc
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/TableProducer//tableMakerMC_withAssoc.cxx" target="_blank">tableMakerMC_withAssoc.cxx</a>
 <div>
 
@@ -12076,6 +12490,11 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
     <div>
       Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
     </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::ReducedMFTExtra = o2::aod::ReducedMFTsExtra::iterator</li>
+      </ul>
+    </div>
     <table class=DataModel>
       <tr>
         <th>Name</th>
@@ -12690,7 +13109,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
 
 </div>
 
-###  o2-analysis-dq-table-maker-muon-mch-trk-eff
+### o2-analysis-dq-table-maker-muon-mch-trk-eff
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/TableProducer//tableMakerMuonMchTrkEfficiency.cxx" target="_blank">tableMakerMuonMchTrkEfficiency.cxx</a>
 <div>
 
@@ -12790,7 +13210,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
 
 </div>
 
-###  o2-analysis-dq-table-maker-with-assoc
+### o2-analysis-dq-table-maker-with-assoc
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/TableProducer//tableMaker_withAssoc.cxx" target="_blank">tableMaker_withAssoc.cxx</a>
 <div>
 
@@ -14023,6 +14444,11 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
     <div>
       Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ/DataModel/ReducedInfoTables.h" target="_blank">PWGDQ/DataModel/ReducedInfoTables.h</a>
     </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::ReducedMFTExtra = o2::aod::ReducedMFTsExtra::iterator</li>
+      </ul>
+    </div>
     <table class=DataModel>
       <tr>
         <th>Name</th>
@@ -14646,7 +15072,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGDQ
 
 ## PWG-EM
 
-###  o2-analysis-em-associate-mc-info-photon
+### o2-analysis-em-associate-mc-info-photon
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//associateMCinfoPhoton.cxx" target="_blank">associateMCinfoPhoton.cxx</a>
 <div>
 
@@ -15114,7 +15541,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-create-emevent-photon
+### o2-analysis-em-create-emevent-photon
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//createEMEventPhoton.cxx" target="_blank">createEMEventPhoton.cxx</a>
 <div>
 
@@ -15780,7 +16208,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-create-pcm
+### o2-analysis-em-create-pcm
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//createPCM.cxx" target="_blank">createPCM.cxx</a>
 <div>
 
@@ -15887,7 +16316,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-gamma-table-producer
+### o2-analysis-em-gamma-table-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//gammaSelection.cxx" target="_blank">gammaSelection.cxx</a>
 <div>
 
@@ -16008,7 +16438,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-photon-conversion-builder
+### o2-analysis-em-photon-conversion-builder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//photonconversionbuilder.cxx" target="_blank">photonconversionbuilder.cxx</a>
 <div>
 
@@ -16642,7 +17073,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-produce-meson-calo
+### o2-analysis-em-produce-meson-calo
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//produceMesonCalo.cxx" target="_blank">produceMesonCalo.cxx</a>
 <div>
 
@@ -16765,7 +17197,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-dalitz-ee
+### o2-analysis-em-skimmer-dalitz-ee
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//skimmerDalitzEE.cxx" target="_blank">skimmerDalitzEE.cxx</a>
 <div>
 
@@ -16962,7 +17395,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-gamma-calo
+### o2-analysis-em-skimmer-gamma-calo
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//skimmerGammaCalo.cxx" target="_blank">skimmerGammaCalo.cxx</a>
 <div>
 
@@ -17232,7 +17666,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-gamma-conversion
+### o2-analysis-em-skimmer-gamma-conversion
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//skimmerGammaConversion.cxx" target="_blank">skimmerGammaConversion.cxx</a>
 <div>
 
@@ -18085,7 +18520,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-gamma-conversion-truthonlymc
+### o2-analysis-em-skimmer-gamma-conversion-truthonlymc
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//skimmerGammaConversionTruthOnlyMc.cxx" target="_blank">skimmerGammaConversionTruthOnlyMc.cxx</a>
 <div>
 
@@ -18353,7 +18789,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-phos
+### o2-analysis-em-skimmer-phos
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//skimmerPHOS.cxx" target="_blank">skimmerPHOS.cxx</a>
 <div>
 
@@ -18537,7 +18974,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-primary-electron-from-dalitzee
+### o2-analysis-em-skimmer-primary-electron-from-dalitzee
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/PhotonMeson/TableProducer//skimmerPrimaryElectronFromDalitzEE.cxx" target="_blank">skimmerPrimaryElectronFromDalitzEE.cxx</a>
 <div>
 
@@ -18847,7 +19285,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-associate-mc-info-dilepton
+### o2-analysis-em-associate-mc-info-dilepton
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//associateMCinfoDilepton.cxx" target="_blank">associateMCinfoDilepton.cxx</a>
 <div>
 
@@ -19420,7 +19859,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-create-emevent-dilepton
+### o2-analysis-em-create-emevent-dilepton
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//createEMEventDilepton.cxx" target="_blank">createEMEventDilepton.cxx</a>
 <div>
 
@@ -20069,13 +20509,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-dielectron-ml
-Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//dielectronMl.cxx" target="_blank">dielectronMl.cxx</a>
-<div>
-
-</div>
+### o2-analysis-em-event-selection
 
-###  o2-analysis-em-event-selection
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//eventSelection.cxx" target="_blank">eventSelection.cxx</a>
 <div>
 
@@ -20112,7 +20547,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-filter-dielectron-event
+### o2-analysis-em-filter-dielectron-event
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//filterDielectronEvent.cxx" target="_blank">filterDielectronEvent.cxx</a>
 <div>
 
@@ -20855,7 +21291,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-filter-eoi
+### o2-analysis-em-filter-eoi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//filterEoI.cxx" target="_blank">filterEoI.cxx</a>
 <div>
 
@@ -20892,7 +21329,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-ots
+### o2-analysis-em-skimmer-ots
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//skimmerOTS.cxx" target="_blank">skimmerOTS.cxx</a>
 <div>
 
@@ -20936,7 +21374,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-primary-electron
+### o2-analysis-em-skimmer-primary-electron
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//skimmerPrimaryElectron.cxx" target="_blank">skimmerPrimaryElectron.cxx</a>
 <div>
 
@@ -21133,7 +21572,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-primary-muon
+### o2-analysis-em-skimmer-primary-muon
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//skimmerPrimaryMuon.cxx" target="_blank">skimmerPrimaryMuon.cxx</a>
 <div>
 
@@ -21575,7 +22015,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-skimmer-secondary-electron
+### o2-analysis-em-skimmer-secondary-electron
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//skimmerSecondaryElectron.cxx" target="_blank">skimmerSecondaryElectron.cxx</a>
 <div>
 
@@ -22183,13 +22624,15 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 </div>
 
-###  o2-analysis-em-tree-creator-electron-ml
+### o2-analysis-em-tree-creator-electron-ml
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//treeCreatorElectronML.cxx" target="_blank">treeCreatorElectronML.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-em-tree-creator-electron-ml-dda
+### o2-analysis-em-tree-creator-electron-ml-dda
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM/Dilepton/TableProducer//treeCreatorElectronMLDDA.cxx" target="_blank">treeCreatorElectronMLDDA.cxx</a>
 <div>
 
@@ -22494,7 +22937,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGEM
 
 ## PWG-HF
 
-###  o2-analysis-hf-candidate-creator-2prong
+### o2-analysis-hf-candidate-creator-2prong
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreator2Prong.cxx" target="_blank">candidateCreator2Prong.cxx</a>
 <div>
 
@@ -23260,7 +23704,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-3prong
+### o2-analysis-hf-candidate-creator-3prong
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreator3Prong.cxx" target="_blank">candidateCreator3Prong.cxx</a>
 <div>
 
@@ -23897,7 +24342,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-b0
+### o2-analysis-hf-candidate-creator-b0
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorB0.cxx" target="_blank">candidateCreatorB0.cxx</a>
 <div>
 
@@ -24404,7 +24850,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-bplus
+### o2-analysis-hf-candidate-creator-bplus
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorBplus.cxx" target="_blank">candidateCreatorBplus.cxx</a>
 <div>
 
@@ -24921,7 +25368,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-bs
+### o2-analysis-hf-candidate-creator-bs
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorBs.cxx" target="_blank">candidateCreatorBs.cxx</a>
 <div>
 
@@ -25407,7 +25855,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-cascade
+### o2-analysis-hf-candidate-creator-cascade
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorCascade.cxx" target="_blank">candidateCreatorCascade.cxx</a>
 <div>
 
@@ -26065,7 +26514,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-dstar
+### o2-analysis-hf-candidate-creator-dstar
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorDstar.cxx" target="_blank">candidateCreatorDstar.cxx</a>
 <div>
 
@@ -26997,7 +27447,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-lb
+### o2-analysis-hf-candidate-creator-lb
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorLb.cxx" target="_blank">candidateCreatorLb.cxx</a>
 <div>
 
@@ -27473,7 +27924,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-sigmac0plusplus
+### o2-analysis-hf-candidate-creator-sigmac0plusplus
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorSigmac0plusplus.cxx" target="_blank">candidateCreatorSigmac0plusplus.cxx</a>
 <div>
 
@@ -27809,7 +28261,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-sigmac0plusplus-cascade
+### o2-analysis-hf-candidate-creator-sigmac0plusplus-cascade
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorSigmac0plusplusCascade.cxx" target="_blank">candidateCreatorSigmac0plusplusCascade.cxx</a>
 <div>
 
@@ -28051,7 +28504,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-xic0-omegac0
+### o2-analysis-hf-candidate-creator-xic0-omegac0
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorXic0Omegac0.cxx" target="_blank">candidateCreatorXic0Omegac0.cxx</a>
 <div>
 
@@ -30805,7 +31259,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi
+### o2-analysis-hf-candidate-creator-xic-to-xi-pi-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorXicToXiPiPi.cxx" target="_blank">candidateCreatorXicToXiPiPi.cxx</a>
 <div>
 
@@ -31376,6 +31831,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand_xic_to_xi_pi_pi::Chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td></td>
+        <td>chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_cand_xic_to_xi_pi_pi::Chi2TopoXicPlusToPV</td>
         <td></td>
@@ -31383,6 +31845,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand_xic_to_xi_pi_pi::Chi2TopoXiToXicPlusBeforeConstraint</td>
+        <td></td>
+        <td>chi2TopoXiToXicPlusBeforeConstraint</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_cand_xic_to_xi_pi_pi::Chi2TopoXiToXicPlus</td>
         <td></td>
@@ -31524,7 +31993,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-xicc
+### o2-analysis-hf-candidate-creator-xicc
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateCreatorXicc.cxx" target="_blank">candidateCreatorXicc.cxx</a>
 <div>
 
@@ -32000,7 +32470,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-b0-to-d-pi
+### o2-analysis-hf-candidate-selector-b0-to-d-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorB0ToDPi.cxx" target="_blank">candidateSelectorB0ToDPi.cxx</a>
 <div>
 
@@ -32032,7 +32503,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-bplus-to-d0-pi
+### o2-analysis-hf-candidate-selector-bplus-to-d0-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorBplusToD0Pi.cxx" target="_blank">candidateSelectorBplusToD0Pi.cxx</a>
 <div>
 
@@ -32070,7 +32542,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-bs-to-ds-pi
+### o2-analysis-hf-candidate-selector-bs-to-ds-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorBsToDsPi.cxx" target="_blank">candidateSelectorBsToDsPi.cxx</a>
 <div>
 
@@ -32128,7 +32601,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-d0
+### o2-analysis-hf-candidate-selector-d0
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorD0.cxx" target="_blank">candidateSelectorD0.cxx</a>
 <div>
 
@@ -32228,7 +32702,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-dplus-to-pi-k-pi
+### o2-analysis-hf-candidate-selector-dplus-to-pi-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorDplusToPiKPi.cxx" target="_blank">candidateSelectorDplusToPiKPi.cxx</a>
 <div>
 
@@ -32286,7 +32761,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-ds-to-k-k-pi
+### o2-analysis-hf-candidate-selector-ds-to-k-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorDsToKKPi.cxx" target="_blank">candidateSelectorDsToKKPi.cxx</a>
 <div>
 
@@ -32358,7 +32834,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-dstar-to-d0-pi
+### o2-analysis-hf-candidate-selector-dstar-to-d0-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorDstarToD0Pi.cxx" target="_blank">candidateSelectorDstarToD0Pi.cxx</a>
 <div>
 
@@ -32444,7 +32921,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-lb-to-lc-pi
+### o2-analysis-hf-candidate-selector-lb-to-lc-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorLbToLcPi.cxx" target="_blank">candidateSelectorLbToLcPi.cxx</a>
 <div>
 
@@ -32476,7 +32954,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-lc
+### o2-analysis-hf-candidate-selector-lc
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorLc.cxx" target="_blank">candidateSelectorLc.cxx</a>
 <div>
 
@@ -32548,7 +33027,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-lc-pid-ml
+### o2-analysis-hf-candidate-selector-lc-pid-ml
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorLcPidMl.cxx" target="_blank">candidateSelectorLcPidMl.cxx</a>
 <div>
 
@@ -32587,7 +33067,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-lc-to-k0s-p
+### o2-analysis-hf-candidate-selector-lc-to-k0s-p
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorLcToK0sP.cxx" target="_blank">candidateSelectorLcToK0sP.cxx</a>
 <div>
 
@@ -32619,7 +33100,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-omegac0-to-omega-ka
+### o2-analysis-hf-candidate-selector-omegac0-to-omega-ka
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorOmegac0ToOmegaKa.cxx" target="_blank">candidateSelectorOmegac0ToOmegaKa.cxx</a>
 <div>
 
@@ -32763,7 +33245,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-omegac0-to-omega-pi
+### o2-analysis-hf-candidate-selector-omegac0-to-omega-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorOmegac0ToOmegaPi.cxx" target="_blank">candidateSelectorOmegac0ToOmegaPi.cxx</a>
 <div>
 
@@ -32907,7 +33390,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-to-xi-pi
+### o2-analysis-hf-candidate-selector-to-xi-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorToXiPi.cxx" target="_blank">candidateSelectorToXiPi.cxx</a>
 <div>
 
@@ -33051,7 +33535,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-xic-to-p-k-pi
+### o2-analysis-hf-candidate-selector-xic-to-p-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorXicToPKPi.cxx" target="_blank">candidateSelectorXicToPKPi.cxx</a>
 <div>
 
@@ -33123,7 +33608,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-xic-to-xi-pi-pi
+### o2-analysis-hf-candidate-selector-xic-to-xi-pi-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorXicToXiPiPi.cxx" target="_blank">candidateSelectorXicToXiPiPi.cxx</a>
 <div>
 
@@ -33155,7 +33641,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-xicc-to-p-k-pi-pi
+### o2-analysis-hf-candidate-selector-xicc-to-p-k-pi-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//candidateSelectorXiccToPKPiPi.cxx" target="_blank">candidateSelectorXiccToPKPiPi.cxx</a>
 <div>
 
@@ -33187,19 +33674,81 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-derived-data-creator-d0-to-k-pi
+### o2-analysis-hf-converter-dstar-indices
+
+Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//converterDstarIndices.cxx" target="_blank">converterDstarIndices.cxx</a>
+<div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::HfDstars_001</button>
+  <div class="panel">
+    <div>
+       D* -> D0pi candidates (Run 3 format)
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/DataModel/CandidateReconstructionTables.h" target="_blank">PWGHF/DataModel/CandidateReconstructionTables.h</a>
+    </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::HfDstars = o2::aod::HfDstars_001</li>
+      </ul>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::soa::Index</td>
+        <td>GI</td>
+        <td>globalIndex</td>
+        <td>int64_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_track_index::CollisionId</td>
+        <td>I</td>
+        <td>collisionId</td>
+        <td>int32</td>
+        <td>Collision index</td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_track_index::Prong0Id</td>
+        <td>I</td>
+        <td>prong0Id</td>
+        <td>int</td>
+        <td>Index to first prong</td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_track_index::ProngD0Id</td>
+        <td>I</td>
+        <td>prongD0Id</td>
+        <td>int</td>
+        <td>Index to a D0 prong</td>
+      </tr>
+    </table>
+  </div>
+
+</div>
+
+### o2-analysis-hf-derived-data-creator-d0-to-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//derivedDataCreatorD0ToKPi.cxx" target="_blank">derivedDataCreatorD0ToKPi.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-hf-derived-data-creator-lc-to-p-k-pi
+### o2-analysis-hf-derived-data-creator-lc-to-p-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//derivedDataCreatorLcToPKPi.cxx" target="_blank">derivedDataCreatorLcToPKPi.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-hf-mc-pid-tof
+### o2-analysis-hf-mc-pid-tof
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//mcPidTof.cxx" target="_blank">mcPidTof.cxx</a>
 <div>
 
@@ -33591,7 +34140,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-pid-creator
+### o2-analysis-hf-pid-creator
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//pidCreator.cxx" target="_blank">pidCreator.cxx</a>
 <div>
 
@@ -33867,7 +34417,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-refit-pv-dummy
+### o2-analysis-hf-refit-pv-dummy
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//refitPvDummy.cxx" target="_blank">refitPvDummy.cxx</a>
 <div>
 
@@ -34214,7 +34765,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-track-index-skim-creator
+### o2-analysis-hf-track-index-skim-creator
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//trackIndexSkimCreator.cxx" target="_blank">trackIndexSkimCreator.cxx</a>
 <div>
 
@@ -34937,7 +35489,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-b0-to-d-pi
+### o2-analysis-hf-tree-creator-b0-to-d-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorB0ToDPi.cxx" target="_blank">treeCreatorB0ToDPi.cxx</a>
 <div>
 
@@ -35607,7 +36160,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-bplus-to-d0-pi
+### o2-analysis-hf-tree-creator-bplus-to-d0-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorBplusToD0Pi.cxx" target="_blank">treeCreatorBplusToD0Pi.cxx</a>
 <div>
 
@@ -36445,7 +36999,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-bs-to-ds-pi
+### o2-analysis-hf-tree-creator-bs-to-ds-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorBsToDsPi.cxx" target="_blank">treeCreatorBsToDsPi.cxx</a>
 <div>
 
@@ -37087,7 +37642,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-d0-to-k-pi
+### o2-analysis-hf-tree-creator-d0-to-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorD0ToKPi.cxx" target="_blank">treeCreatorD0ToKPi.cxx</a>
 <div>
 
@@ -38149,7 +38705,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-dplus-to-pi-k-pi
+### o2-analysis-hf-tree-creator-dplus-to-pi-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorDplusToPiKPi.cxx" target="_blank">treeCreatorDplusToPiKPi.cxx</a>
 <div>
 
@@ -39456,7 +40013,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-ds-to-k-k-pi
+### o2-analysis-hf-tree-creator-ds-to-k-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorDsToKKPi.cxx" target="_blank">treeCreatorDsToKKPi.cxx</a>
 <div>
 
@@ -40483,7 +41041,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-dstar-to-d0-pi
+### o2-analysis-hf-tree-creator-dstar-to-d0-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorDstarToD0Pi.cxx" target="_blank">treeCreatorDstarToD0Pi.cxx</a>
 <div>
 
@@ -41685,7 +42244,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-lb-to-lc-pi
+### o2-analysis-hf-tree-creator-lb-to-lc-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorLbToLcPi.cxx" target="_blank">treeCreatorLbToLcPi.cxx</a>
 <div>
 
@@ -42172,7 +42732,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-lc-to-k0s-p
+### o2-analysis-hf-tree-creator-lc-to-k0s-p
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorLcToK0sP.cxx" target="_blank">treeCreatorLcToK0sP.cxx</a>
 <div>
 
@@ -43073,7 +43634,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-lc-to-p-k-pi
+### o2-analysis-hf-tree-creator-lc-to-p-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorLcToPKPi.cxx" target="_blank">treeCreatorLcToPKPi.cxx</a>
 <div>
 
@@ -44119,7 +44681,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-omegac-st
+### o2-analysis-hf-tree-creator-omegac-st
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorOmegacSt.cxx" target="_blank">treeCreatorOmegacSt.cxx</a>
 <div>
 
@@ -44597,7 +45160,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-omegac0-to-omega-ka
+### o2-analysis-hf-tree-creator-omegac0-to-omega-ka
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorOmegacToOmegaKa.cxx" target="_blank">treeCreatorOmegacToOmegaKa.cxx</a>
 <div>
 
@@ -45110,7 +45674,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-omegac0-to-omega-pi
+### o2-analysis-hf-tree-creator-omegac0-to-omega-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorOmegacToOmegaPi.cxx" target="_blank">treeCreatorOmegacToOmegaPi.cxx</a>
 <div>
 
@@ -46041,7 +46606,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-to-xi-pi
+### o2-analysis-hf-tree-creator-to-xi-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorToXiPi.cxx" target="_blank">treeCreatorToXiPi.cxx</a>
 <div>
 
@@ -47364,7 +47930,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-xic-to-p-k-pi
+### o2-analysis-hf-tree-creator-xic-to-p-k-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorXicToPKPi.cxx" target="_blank">treeCreatorXicToPKPi.cxx</a>
 <div>
 
@@ -48489,7 +49056,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-xic-to-xi-pi-pi
+### o2-analysis-hf-tree-creator-xic-to-xi-pi-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorXicToXiPiPi.cxx" target="_blank">treeCreatorXicToXiPiPi.cxx</a>
 <div>
 
@@ -49005,16 +49573,30 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::full::Chi2XicPlusTopoToPV</td>
+        <td>o2::aod::full::Chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td></td>
+        <td>chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::full::Chi2TopoXicPlusToPV</td>
+        <td></td>
+        <td>chi2TopoXicPlusToPV</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::full::Chi2TopoXiToXicPlusBeforeConstraint</td>
         <td></td>
-        <td>chi2XicPlusTopoToPV</td>
+        <td>chi2TopoXiToXicPlusBeforeConstraint</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::full::Chi2XicPlusTopoXiToXicPlus</td>
+        <td>o2::aod::full::Chi2TopoXiToXicPlus</td>
         <td></td>
-        <td>chi2XicPlusTopoXiToXicPlus</td>
+        <td>chi2TopoXiToXicPlus</td>
         <td>float</td>
         <td></td>
       </tr>
@@ -49848,16 +50430,30 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::full::Chi2XicPlusTopoToPV</td>
+        <td>o2::aod::full::Chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td></td>
+        <td>chi2TopoXicPlusToPVBeforeConstraint</td>
+        <td>float</td>
         <td></td>
-        <td>chi2XicPlusTopoToPV</td>
+      </tr>
+      <tr>
+        <td>o2::aod::full::Chi2TopoXicPlusToPV</td>
+        <td></td>
+        <td>chi2TopoXicPlusToPV</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::full::Chi2XicPlusTopoXiToXicPlus</td>
+        <td>o2::aod::full::Chi2TopoXiToXicPlusBeforeConstraint</td>
         <td></td>
-        <td>chi2XicPlusTopoXiToXicPlus</td>
+        <td>chi2TopoXiToXicPlusBeforeConstraint</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::full::Chi2TopoXiToXicPlus</td>
+        <td></td>
+        <td>chi2TopoXiToXicPlus</td>
         <td>float</td>
         <td></td>
       </tr>
@@ -50128,7 +50724,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-tree-creator-xicc-to-p-k-pi-pi
+### o2-analysis-hf-tree-creator-xicc-to-p-k-pi-pi
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/TableProducer//treeCreatorXiccToPKPiPi.cxx" target="_blank">treeCreatorXiccToPKPiPi.cxx</a>
 <div>
 
@@ -50653,7 +51250,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-b0-reduced
+### o2-analysis-hf-candidate-creator-b0-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//candidateCreatorB0Reduced.cxx" target="_blank">candidateCreatorB0Reduced.cxx</a>
 <div>
 
@@ -51235,7 +51833,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-bplus-reduced
+### o2-analysis-hf-candidate-creator-bplus-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//candidateCreatorBplusReduced.cxx" target="_blank">candidateCreatorBplusReduced.cxx</a>
 <div>
 
@@ -51810,7 +52409,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-bs-reduced
+### o2-analysis-hf-candidate-creator-bs-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//candidateCreatorBsReduced.cxx" target="_blank">candidateCreatorBsReduced.cxx</a>
 <div>
 
@@ -52392,7 +52992,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-creator-charm-reso-reduced
+### o2-analysis-hf-candidate-creator-charm-reso-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//candidateCreatorCharmResoReduced.cxx" target="_blank">candidateCreatorCharmResoReduced.cxx</a>
 <div>
 
@@ -52419,27 +53020,6 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>int64_t</td>
         <td></td>
       </tr>
-      <tr>
-        <td>o2::aod::hf_track_index_reduced::HfRedCollisionId</td>
-        <td>I</td>
-        <td>hfRedCollisionId</td>
-        <td>int32</td>
-        <td>ReducedCollision index</td>
-      </tr>
-      <tr>
-        <td>o2::aod::hf_reso_cand_reduced::Prong0Id</td>
-        <td>I</td>
-        <td>prong0Id</td>
-        <td>int</td>
-        <td>Prong0 index (D daughter)</td>
-      </tr>
-      <tr>
-        <td>o2::aod::hf_reso_cand_reduced::Prong1Id</td>
-        <td>I</td>
-        <td>prong1Id</td>
-        <td>int</td>
-        <td>Prong1 index (V0 daughter)</td>
-      </tr>
       <tr>
         <td>o2::aod::hf_cand::PxProng0</td>
         <td></td>
@@ -52524,6 +53104,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td>Radius of V0 candidate</td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_reso_cand_reduced::InvMassD0</td>
+        <td></td>
+        <td>invMassD0</td>
+        <td>float</td>
+        <td>Invariant Mass of potential D0 daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::hf_reso_cand_reduced::Pt</td>
         <td>D</td>
@@ -52545,6 +53132,27 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_reso_v0::Px</td>
+        <td>D</td>
+        <td>px</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_v0::Py</td>
+        <td>D</td>
+        <td>py</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_v0::Pz</td>
+        <td>D</td>
+        <td>pz</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_cand::PVectorProng0</td>
         <td>D</td>
@@ -52583,6 +53191,46 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
     </table>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::HfResoIndices</button>
+  <div class="panel">
+    <div>
+       Table with Indices of resonance daughters for MC matching
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/DataModel/ReducedDataModel.h" target="_blank">PWGHF/D2H/DataModel/ReducedDataModel.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_track_index_reduced::HfRedCollisionId</td>
+        <td>I</td>
+        <td>hfRedCollisionId</td>
+        <td>int32</td>
+        <td>ReducedCollision index</td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_cand_reduced::Prong0Id</td>
+        <td>I</td>
+        <td>prong0Id</td>
+        <td>int</td>
+        <td>Prong0 index (D daughter)</td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_cand_reduced::Prong1Id</td>
+        <td>I</td>
+        <td>prong1Id</td>
+        <td>int</td>
+        <td>Prong1 index (V0 daughter)</td>
+      </tr>
+    </table>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::HfCharmResoMLs</button>
   <div class="panel">
     <div>
@@ -52754,7 +53402,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-b0-to-d-pi-reduced
+### o2-analysis-hf-candidate-selector-b0-to-d-pi-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//candidateSelectorB0ToDPiReduced.cxx" target="_blank">candidateSelectorB0ToDPiReduced.cxx</a>
 <div>
 
@@ -52812,7 +53461,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-bplus-to-d0-pi-reduced
+### o2-analysis-hf-candidate-selector-bplus-to-d0-pi-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//candidateSelectorBplusToD0PiReduced.cxx" target="_blank">candidateSelectorBplusToD0PiReduced.cxx</a>
 <div>
 
@@ -52876,7 +53526,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-candidate-selector-bs-to-ds-pi-reduced
+### o2-analysis-hf-candidate-selector-bs-to-ds-pi-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//candidateSelectorBsToDsPiReduced.cxx" target="_blank">candidateSelectorBsToDsPiReduced.cxx</a>
 <div>
 
@@ -52934,7 +53585,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-converter-reduced-3-prongs-ml
+### o2-analysis-hf-converter-reduced-3-prongs-ml
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//converterReduced3ProngsMl.cxx" target="_blank">converterReduced3ProngsMl.cxx</a>
 <div>
 
@@ -53006,7 +53658,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-data-creator-charm-had-pi-reduced
+### o2-analysis-hf-data-creator-charm-had-pi-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//dataCreatorCharmHadPiReduced.cxx" target="_blank">dataCreatorCharmHadPiReduced.cxx</a>
 <div>
 
@@ -55205,7 +55858,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-data-creator-charm-reso-reduced
+### o2-analysis-hf-data-creator-charm-reso-reduced
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/TableProducer//dataCreatorCharmResoReduced.cxx" target="_blank">dataCreatorCharmResoReduced.cxx</a>
 <div>
 
@@ -55576,6 +56230,27 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng0</td>
+        <td>D</td>
+        <td>pVectorProng0</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng1</td>
+        <td>D</td>
+        <td>pVectorProng1</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_v0::PVector</td>
+        <td>D</td>
+        <td>pVector</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
     </table>
   </div>
 
@@ -55993,19 +56668,33 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::hf_reso_3_prong::InvMassDstar</td>
+        <td>o2::aod::hf_cand_dstar::InvMassDstar</td>
         <td>D</td>
         <td>invMassDstar</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::hf_reso_3_prong::InvMassAntiDstar</td>
+        <td>o2::aod::hf_cand_dstar::InvMassAntiDstar</td>
         <td>D</td>
         <td>invMassAntiDstar</td>
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand_dstar::InvMassD0</td>
+        <td>D</td>
+        <td>invMassD0</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_cand_dstar::InvMassD0Bar</td>
+        <td>D</td>
+        <td>invMassD0Bar</td>
+        <td>float</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_reso_3_prong::Pt</td>
         <td>D</td>
@@ -56013,6 +56702,34 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>float</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng0</td>
+        <td>D</td>
+        <td>pVectorProng0</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng1</td>
+        <td>D</td>
+        <td>pVectorProng1</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_cand::PVectorProng2</td>
+        <td>D</td>
+        <td>pVectorProng2</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_reso_3_prong::PVector</td>
+        <td>D</td>
+        <td>pVector</td>
+        <td>std::array&lt;float,3&gt;</td>
+        <td></td>
+      </tr>
     </table>
   </div>
 
@@ -56067,6 +56784,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>int8_t</td>
         <td></td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_reso_cand_reduced::SignD0</td>
+        <td></td>
+        <td>signD0</td>
+        <td>int8_t</td>
+        <td></td>
+      </tr>
       <tr>
         <td>o2::aod::hf_b0_mc::PtMother</td>
         <td></td>
@@ -56175,7 +56899,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-d0-d0bar
+### o2-analysis-hf-correlator-d0-d0bar
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorD0D0bar.cxx" target="_blank">correlatorD0D0bar.cxx</a>
 <div>
 
@@ -56268,7 +56993,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-d0-d0bar-barrel-full-pid
+### o2-analysis-hf-correlator-d0-d0bar-barrel-full-pid
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorD0D0barBarrelFullPid.cxx" target="_blank">correlatorD0D0barBarrelFullPid.cxx</a>
 <div>
 
@@ -56361,7 +57087,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-d0-hadrons
+### o2-analysis-hf-correlator-d0-hadrons
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorD0Hadrons.cxx" target="_blank">correlatorD0Hadrons.cxx</a>
 <div>
 
@@ -56494,7 +57221,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-d-meson-pairs
+### o2-analysis-hf-correlator-d-meson-pairs
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorDMesonPairs.cxx" target="_blank">correlatorDMesonPairs.cxx</a>
 <div>
 
@@ -56786,7 +57514,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-dplus-dminus
+### o2-analysis-hf-correlator-dplus-dminus
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorDplusDminus.cxx" target="_blank">correlatorDplusDminus.cxx</a>
 <div>
 
@@ -56879,7 +57608,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-dplus-hadrons
+### o2-analysis-hf-correlator-dplus-hadrons
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorDplusHadrons.cxx" target="_blank">correlatorDplusHadrons.cxx</a>
 <div>
 
@@ -57313,83 +58043,11 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-ds-hadrons
+### o2-analysis-hf-correlator-ds-hadrons
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorDsHadrons.cxx" target="_blank">correlatorDsHadrons.cxx</a>
 <div>
 
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::HfRedCollisions</button>
-  <div class="panel">
-    <div>
-       Table with collision for reduced workflow
-    </div>
-    <div>
-      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/D2H/DataModel/ReducedDataModel.h" target="_blank">PWGHF/D2H/DataModel/ReducedDataModel.h</a>
-    </div>
-    <div>Is used in:
-      <ul>
-        <li>o2::aod::HfRedCollision = o2::aod::HfRedCollisions::iterator</li>
-      </ul>
-    </div>
-    <table class=DataModel>
-      <tr>
-        <th>Name</th>
-        <th></th>
-        <th>Getter</th>
-        <th>Type</th>
-        <th>Comment</th>
-      </tr>
-      <tr>
-        <td>o2::soa::Index</td>
-        <td>GI</td>
-        <td>globalIndex</td>
-        <td>int64_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::&zwnj;collision::PosX</td>
-        <td></td>
-        <td>posX</td>
-        <td>float</td>
-        <td>X Vertex position in cm</td>
-      </tr>
-      <tr>
-        <td>o2::aod::&zwnj;collision::PosY</td>
-        <td></td>
-        <td>posY</td>
-        <td>float</td>
-        <td>Y Vertex position in cm</td>
-      </tr>
-      <tr>
-        <td>o2::aod::&zwnj;collision::PosZ</td>
-        <td></td>
-        <td>posZ</td>
-        <td>float</td>
-        <td>Z Vertex position in cm</td>
-      </tr>
-      <tr>
-        <td>o2::aod::&zwnj;collision::NumContrib</td>
-        <td></td>
-        <td>numContrib</td>
-        <td>uint16_t</td>
-        <td>Number of tracks used for the vertex</td>
-      </tr>
-      <tr>
-        <td>o2::aod::hf_reduced_collision::HfCollisionRejectionMap</td>
-        <td></td>
-        <td>hfCollisionRejectionMap</td>
-        <td>uint16_t</td>
-        <td>Bitmask with failed selection criteria</td>
-      </tr>
-      <tr>
-        <td>o2::aod::hf_reduced_collision::Bz</td>
-        <td></td>
-        <td>bz</td>
-        <td>float</td>
-        <td>Magnetic field in z-direction</td>
-      </tr>
-    </table>
-  </div>
-
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::DsHadronPair</button>
   <div class="panel">
     <div>
@@ -57696,6 +58354,51 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
     </table>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::HfcRedCollisions</button>
+  <div class="panel">
+    <div>
+       Table with collision info
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h" target="_blank">PWGHF/HFC/DataModel/DerivedDataCorrelationTables.h</a>
+    </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::HfcRedCollision = o2::aod::HfcRedCollisions::iterator</li>
+      </ul>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::soa::Index</td>
+        <td>GI</td>
+        <td></td>
+        <td>?</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_collisions_reduced::Multiplicity</td>
+        <td></td>
+        <td>multiplicity</td>
+        <td>float</td>
+        <td>Event multiplicity</td>
+      </tr>
+      <tr>
+        <td>o2::aod::hf_collisions_reduced::PosZ</td>
+        <td></td>
+        <td>posZ</td>
+        <td>float</td>
+        <td>Primary vertex z position</td>
+      </tr>
+    </table>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::DsCandReduced</button>
   <div class="panel">
     <div>
@@ -57720,9 +58423,9 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::hf_candidate_reduced::HfRedCollisionId</td>
+        <td>o2::aod::hf_candidate_reduced::HfcRedCollisionId</td>
         <td>I</td>
-        <td>hfRedCollisionId</td>
+        <td>hfcRedCollisionId</td>
         <td>int32</td>
         <td>ReducedCollision index</td>
       </tr>
@@ -57757,7 +58460,7 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
     </table>
   </div>
 
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::AssocTrackReduced</button>
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::AssocTrackRed</button>
   <div class="panel">
     <div>
        Table with associated track info
@@ -57781,9 +58484,9 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::hf_candidate_reduced::HfRedCollisionId</td>
+        <td>o2::aod::hf_candidate_reduced::HfcRedCollisionId</td>
         <td>I</td>
-        <td>hfRedCollisionId</td>
+        <td>hfcRedCollisionId</td>
         <td>int32</td>
         <td>ReducedCollision index</td>
       </tr>
@@ -57813,7 +58516,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-dstar-hadrons
+### o2-analysis-hf-correlator-dstar-hadrons
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorDstarHadrons.cxx" target="_blank">correlatorDstarHadrons.cxx</a>
 <div>
 
@@ -58119,7 +58823,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-hfe-hadrons
+### o2-analysis-hf-correlator-hfe-hadrons
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorHfeHadrons.cxx" target="_blank">correlatorHfeHadrons.cxx</a>
 <div>
 
@@ -58179,7 +58884,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-correlator-lc-hadrons
+### o2-analysis-hf-correlator-lc-hadrons
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//correlatorLcHadrons.cxx" target="_blank">correlatorLcHadrons.cxx</a>
 <div>
 
@@ -58234,6 +58940,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
         <td>int</td>
         <td>Pool Bin for the MixedEvent</td>
       </tr>
+      <tr>
+        <td>o2::aod::hf_correlation_lc_hadron::IsAutoCorrelated</td>
+        <td></td>
+        <td>isAutoCorrelated</td>
+        <td>bool</td>
+        <td>Correlation Status</td>
+      </tr>
     </table>
   </div>
 
@@ -58298,7 +59011,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-femto-dream-producer
+### o2-analysis-hf-femto-dream-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFC/TableProducer//femtoDreamProducer.cxx" target="_blank">femtoDreamProducer.cxx</a>
 <div>
 
@@ -59405,7 +60119,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 </div>
 
-###  o2-analysis-hf-electron-selection-with-tpc-emcal
+### o2-analysis-hf-electron-selection-with-tpc-emcal
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF/HFL/TableProducer//electronSelectionWithTpcEmcal.cxx" target="_blank">electronSelectionWithTpcEmcal.cxx</a>
 <div>
 
@@ -59413,7 +60128,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGHF
 
 ## PWG-JE
 
-###  o2-analysis-je-emcal-correction-task
+### o2-analysis-je-emcal-correction-task
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//emcalCorrectionTask.cxx" target="_blank">emcalCorrectionTask.cxx</a>
 <div>
 
@@ -59916,7 +60632,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-emcal-matchedtracks-writer
+### o2-analysis-je-emcal-matchedtracks-writer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//emcalMatchedTracksTask.cxx" target="_blank">emcalMatchedTracksTask.cxx</a>
 <div>
 
@@ -60380,7 +61097,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-subtractor-eventwiseconstituent
+### o2-analysis-je-subtractor-eventwiseconstituent
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//eventwiseConstituentSubtractor.cxx" target="_blank">eventwiseConstituentSubtractor.cxx</a>
 <div>
 
@@ -60896,7 +61614,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-deriveddata-producer
+### o2-analysis-je-jet-deriveddata-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetderiveddataproducer.cxx" target="_blank">jetderiveddataproducer.cxx</a>
 <div>
 
@@ -61068,31 +61787,36 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-deriveddata-producer-dummy
+### o2-analysis-je-jet-deriveddata-producer-dummy
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetderiveddataproducerdummy.cxx" target="_blank">jetderiveddataproducerdummy.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-je-jet-deriveddata-producer-dummy-d0
+### o2-analysis-je-jet-deriveddata-producer-dummy-d0
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetderiveddataproducerdummyd0.cxx" target="_blank">jetderiveddataproducerdummyd0.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-je-jet-deriveddata-producer-dummy-dielectron
+### o2-analysis-je-jet-deriveddata-producer-dummy-dielectron
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetderiveddataproducerdummydielectron.cxx" target="_blank">jetderiveddataproducerdummydielectron.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-je-jet-deriveddata-producer-dummy-lc
+### o2-analysis-je-jet-deriveddata-producer-dummy-lc
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetderiveddataproducerdummylc.cxx" target="_blank">jetderiveddataproducerdummylc.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-je-jet-deriveddata-trigger-producer
+### o2-analysis-je-jet-deriveddata-trigger-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetderiveddatatriggerproducer.cxx" target="_blank">jetderiveddatatriggerproducer.cxx</a>
 <div>
 
@@ -61176,13 +61900,15 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-deriveddata-writer
+### o2-analysis-je-jet-deriveddata-writer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetderiveddatawriter.cxx" target="_blank">jetderiveddatawriter.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-je-jet-eventweight-mcd
+### o2-analysis-je-jet-eventweight-mcd
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jeteventweightmcd.cxx" target="_blank">jeteventweightmcd.cxx</a>
 <div>
 
@@ -61720,7 +62446,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-eventweight-mcp
+### o2-analysis-je-jet-eventweight-mcp
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jeteventweightmcp.cxx" target="_blank">jeteventweightmcp.cxx</a>
 <div>
 
@@ -61992,13 +62719,15 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-matching-duplicates
+### o2-analysis-je-jet-matching-duplicates
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetmatchingduplicates.cxx" target="_blank">jetmatchingduplicates.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-je-jet-matching-mc
+### o2-analysis-je-jet-matching-mc
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetmatchingmc.cxx" target="_blank">jetmatchingmc.cxx</a>
 <div>
 
@@ -62732,7 +63461,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-matching-mc-sub
+### o2-analysis-je-jet-matching-mc-sub
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetmatchingmcsub.cxx" target="_blank">jetmatchingmcsub.cxx</a>
 <div>
 
@@ -63154,7 +63884,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-matching-sub
+### o2-analysis-je-jet-matching-sub
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jetmatchingsub.cxx" target="_blank">jetmatchingsub.cxx</a>
 <div>
 
@@ -63576,7 +64307,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-taggerhf
+### o2-analysis-je-jet-taggerhf
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jettaggerhf.cxx" target="_blank">jettaggerhf.cxx</a>
 <div>
 
@@ -63948,7 +64680,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-track-derived
+### o2-analysis-je-jet-track-derived
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//jettrackderived.cxx" target="_blank">jettrackderived.cxx</a>
 <div>
 
@@ -64377,13 +65110,15 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-luminosity-producer
+### o2-analysis-je-jet-luminosity-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//luminosityproducer.cxx" target="_blank">luminosityproducer.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-je-estimator-rho
+### o2-analysis-je-estimator-rho
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//rhoEstimator.cxx" target="_blank">rhoEstimator.cxx</a>
 <div>
 
@@ -64589,7 +65324,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 </div>
 
-###  o2-analysis-je-jet-sv-reconstruction
+### o2-analysis-je-jet-sv-reconstruction
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE/TableProducer//secondaryVertexReconstruction.cxx" target="_blank">secondaryVertexReconstruction.cxx</a>
 <div>
 
@@ -64597,7 +65333,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGJE
 
 ## PWG-LF
 
-###  o2-analysis-lf-epvector
+### o2-analysis-lf-epvector
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Common//epvector.cxx" target="_blank">epvector.cxx</a>
 <div>
 
@@ -64711,7 +65448,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-tpcpid
+### o2-analysis-lf-tpcpid
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Common//lfTPCPID.cxx" target="_blank">lfTPCPID.cxx</a>
 <div>
 
@@ -65437,7 +66175,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-mc-centrality
+### o2-analysis-lf-mc-centrality
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Common//mcCentrality.cxx" target="_blank">mcCentrality.cxx</a>
 <div>
 
@@ -65599,7 +66338,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-spvector
+### o2-analysis-lf-spvector
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Common//spvector.cxx" target="_blank">spvector.cxx</a>
 <div>
 
@@ -65625,9 +66365,9 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <th>Comment</th>
       </tr>
       <tr>
-        <td>o2::aod::spcalibrationtable::TriggerEvent</td>
+        <td>o2::aod::spcalibrationtable::TriggerEventSP</td>
         <td></td>
-        <td>triggerevent</td>
+        <td>triggereventsp</td>
         <td>bool</td>
         <td></td>
       </tr>
@@ -65783,7 +66523,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-zdcsp
+### o2-analysis-lf-zdcsp
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Common//zdcSP.cxx" target="_blank">zdcSP.cxx</a>
 <div>
 
@@ -65927,7 +66668,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-cluster-studies-tree-creator
+### o2-analysis-lf-cluster-studies-tree-creator
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//LFTreeCreatorClusterStudies.cxx" target="_blank">LFTreeCreatorClusterStudies.cxx</a>
 <div>
 
@@ -66261,7 +67003,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-nucleustreecreator
+### o2-analysis-lf-nucleustreecreator
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//LFTreeCreatorNuclei.cxx" target="_blank">LFTreeCreatorNuclei.cxx</a>
 <div>
 
@@ -66848,7 +67591,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-decay3bodybuilder
+### o2-analysis-lf-decay3bodybuilder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//decay3bodybuilder.cxx" target="_blank">decay3bodybuilder.cxx</a>
 <div>
 
@@ -67581,6 +68325,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>chi2 of proton, pion mass constraint to Lambda mass</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::CosPAV0</td>
+        <td></td>
+        <td>cospav0</td>
+        <td>float</td>
+        <td>proton, pion vertex mass</td>
+      </tr>
       <tr>
         <td>o2::aod::vtx3body::PxTrack0</td>
         <td></td>
@@ -67644,6 +68395,27 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>track2 pz at min</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCInnerParamTrack0</td>
+        <td></td>
+        <td>tpcinnerparamtrack0</td>
+        <td>float</td>
+        <td>momentum at inner wall of TPC of proton daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCInnerParamTrack1</td>
+        <td></td>
+        <td>tpcinnerparamtrack1</td>
+        <td>float</td>
+        <td>momentum at inner wall of TPC of pion daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCInnerParamTrack2</td>
+        <td></td>
+        <td>tpcinnerparamtrack2</td>
+        <td>float</td>
+        <td>momentum at inner wall of TPC of deuteron daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::kfvtx3body::DCATrack0ToPVKF</td>
         <td></td>
@@ -67819,6 +68591,48 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>nsigma of TPC PID of the bachelor daughter</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxProton</td>
+        <td></td>
+        <td>tpcdedxproton</td>
+        <td>float</td>
+        <td>TPC dEdx of the proton daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxPion</td>
+        <td></td>
+        <td>tpcdedxpion</td>
+        <td>float</td>
+        <td>TPC dEdx of the pion daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxDeuteron</td>
+        <td></td>
+        <td>tpcdedxdeuteron</td>
+        <td>float</td>
+        <td>TPC dEdx of the bachelor daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TOFNSigmaDeuteron</td>
+        <td></td>
+        <td>tofnsigmadeuteron</td>
+        <td>float</td>
+        <td>nsigma of TOF PID of the bachelor daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::ITSClusSizeDeuteron</td>
+        <td></td>
+        <td>itsclussizedeuteron</td>
+        <td>double</td>
+        <td>average ITS cluster size of bachelor daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::PIDTrackingDeuteron</td>
+        <td></td>
+        <td>pidtrackingdeuteron</td>
+        <td>uint32_t</td>
+        <td>PID during tracking of bachelor daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::vtx3body::VtxRadius</td>
         <td>D</td>
@@ -68022,27 +68836,6 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>decay position Z</td>
       </tr>
-      <tr>
-        <td>o2::aod::kfvtx3body::XErr</td>
-        <td></td>
-        <td>xerr</td>
-        <td>float</td>
-        <td>candidate position x error at decay position</td>
-      </tr>
-      <tr>
-        <td>o2::aod::kfvtx3body::YErr</td>
-        <td></td>
-        <td>yerr</td>
-        <td>float</td>
-        <td>candidate position y error at decay position</td>
-      </tr>
-      <tr>
-        <td>o2::aod::kfvtx3body::ZErr</td>
-        <td></td>
-        <td>zerr</td>
-        <td>float</td>
-        <td>candidate position z error at decay position</td>
-      </tr>
       <tr>
         <td>o2::aod::kfvtx3body::Px</td>
         <td></td>
@@ -68106,20 +68899,6 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>3 body vtx CosPA from KFParticle (using kfpPV)</td>
       </tr>
-      <tr>
-        <td>o2::aod::kfvtx3body::VtxCosPAKFtopo</td>
-        <td></td>
-        <td>vtxcospakftopo</td>
-        <td>float</td>
-        <td>3 body vtx CosPA from KFParticle after topological constraint (using kfpPV)</td>
-      </tr>
-      <tr>
-        <td>o2::aod::kfvtx3body::VtxCosXYPAKFtopo</td>
-        <td></td>
-        <td>vtxcosxypakftopo</td>
-        <td>float</td>
-        <td>3 body vtx CosPA from KFParticle after topological constraint (using kfpPV)</td>
-      </tr>
       <tr>
         <td>o2::aod::kfvtx3body::DecayLKF</td>
         <td></td>
@@ -68176,6 +68955,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>chi2 of proton, pion mass constraint to Lambda mass</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::CosPAV0</td>
+        <td></td>
+        <td>cospav0</td>
+        <td>float</td>
+        <td>proton, pion vertex mass</td>
+      </tr>
       <tr>
         <td>o2::aod::vtx3body::PxTrack0</td>
         <td></td>
@@ -68239,6 +69025,27 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>track2 pz at min</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCInnerParamTrack0</td>
+        <td></td>
+        <td>tpcinnerparamtrack0</td>
+        <td>float</td>
+        <td>momentum at inner wall of TPC of proton daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCInnerParamTrack1</td>
+        <td></td>
+        <td>tpcinnerparamtrack1</td>
+        <td>float</td>
+        <td>momentum at inner wall of TPC of pion daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCInnerParamTrack2</td>
+        <td></td>
+        <td>tpcinnerparamtrack2</td>
+        <td>float</td>
+        <td>momentum at inner wall of TPC of deuteron daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::kfvtx3body::DCATrack0ToPVKF</td>
         <td></td>
@@ -68331,88 +69138,88 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>sum of DCAs between daughters in 3D from KFParticle</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::DCAxyTrackPosToPV</td>
+        <td>o2::aod::kfvtx3body::Track0Sign</td>
         <td></td>
-        <td>dcaxytrackpostopv</td>
+        <td>track0sign</td>
         <td>float</td>
-        <td>DCAxy of positive track to PV (propagated before vtx fit)</td>
+        <td>sign of proton daughter track</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::DCAxyTrackNegToPV</td>
+        <td>o2::aod::kfvtx3body::Track1Sign</td>
         <td></td>
-        <td>dcaxytracknegtopv</td>
+        <td>track1sign</td>
         <td>float</td>
-        <td>DCAxy of negative track to PV (propagated before vtx fit)</td>
+        <td>sign of pion daughter track</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::DCAxyTrackBachToPV</td>
+        <td>o2::aod::kfvtx3body::Track2Sign</td>
         <td></td>
-        <td>dcaxytrackbachtopv</td>
+        <td>track2sign</td>
         <td>float</td>
-        <td>DCAxy of bachelor track to PV (propagated before vtx fit)</td>
+        <td>sign of deuteron daughter track</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::DCATrackPosToPV</td>
+        <td>o2::aod::kfvtx3body::TPCNSigmaProton</td>
         <td></td>
-        <td>dcatrackpostopv</td>
+        <td>tpcnsigmaproton</td>
         <td>float</td>
-        <td>DCA of positive track to PV (propagated before vtx fit)</td>
+        <td>nsigma of TPC PID of the proton daughter</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::DCATrackNegToPV</td>
+        <td>o2::aod::kfvtx3body::TPCNSigmaPion</td>
         <td></td>
-        <td>dcatracknegtopv</td>
+        <td>tpcnsigmapion</td>
         <td>float</td>
-        <td>DCA of negative track to PV (propagated before vtx fit)</td>
+        <td>nsigma of TPC PID of the pion daughter</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::DCATrackBachToPV</td>
+        <td>o2::aod::kfvtx3body::TPCNSigmaDeuteron</td>
         <td></td>
-        <td>dcatrackbachtopv</td>
+        <td>tpcnsigmadeuteron</td>
         <td>float</td>
-        <td>DCA of bachelor track to PV (propagated before vtx fit)</td>
+        <td>nsigma of TPC PID of the bachelor daughter</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::Track0Sign</td>
+        <td>o2::aod::kfvtx3body::TPCdEdxProton</td>
         <td></td>
-        <td>track0sign</td>
+        <td>tpcdedxproton</td>
         <td>float</td>
-        <td>sign of proton daughter track</td>
+        <td>TPC dEdx of the proton daughter</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::Track1Sign</td>
+        <td>o2::aod::kfvtx3body::TPCdEdxPion</td>
         <td></td>
-        <td>track1sign</td>
+        <td>tpcdedxpion</td>
         <td>float</td>
-        <td>sign of pion daughter track</td>
+        <td>TPC dEdx of the pion daughter</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::Track2Sign</td>
+        <td>o2::aod::kfvtx3body::TPCdEdxDeuteron</td>
         <td></td>
-        <td>track2sign</td>
+        <td>tpcdedxdeuteron</td>
         <td>float</td>
-        <td>sign of deuteron daughter track</td>
+        <td>TPC dEdx of the bachelor daughter</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::TPCNSigmaProton</td>
+        <td>o2::aod::kfvtx3body::TOFNSigmaDeuteron</td>
         <td></td>
-        <td>tpcnsigmaproton</td>
+        <td>tofnsigmadeuteron</td>
         <td>float</td>
-        <td>nsigma of TPC PID of the proton daughter</td>
+        <td>nsigma of TOF PID of the bachelor daughter</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::TPCNSigmaPion</td>
+        <td>o2::aod::kfvtx3body::ITSClusSizeDeuteron</td>
         <td></td>
-        <td>tpcnsigmapion</td>
-        <td>float</td>
-        <td>nsigma of TPC PID of the pion daughter</td>
+        <td>itsclussizedeuteron</td>
+        <td>double</td>
+        <td>average ITS cluster size of bachelor daughter</td>
       </tr>
       <tr>
-        <td>o2::aod::kfvtx3body::TPCNSigmaDeuteron</td>
+        <td>o2::aod::kfvtx3body::PIDTrackingDeuteron</td>
         <td></td>
-        <td>tpcnsigmadeuteron</td>
-        <td>float</td>
-        <td>nsigma of TPC PID of the bachelor daughter</td>
+        <td>pidtrackingdeuteron</td>
+        <td>uint32_t</td>
+        <td>PID during tracking of bachelor daughter</td>
       </tr>
       <tr>
         <td>o2::aod::vtx3body::VtxRadius</td>
@@ -68593,13 +69400,373 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-ebye-maker
+### o2-analysis-lf-ebye-maker
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//ebyeMaker.cxx" target="_blank">ebyeMaker.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-lf-hyhefour-builder
+### o2-analysis-lf-he3hadronfemto
+
+Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//he3HadronFemto.cxx" target="_blank">he3HadronFemto.cxx</a>
+<div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::he3HadronTable</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFhe3HadronTables.h" target="_blank">PWGLF/DataModel/LFhe3HadronTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PtHe3</td>
+        <td></td>
+        <td>ptHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::EtaHe3</td>
+        <td></td>
+        <td>etaHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PhiHe3</td>
+        <td></td>
+        <td>phiHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PtHad</td>
+        <td></td>
+        <td>ptHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::EtaHad</td>
+        <td></td>
+        <td>etaHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PhiHad</td>
+        <td></td>
+        <td>phiHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::DCAxyHe3</td>
+        <td></td>
+        <td>dcaxyHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::DCAzHe3</td>
+        <td></td>
+        <td>dcazHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::DCAxyHad</td>
+        <td></td>
+        <td>dcaxyHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::DCAzHad</td>
+        <td></td>
+        <td>dcazHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::SignalTPCHe3</td>
+        <td></td>
+        <td>signalTPCHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::InnerParamTPCHe3</td>
+        <td></td>
+        <td>innerParamTPCHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::SignalTPCHad</td>
+        <td></td>
+        <td>signalTPCHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::InnerParamTPCHad</td>
+        <td></td>
+        <td>innerParamTPCHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::NClsTPCHe3</td>
+        <td></td>
+        <td>nClsTPCHe3</td>
+        <td>uint8_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::NSigmaTPCHe3</td>
+        <td></td>
+        <td>nSigmaTPCHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::NSigmaTPCHad</td>
+        <td></td>
+        <td>nSigmaTOFHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::Chi2TPCHe3</td>
+        <td></td>
+        <td>chi2TPCHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::Chi2TPCHad</td>
+        <td></td>
+        <td>chi2TPCHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::MassTOFHe3</td>
+        <td></td>
+        <td>massTOFHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::MassTOFHad</td>
+        <td></td>
+        <td>massTOFHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PIDtrkHe3</td>
+        <td></td>
+        <td>pidTrkHe3</td>
+        <td>uint32_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PIDtrkHad</td>
+        <td></td>
+        <td>pidTrkHad</td>
+        <td>uint32_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::ItsClusterSizeHe3</td>
+        <td></td>
+        <td>itsClusterSizeHe3</td>
+        <td>uint32_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::ItsClusterSizeHad</td>
+        <td></td>
+        <td>itsClusterSizeHad</td>
+        <td>uint32_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::SharedClustersHe3</td>
+        <td></td>
+        <td>sharedClustersHe3</td>
+        <td>uint8_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::SharedClustersHad</td>
+        <td></td>
+        <td>sharedClustersHad</td>
+        <td>uint8_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::IsBkgUS</td>
+        <td></td>
+        <td>isBkgUS</td>
+        <td>bool</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::IsBkgEM</td>
+        <td></td>
+        <td>isBkgEM</td>
+        <td>bool</td>
+        <td></td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::he3HadronTableMC</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFhe3HadronTables.h" target="_blank">PWGLF/DataModel/LFhe3HadronTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PtMCHe3</td>
+        <td></td>
+        <td>ptMCHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::EtaMCHe3</td>
+        <td></td>
+        <td>etaMCHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PhiMCHe3</td>
+        <td></td>
+        <td>phiMCHe3</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PtMCHad</td>
+        <td></td>
+        <td>ptMCHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::EtaMCHad</td>
+        <td></td>
+        <td>etaMCHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::PhiMCHad</td>
+        <td></td>
+        <td>phiMCHad</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::SignedPtMC</td>
+        <td></td>
+        <td>signedPtMC</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::MassMC</td>
+        <td></td>
+        <td>massMC</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::he3HadronMult</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFhe3HadronTables.h" target="_blank">PWGLF/DataModel/LFhe3HadronTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::CollisionId</td>
+        <td></td>
+        <td>collisionId</td>
+        <td>int64_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::ZVertex</td>
+        <td></td>
+        <td>zVertex</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::Multiplicity</td>
+        <td></td>
+        <td>multiplicity</td>
+        <td>uint16_t</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS::CentralityFT0C</td>
+        <td></td>
+        <td>centFT0C</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::he3HadronTablesNS:</td>
+        <td>GI</td>
+        <td></td>
+        <td>?</td>
+        <td></td>
+      </tr>
+    </table>
+  </div>
+
+</div>
+
+### o2-analysis-lf-hyhefour-builder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//hyhe4builder.cxx" target="_blank">hyhe4builder.cxx</a>
 <div>
 
@@ -68923,7 +70090,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-hyper-kink-reco-task
+### o2-analysis-lf-hyper-kink-reco-task
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//hyperKinkRecoTask.cxx" target="_blank">hyperKinkRecoTask.cxx</a>
 <div>
 
@@ -69380,7 +70548,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-hypertriton-reco-task
+### o2-analysis-lf-hypertriton-reco-task
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//hyperRecoTask.cxx" target="_blank">hyperRecoTask.cxx</a>
 <div>
 
@@ -70270,7 +71439,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-hypertriton3bodyfinder
+### o2-analysis-lf-hypertriton3bodyfinder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//hypertriton3bodyfinder.cxx" target="_blank">hypertriton3bodyfinder.cxx</a>
 <div>
 
@@ -70669,17 +71839,23 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-lithium4analysis
-Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//lithium4analysis.cxx" target="_blank">lithium4analysis.cxx</a>
+### o2-analysis-lf-lnn-reco-task
+
+Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//lnnRecoTask.cxx" target="_blank">lnnRecoTask.cxx</a>
 <div>
 
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::Lithium4Table</button>
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::DataLnnCands</button>
   <div class="panel">
     <div>
 
     </div>
     <div>
-      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFLithium4Tables.h" target="_blank">PWGLF/DataModel/LFLithium4Tables.h</a>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFLnnTables.h" target="_blank">PWGLF/DataModel/LFLnnTables.h</a>
+    </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::DataLnnCand = o2::aod::DataLnnCands::iterator</li>
+      </ul>
     </div>
     <table class=DataModel>
       <tr>
@@ -70690,496 +71866,233 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <th>Comment</th>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PtHe3</td>
-        <td></td>
-        <td>ptHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaHe3</td>
-        <td></td>
-        <td>etaHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiHe3</td>
-        <td></td>
-        <td>phiHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PtPr</td>
-        <td></td>
-        <td>ptPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaPr</td>
-        <td></td>
-        <td>etaPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiPr</td>
-        <td></td>
-        <td>phiPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAxyHe3</td>
-        <td></td>
-        <td>dcaxyHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAzHe3</td>
-        <td></td>
-        <td>dcazHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAxyPr</td>
-        <td></td>
-        <td>dcaxyPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAzPr</td>
-        <td></td>
-        <td>dcazPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SignalTPCHe3</td>
-        <td></td>
-        <td>signalTPCHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::InnerParamTPCHe3</td>
-        <td></td>
-        <td>innerParamTPCHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SignalTPCPr</td>
-        <td></td>
-        <td>signalTPCPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::InnerParamTPCPr</td>
-        <td></td>
-        <td>innerParamTPCPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::NClsTPCHe3</td>
-        <td></td>
-        <td>nClsTPCHe3</td>
-        <td>uint8_t</td>
+        <td>o2::soa::Index</td>
+        <td>GI</td>
+        <td>globalIndex</td>
+        <td>int64_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::NSigmaTPCHe3</td>
+        <td>o2::aod::lnnrec::CentralityFT0A</td>
         <td></td>
-        <td>nSigmaTPCHe3</td>
+        <td>centralityFT0A</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::NSigmaTPCPr</td>
+        <td>o2::aod::lnnrec::CentralityFT0C</td>
         <td></td>
-        <td>nSigmaTOFPr</td>
+        <td>centralityFT0C</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::Chi2TPCHe3</td>
+        <td>o2::aod::lnnrec::CentralityFT0M</td>
         <td></td>
-        <td>chi2TPCHe3</td>
+        <td>centralityFT0M</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::Chi2TPCPr</td>
+        <td>o2::aod::lnnrec::XPrimVtx</td>
         <td></td>
-        <td>chi2TPCPr</td>
+        <td>xPrimVtx</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::MassTOFHe3</td>
+        <td>o2::aod::lnnrec::YPrimVtx</td>
         <td></td>
-        <td>massTOFHe3</td>
+        <td>yPrimVtx</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::MassTOFPr</td>
+        <td>o2::aod::lnnrec::ZPrimVtx</td>
         <td></td>
-        <td>massTOFPr</td>
+        <td>zPrimVtx</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PIDtrkHe3</td>
-        <td></td>
-        <td>pidTrkHe3</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PIDtrkPr</td>
-        <td></td>
-        <td>pidTrkPr</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::ItsClusterSizeHe3</td>
-        <td></td>
-        <td>itsClusterSizeHe3</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::ItsClusterSizePr</td>
-        <td></td>
-        <td>itsClusterSizePr</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SharedClustersHe3</td>
-        <td></td>
-        <td>sharedClustersHe3</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SharedClustersPr</td>
-        <td></td>
-        <td>sharedClustersPr</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::IsBkgLS</td>
-        <td></td>
-        <td>isBkgLS</td>
-        <td>bool</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::IsBkgEM</td>
+        <td>o2::aod::lnnrec::IsMatter</td>
         <td></td>
-        <td>isBkgEM</td>
+        <td>isMatter</td>
         <td>bool</td>
         <td></td>
       </tr>
-    </table>
-  </div>
-
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::Lithium4TableMC</button>
-  <div class="panel">
-    <div>
-
-    </div>
-    <div>
-      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFLithium4Tables.h" target="_blank">PWGLF/DataModel/LFLithium4Tables.h</a>
-    </div>
-    <table class=DataModel>
-      <tr>
-        <th>Name</th>
-        <th></th>
-        <th>Getter</th>
-        <th>Type</th>
-        <th>Comment</th>
-      </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PtHe3</td>
+        <td>o2::aod::lnnrec::Pt3H</td>
         <td></td>
-        <td>ptHe3</td>
+        <td>pt3H</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaHe3</td>
+        <td>o2::aod::lnnrec::Phi3H</td>
         <td></td>
-        <td>etaHe3</td>
+        <td>phi3H</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiHe3</td>
+        <td>o2::aod::lnnrec::Eta3H</td>
         <td></td>
-        <td>phiHe3</td>
+        <td>eta3H</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PtPr</td>
+        <td>o2::aod::lnnrec::PtPi</td>
         <td></td>
-        <td>ptPr</td>
+        <td>ptPi</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaPr</td>
+        <td>o2::aod::lnnrec::PhiPi</td>
         <td></td>
-        <td>etaPr</td>
+        <td>phiPi</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiPr</td>
+        <td>o2::aod::lnnrec::EtaPi</td>
         <td></td>
-        <td>phiPr</td>
+        <td>etaPi</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAxyHe3</td>
+        <td>o2::aod::lnnrec::XDecVtx</td>
         <td></td>
-        <td>dcaxyHe3</td>
+        <td>xDecVtx</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAzHe3</td>
+        <td>o2::aod::lnnrec::YDecVtx</td>
         <td></td>
-        <td>dcazHe3</td>
+        <td>yDecVtx</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAxyPr</td>
+        <td>o2::aod::lnnrec::ZDecVtx</td>
         <td></td>
-        <td>dcaxyPr</td>
+        <td>zDecVtx</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::DCAzPr</td>
+        <td>o2::aod::lnnrec::DcaV0Daug</td>
         <td></td>
-        <td>dcazPr</td>
+        <td>dcaV0Daug</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::SignalTPCHe3</td>
+        <td>o2::aod::lnnrec::Dca3H</td>
         <td></td>
-        <td>signalTPCHe3</td>
+        <td>dca3H</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::InnerParamTPCHe3</td>
+        <td>o2::aod::lnnrec::DcaPi</td>
         <td></td>
-        <td>innerParamTPCHe3</td>
+        <td>dcaPi</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::SignalTPCPr</td>
+        <td>o2::aod::lnnrec::NSigma3H</td>
         <td></td>
-        <td>signalTPCPr</td>
+        <td>nSigma3H</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::InnerParamTPCPr</td>
+        <td>o2::aod::lnnrec::NTPCclus3H</td>
         <td></td>
-        <td>innerParamTPCPr</td>
-        <td>float</td>
+        <td>nTPCclus3H</td>
+        <td>uint8_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::NClsTPCHe3</td>
+        <td>o2::aod::lnnrec::NTPCclusPi</td>
         <td></td>
-        <td>nClsTPCHe3</td>
+        <td>nTPCclusPi</td>
         <td>uint8_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::NSigmaTPCHe3</td>
+        <td>o2::aod::lnnrec::TPCmom3H</td>
         <td></td>
-        <td>nSigmaTPCHe3</td>
+        <td>tpcMom3H</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::NSigmaTPCPr</td>
+        <td>o2::aod::lnnrec::TPCmomPi</td>
         <td></td>
-        <td>nSigmaTOFPr</td>
+        <td>tpcMomPi</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::Chi2TPCHe3</td>
+        <td>o2::aod::lnnrec::TPCsignal3H</td>
         <td></td>
-        <td>chi2TPCHe3</td>
-        <td>float</td>
+        <td>tpcSignal3H</td>
+        <td>uint16_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::Chi2TPCPr</td>
+        <td>o2::aod::lnnrec::TPCsignalPi</td>
         <td></td>
-        <td>chi2TPCPr</td>
-        <td>float</td>
+        <td>tpcSignalPi</td>
+        <td>uint16_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::MassTOFHe3</td>
+        <td>o2::aod::lnnrec::MassTrTOF</td>
         <td></td>
-        <td>massTOFHe3</td>
+        <td>mass2TrTOF</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::MassTOFPr</td>
+        <td>o2::aod::lnnrec::TPCchi3H</td>
         <td></td>
-        <td>massTOFPr</td>
+        <td>tpcChi3H</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::PIDtrkHe3</td>
-        <td></td>
-        <td>pidTrkHe3</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PIDtrkPr</td>
-        <td></td>
-        <td>pidTrkPr</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::ItsClusterSizeHe3</td>
+        <td>o2::aod::lnnrec::ITSclusterSizes3H</td>
         <td></td>
-        <td>itsClusterSizeHe3</td>
+        <td>itsClusterSizes3H</td>
         <td>uint32_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::ItsClusterSizePr</td>
+        <td>o2::aod::lnnrec::ITSclusterSizesPi</td>
         <td></td>
-        <td>itsClusterSizePr</td>
+        <td>itsClusterSizesPi</td>
         <td>uint32_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::Lithium4TablesNS::SharedClustersHe3</td>
-        <td></td>
-        <td>sharedClustersHe3</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SharedClustersPr</td>
+        <td>o2::aod::lnnrec::Flags</td>
         <td></td>
-        <td>sharedClustersPr</td>
+        <td>flags</td>
         <td>uint8_t</td>
         <td></td>
       </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::IsBkgLS</td>
-        <td></td>
-        <td>isBkgLS</td>
-        <td>bool</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::IsBkgEM</td>
-        <td></td>
-        <td>isBkgEM</td>
-        <td>bool</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PtMCHe3</td>
-        <td></td>
-        <td>ptMCHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaMCHe3</td>
-        <td></td>
-        <td>etaMCHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiMCHe3</td>
-        <td></td>
-        <td>phiMCHe3</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PtMCPr</td>
-        <td></td>
-        <td>ptMCPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::EtaMCPr</td>
-        <td></td>
-        <td>etaMCPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::PhiMCPr</td>
-        <td></td>
-        <td>phiMCPr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS::SignedPtMC</td>
-        <td></td>
-        <td>signedPtMC</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::Lithium4TablesNS:</td>
-        <td>GI</td>
-        <td></td>
-        <td>?</td>
-        <td></td>
-      </tr>
     </table>
   </div>
 
-</div>
-
-###  o2-analysis-lf-lnn-reco-task
-Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//lnnRecoTask.cxx" target="_blank">lnnRecoTask.cxx</a>
-<div>
-
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::DataLnnCands</button>
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::MCLnnCands</button>
   <div class="panel">
     <div>
 
@@ -71189,7 +72102,7 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
     </div>
     <div>Is used in:
       <ul>
-        <li>o2::aod::DataLnnCand = o2::aod::DataLnnCands::iterator</li>
+        <li>o2::aod::MCLnnCand = o2::aod::MCLnnCands::iterator</li>
       </ul>
     </div>
     <table class=DataModel>
@@ -71424,334 +72337,342 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>uint8_t</td>
         <td></td>
       </tr>
-    </table>
-  </div>
-
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::MCLnnCands</button>
-  <div class="panel">
-    <div>
-
-    </div>
-    <div>
-      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFLnnTables.h" target="_blank">PWGLF/DataModel/LFLnnTables.h</a>
-    </div>
-    <div>Is used in:
-      <ul>
-        <li>o2::aod::MCLnnCand = o2::aod::MCLnnCands::iterator</li>
-      </ul>
-    </div>
-    <table class=DataModel>
       <tr>
-        <th>Name</th>
-        <th></th>
-        <th>Getter</th>
-        <th>Type</th>
-        <th>Comment</th>
-      </tr>
-      <tr>
-        <td>o2::soa::Index</td>
-        <td>GI</td>
-        <td>globalIndex</td>
-        <td>int64_t</td>
+        <td>o2::aod::lnnrec::GenPt</td>
+        <td></td>
+        <td>genPt</td>
+        <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::CentralityFT0A</td>
+        <td>o2::aod::lnnrec::GenPhi</td>
         <td></td>
-        <td>centralityFT0A</td>
+        <td>genPhi</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::CentralityFT0C</td>
+        <td>o2::aod::lnnrec::GenEta</td>
         <td></td>
-        <td>centralityFT0C</td>
+        <td>genEta</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::CentralityFT0M</td>
+        <td>o2::aod::lnnrec::GenPt3H</td>
         <td></td>
-        <td>centralityFT0M</td>
+        <td>genPt3H</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::XPrimVtx</td>
+        <td>o2::aod::lnnrec::GenXDecVtx</td>
         <td></td>
-        <td>xPrimVtx</td>
+        <td>genXDecVtx</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::YPrimVtx</td>
+        <td>o2::aod::lnnrec::GenYDecVtx</td>
         <td></td>
-        <td>yPrimVtx</td>
+        <td>genYDecVtx</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::ZPrimVtx</td>
+        <td>o2::aod::lnnrec::GenZDecVtx</td>
         <td></td>
-        <td>zPrimVtx</td>
+        <td>genZDecVtx</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::IsMatter</td>
+        <td>o2::aod::lnnrec::IsReco</td>
         <td></td>
-        <td>isMatter</td>
+        <td>isReco</td>
         <td>bool</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::Pt3H</td>
+        <td>o2::aod::lnnrec::IsSignal</td>
         <td></td>
-        <td>pt3H</td>
-        <td>float</td>
+        <td>isSignal</td>
+        <td>bool</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::Phi3H</td>
+        <td>o2::aod::lnnrec::SurvivedEventSelection</td>
         <td></td>
-        <td>phi3H</td>
-        <td>float</td>
+        <td>survivedEventSelection</td>
+        <td>bool</td>
         <td></td>
       </tr>
+    </table>
+  </div>
+
+</div>
+
+### o2-analysis-lf-nuclei-spectra
+
+Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//nucleiSpectra.cxx" target="_blank">nucleiSpectra.cxx</a>
+<div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::NucleiTable</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFSlimNucleiTables.h" target="_blank">PWGLF/DataModel/LFSlimNucleiTables.h</a>
+    </div>
+    <table class=DataModel>
       <tr>
-        <td>o2::aod::lnnrec::Eta3H</td>
-        <td></td>
-        <td>eta3H</td>
-        <td>float</td>
-        <td></td>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::PtPi</td>
+        <td>o2::aod::NucleiTableNS::Pt</td>
         <td></td>
-        <td>ptPi</td>
+        <td>pt</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::PhiPi</td>
+        <td>o2::aod::NucleiTableNS::Eta</td>
         <td></td>
-        <td>phiPi</td>
+        <td>eta</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::EtaPi</td>
+        <td>o2::aod::NucleiTableNS::Phi</td>
         <td></td>
-        <td>etaPi</td>
+        <td>phi</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::XDecVtx</td>
+        <td>o2::aod::NucleiTableNS::TPCInnerParam</td>
         <td></td>
-        <td>xDecVtx</td>
+        <td>tpcInnerParam</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::YDecVtx</td>
+        <td>o2::aod::NucleiTableNS::Beta</td>
         <td></td>
-        <td>yDecVtx</td>
+        <td>beta</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::ZDecVtx</td>
+        <td>o2::aod::NucleiTableNS::Zvertex</td>
         <td></td>
-        <td>zDecVtx</td>
+        <td>zVertex</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::DcaV0Daug</td>
+        <td>o2::aod::NucleiTableNS::DCAxy</td>
         <td></td>
-        <td>dcaV0Daug</td>
+        <td>dcaxy</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::Dca3H</td>
+        <td>o2::aod::NucleiTableNS::DCAz</td>
         <td></td>
-        <td>dca3H</td>
+        <td>dcaz</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::DcaPi</td>
+        <td>o2::aod::NucleiTableNS::TPCsignal</td>
         <td></td>
-        <td>dcaPi</td>
+        <td>tpcSignal</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::NSigma3H</td>
+        <td>o2::aod::NucleiTableNS::ITSchi2</td>
         <td></td>
-        <td>nSigma3H</td>
+        <td>itsChi2</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::NTPCclus3H</td>
+        <td>o2::aod::NucleiTableNS::TPCchi2</td>
         <td></td>
-        <td>nTPCclus3H</td>
-        <td>uint8_t</td>
+        <td>tpcChi2</td>
+        <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::NTPCclusPi</td>
+        <td>o2::aod::NucleiTableNS::TOFchi2</td>
         <td></td>
-        <td>nTPCclusPi</td>
-        <td>uint8_t</td>
+        <td>tofChi2</td>
+        <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::TPCmom3H</td>
+        <td>o2::aod::NucleiTableNS::Flags</td>
         <td></td>
-        <td>tpcMom3H</td>
-        <td>float</td>
+        <td>flags</td>
+        <td>uint16_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::TPCmomPi</td>
+        <td>o2::aod::NucleiTableNS::TPCfindableCls</td>
         <td></td>
-        <td>tpcMomPi</td>
-        <td>float</td>
+        <td>tpcFindableCls</td>
+        <td>uint8_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::TPCsignal3H</td>
+        <td>o2::aod::NucleiTableNS::TPCcrossedRows</td>
         <td></td>
-        <td>tpcSignal3H</td>
-        <td>uint16_t</td>
+        <td>tpcCrossedRows</td>
+        <td>uint8_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::TPCsignalPi</td>
+        <td>o2::aod::NucleiTableNS::ITSclsMap</td>
         <td></td>
-        <td>tpcSignalPi</td>
-        <td>uint16_t</td>
+        <td>itsClsMap</td>
+        <td>uint8_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::MassTrTOF</td>
+        <td>o2::aod::NucleiTableNS::TPCnCls</td>
         <td></td>
-        <td>mass2TrTOF</td>
-        <td>float</td>
+        <td>tpcNCls</td>
+        <td>uint8_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::TPCchi3H</td>
+        <td>o2::aod::NucleiTableNS::TPCnClsShared</td>
         <td></td>
-        <td>tpcChi3H</td>
-        <td>float</td>
+        <td>tpcNClsShared</td>
+        <td>uint8_t</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::ITSclusterSizes3H</td>
+        <td>o2::aod::NucleiTableNS::ITSclusterSizes</td>
         <td></td>
-        <td>itsClusterSizes3H</td>
+        <td>itsClusterSizes</td>
         <td>uint32_t</td>
         <td></td>
       </tr>
+    </table>
+  </div>
+
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::NucleiTableFlow</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFSlimNucleiTables.h" target="_blank">PWGLF/DataModel/LFSlimNucleiTables.h</a>
+    </div>
+    <table class=DataModel>
       <tr>
-        <td>o2::aod::lnnrec::ITSclusterSizesPi</td>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::NucleiFlowTableNS::CentFV0A</td>
         <td></td>
-        <td>itsClusterSizesPi</td>
-        <td>uint32_t</td>
+        <td>centFV0A</td>
+        <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::Flags</td>
+        <td>o2::aod::NucleiFlowTableNS::CentFT0M</td>
         <td></td>
-        <td>flags</td>
-        <td>uint8_t</td>
+        <td>centFT0M</td>
+        <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::GenPt</td>
+        <td>o2::aod::NucleiFlowTableNS::CentFT0A</td>
         <td></td>
-        <td>genPt</td>
+        <td>centFT0A</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::GenPhi</td>
+        <td>o2::aod::NucleiFlowTableNS::CentFT0C</td>
         <td></td>
-        <td>genPhi</td>
+        <td>centFT0C</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::GenEta</td>
+        <td>o2::aod::NucleiFlowTableNS::PsiFT0A</td>
         <td></td>
-        <td>genEta</td>
+        <td>psiFT0A</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::GenPt3H</td>
+        <td>o2::aod::NucleiFlowTableNS::MultFT0A</td>
         <td></td>
-        <td>genPt3H</td>
+        <td>multFT0A</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::GenXDecVtx</td>
+        <td>o2::aod::NucleiFlowTableNS::PsiFT0C</td>
         <td></td>
-        <td>genXDecVtx</td>
+        <td>psiFT0C</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::GenYDecVtx</td>
+        <td>o2::aod::NucleiFlowTableNS::MultFT0C</td>
         <td></td>
-        <td>genYDecVtx</td>
+        <td>multFT0C</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::GenZDecVtx</td>
+        <td>o2::aod::NucleiFlowTableNS::PsiTPC</td>
         <td></td>
-        <td>genZDecVtx</td>
+        <td>psiTPC</td>
         <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::IsReco</td>
+        <td>o2::aod::NucleiFlowTableNS::PsiTPCl</td>
         <td></td>
-        <td>isReco</td>
-        <td>bool</td>
+        <td>psiTPCl</td>
+        <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::IsSignal</td>
+        <td>o2::aod::NucleiFlowTableNS::PsiTPCr</td>
         <td></td>
-        <td>isSignal</td>
-        <td>bool</td>
+        <td>psiTPCr</td>
+        <td>float</td>
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::lnnrec::SurvivedEventSelection</td>
+        <td>o2::aod::NucleiFlowTableNS::MultTPC</td>
         <td></td>
-        <td>survivedEventSelection</td>
-        <td>bool</td>
+        <td>multTPC</td>
+        <td>int</td>
         <td></td>
       </tr>
     </table>
   </div>
 
-</div>
-
-###  o2-analysis-lf-nuclei-spectra
-Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//nucleiSpectra.cxx" target="_blank">nucleiSpectra.cxx</a>
-<div>
-
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::NucleiTable</button>
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::NucleiTableMC</button>
   <div class="panel">
     <div>
 
@@ -71845,250 +72766,9 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td></td>
       </tr>
       <tr>
-        <td>o2::aod::NucleiTableNS::Flags</td>
-        <td></td>
-        <td>flags</td>
-        <td>uint16_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::TPCfindableCls</td>
-        <td></td>
-        <td>tpcFindableCls</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::TPCcrossedRows</td>
-        <td></td>
-        <td>tpcCrossedRows</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::ITSclsMap</td>
-        <td></td>
-        <td>itsClsMap</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::TPCnCls</td>
-        <td></td>
-        <td>tpcNCls</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::TPCnClsShared</td>
-        <td></td>
-        <td>tpcNClsShared</td>
-        <td>uint8_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::ITSclusterSizes</td>
-        <td></td>
-        <td>itsClusterSizes</td>
-        <td>uint32_t</td>
-        <td></td>
-      </tr>
-    </table>
-  </div>
-
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::NucleiTableFlow</button>
-  <div class="panel">
-    <div>
-
-    </div>
-    <div>
-      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFSlimNucleiTables.h" target="_blank">PWGLF/DataModel/LFSlimNucleiTables.h</a>
-    </div>
-    <table class=DataModel>
-      <tr>
-        <th>Name</th>
-        <th></th>
-        <th>Getter</th>
-        <th>Type</th>
-        <th>Comment</th>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::CentFV0A</td>
-        <td></td>
-        <td>centFV0A</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::CentFT0M</td>
-        <td></td>
-        <td>centFT0M</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::CentFT0A</td>
-        <td></td>
-        <td>centFT0A</td>
-        <td>float</td>
+        <td>o2::aod::NucleiTableNS::TOFchi2</td>
         <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::CentFT0C</td>
-        <td></td>
-        <td>centFT0C</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::PsiFT0A</td>
-        <td></td>
-        <td>psiFT0A</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::MultFT0A</td>
-        <td></td>
-        <td>multFT0A</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::PsiFT0C</td>
-        <td></td>
-        <td>psiFT0C</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::MultFT0C</td>
-        <td></td>
-        <td>multFT0C</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::PsiTPC</td>
-        <td></td>
-        <td>psiTPC</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::PsiTPCl</td>
-        <td></td>
-        <td>psiTPCl</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::PsiTPCr</td>
-        <td></td>
-        <td>psiTPCr</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiFlowTableNS::MultTPC</td>
-        <td></td>
-        <td>multTPC</td>
-        <td>int</td>
-        <td></td>
-      </tr>
-    </table>
-  </div>
-
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::NucleiTableMC</button>
-  <div class="panel">
-    <div>
-
-    </div>
-    <div>
-      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFSlimNucleiTables.h" target="_blank">PWGLF/DataModel/LFSlimNucleiTables.h</a>
-    </div>
-    <table class=DataModel>
-      <tr>
-        <th>Name</th>
-        <th></th>
-        <th>Getter</th>
-        <th>Type</th>
-        <th>Comment</th>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::Pt</td>
-        <td></td>
-        <td>pt</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::Eta</td>
-        <td></td>
-        <td>eta</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::Phi</td>
-        <td></td>
-        <td>phi</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::TPCInnerParam</td>
-        <td></td>
-        <td>tpcInnerParam</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::Beta</td>
-        <td></td>
-        <td>beta</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::Zvertex</td>
-        <td></td>
-        <td>zVertex</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::DCAxy</td>
-        <td></td>
-        <td>dcaxy</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::DCAz</td>
-        <td></td>
-        <td>dcaz</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::TPCsignal</td>
-        <td></td>
-        <td>tpcSignal</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::ITSchi2</td>
-        <td></td>
-        <td>itsChi2</td>
-        <td>float</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::NucleiTableNS::TPCchi2</td>
-        <td></td>
-        <td>tpcChi2</td>
+        <td>tofChi2</td>
         <td>float</td>
         <td></td>
       </tr>
@@ -72188,7 +72868,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-pidtof-generic
+### o2-analysis-lf-pidtof-generic
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//pidTOFGeneric.cxx" target="_blank">pidTOFGeneric.cxx</a>
 <div>
 
@@ -72288,7 +72969,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-spectra-derived
+### o2-analysis-lf-spectra-derived
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//spectraDerivedMaker.cxx" target="_blank">spectraDerivedMaker.cxx</a>
 <div>
 
@@ -72932,7 +73614,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-threebody-kf-task
+### o2-analysis-lf-threebody-kf-task
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//threebodyKFTask.cxx" target="_blank">threebodyKFTask.cxx</a>
 <div>
 
@@ -73169,6 +73852,13 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>chi2 of proton, pion mass constraint to Lambda mass</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::CosPAV0</td>
+        <td></td>
+        <td>cospav0</td>
+        <td>float</td>
+        <td>proton, pion vertex mass</td>
+      </tr>
       <tr>
         <td>o2::aod::vtx3body::PxTrack0</td>
         <td></td>
@@ -73232,6 +73922,27 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>track2 pz at min</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCInnerParamTrack0</td>
+        <td></td>
+        <td>tpcinnerparamtrack0</td>
+        <td>float</td>
+        <td>momentum at inner wall of TPC of proton daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCInnerParamTrack1</td>
+        <td></td>
+        <td>tpcinnerparamtrack1</td>
+        <td>float</td>
+        <td>momentum at inner wall of TPC of pion daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCInnerParamTrack2</td>
+        <td></td>
+        <td>tpcinnerparamtrack2</td>
+        <td>float</td>
+        <td>momentum at inner wall of TPC of deuteron daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::kfvtx3body::DCATrack0ToPVKF</td>
         <td></td>
@@ -73407,6 +74118,48 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>float</td>
         <td>nsigma of TPC PID of the bachelor daughter</td>
       </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxProton</td>
+        <td></td>
+        <td>tpcdedxproton</td>
+        <td>float</td>
+        <td>TPC dEdx of the proton daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxPion</td>
+        <td></td>
+        <td>tpcdedxpion</td>
+        <td>float</td>
+        <td>TPC dEdx of the pion daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TPCdEdxDeuteron</td>
+        <td></td>
+        <td>tpcdedxdeuteron</td>
+        <td>float</td>
+        <td>TPC dEdx of the bachelor daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::TOFNSigmaDeuteron</td>
+        <td></td>
+        <td>tofnsigmadeuteron</td>
+        <td>float</td>
+        <td>nsigma of TOF PID of the bachelor daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::ITSClusSizeDeuteron</td>
+        <td></td>
+        <td>itsclussizedeuteron</td>
+        <td>double</td>
+        <td>average ITS cluster size of bachelor daughter</td>
+      </tr>
+      <tr>
+        <td>o2::aod::kfvtx3body::PIDTrackingDeuteron</td>
+        <td></td>
+        <td>pidtrackingdeuteron</td>
+        <td>uint32_t</td>
+        <td>PID during tracking of bachelor daughter</td>
+      </tr>
       <tr>
         <td>o2::aod::kfvtx3body::GenP</td>
         <td></td>
@@ -73622,7 +74375,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-threebody-reco-task
+### o2-analysis-lf-threebody-reco-task
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//threebodyRecoTask.cxx" target="_blank">threebodyRecoTask.cxx</a>
 <div>
 
@@ -74282,7 +75036,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-threebodymcfinder
+### o2-analysis-lf-threebodymcfinder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Nuspex//threebodymcfinder.cxx" target="_blank">threebodymcfinder.cxx</a>
 <div>
 
@@ -74352,13 +75107,15 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-strangenessqc
+### o2-analysis-lf-strangenessqc
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/QC//strangenessQC.cxx" target="_blank">strangenessQC.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-lf-reso2initializer
+### o2-analysis-lf-reso2initializer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Resonances//LFResonanceInitializer.cxx" target="_blank">LFResonanceInitializer.cxx</a>
 <div>
 
@@ -74917,6 +75674,90 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>int[2]</td>
         <td>Field for the track indices to remove auto-correlations</td>
       </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPi1</td>
+        <td></td>
+        <td>daughterTPCNSigmaPi1</td>
+        <td>float</td>
+        <td>TPC PID of the first daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaKa1</td>
+        <td></td>
+        <td>daughterTPCNSigmaKa1</td>
+        <td>float</td>
+        <td>TPC PID of the first daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPr1</td>
+        <td></td>
+        <td>daughterTPCNSigmaPr1</td>
+        <td>float</td>
+        <td>TPC PID of the first daughter as Proton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPi2</td>
+        <td></td>
+        <td>daughterTPCNSigmaPi2</td>
+        <td>float</td>
+        <td>TPC PID of the second daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaKa2</td>
+        <td></td>
+        <td>daughterTPCNSigmaKa2</td>
+        <td>float</td>
+        <td>TPC PID of the second daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPr2</td>
+        <td></td>
+        <td>daughterTPCNSigmaPr2</td>
+        <td>float</td>
+        <td>TPC PID of the second daughter as Proton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPi1</td>
+        <td></td>
+        <td>daughterTOFNSigmaPi1</td>
+        <td>float</td>
+        <td>TOF PID of the first daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaKa1</td>
+        <td></td>
+        <td>daughterTOFNSigmaKa1</td>
+        <td>float</td>
+        <td>TOF PID of the first daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPr1</td>
+        <td></td>
+        <td>daughterTOFNSigmaPr1</td>
+        <td>float</td>
+        <td>TOF PID of the first daughter as Proton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPi2</td>
+        <td></td>
+        <td>daughterTOFNSigmaPi2</td>
+        <td>float</td>
+        <td>TOF PID of the second daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaKa2</td>
+        <td></td>
+        <td>daughterTOFNSigmaKa2</td>
+        <td>float</td>
+        <td>TOF PID of the second daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPr2</td>
+        <td></td>
+        <td>daughterTOFNSigmaPr2</td>
+        <td>float</td>
+        <td>TOF PID of the second daughter as Proton</td>
+      </tr>
       <tr>
         <td>o2::aod::resodaughter::V0CosPA</td>
         <td></td>
@@ -75088,6 +75929,132 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <td>int[3]</td>
         <td>Field for the track indices to remove auto-correlations (ordered: positive, negative, bachelor)</td>
       </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPi1</td>
+        <td></td>
+        <td>daughterTPCNSigmaPi1</td>
+        <td>float</td>
+        <td>TPC PID of the first daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaKa1</td>
+        <td></td>
+        <td>daughterTPCNSigmaKa1</td>
+        <td>float</td>
+        <td>TPC PID of the first daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPr1</td>
+        <td></td>
+        <td>daughterTPCNSigmaPr1</td>
+        <td>float</td>
+        <td>TPC PID of the first daughter as Proton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPi2</td>
+        <td></td>
+        <td>daughterTPCNSigmaPi2</td>
+        <td>float</td>
+        <td>TPC PID of the second daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaKa2</td>
+        <td></td>
+        <td>daughterTPCNSigmaKa2</td>
+        <td>float</td>
+        <td>TPC PID of the second daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPr2</td>
+        <td></td>
+        <td>daughterTPCNSigmaPr2</td>
+        <td>float</td>
+        <td>TPC PID of the second daughter as Proton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPiBach</td>
+        <td></td>
+        <td>daughterTPCNSigmaPiBach</td>
+        <td>float</td>
+        <td>TPC PID of the bachelor daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaKaBach</td>
+        <td></td>
+        <td>daughterTPCNSigmaKaBach</td>
+        <td>float</td>
+        <td>TPC PID of the bachelor daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTPCNSigmaPrBach</td>
+        <td></td>
+        <td>daughterTPCNSigmaPrBach</td>
+        <td>float</td>
+        <td>TPC PID of the bachelor daughter as Proton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPi1</td>
+        <td></td>
+        <td>daughterTOFNSigmaPi1</td>
+        <td>float</td>
+        <td>TOF PID of the first daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaKa1</td>
+        <td></td>
+        <td>daughterTOFNSigmaKa1</td>
+        <td>float</td>
+        <td>TOF PID of the first daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPr1</td>
+        <td></td>
+        <td>daughterTOFNSigmaPr1</td>
+        <td>float</td>
+        <td>TOF PID of the first daughter as Proton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPi2</td>
+        <td></td>
+        <td>daughterTOFNSigmaPi2</td>
+        <td>float</td>
+        <td>TOF PID of the second daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaKa2</td>
+        <td></td>
+        <td>daughterTOFNSigmaKa2</td>
+        <td>float</td>
+        <td>TOF PID of the second daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPr2</td>
+        <td></td>
+        <td>daughterTOFNSigmaPr2</td>
+        <td>float</td>
+        <td>TOF PID of the second daughter as Proton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPiBach</td>
+        <td></td>
+        <td>daughterTOFNSigmaPiBach</td>
+        <td>float</td>
+        <td>TOF PID of the bachelor daughter as Pion</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaKaBach</td>
+        <td></td>
+        <td>daughterTOFNSigmaKaBach</td>
+        <td>float</td>
+        <td>TOF PID of the bachelor daughter as Kaon</td>
+      </tr>
+      <tr>
+        <td>o2::aod::resodaughter::DaughterTOFNSigmaPrBach</td>
+        <td></td>
+        <td>daughterTOFNSigmaPrBach</td>
+        <td>float</td>
+        <td>TOF PID of the bachelor daughter as Proton</td>
+      </tr>
       <tr>
         <td>o2::aod::resodaughter::V0CosPA</td>
         <td></td>
@@ -75581,7 +76548,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-reso2mergedf
+### o2-analysis-lf-reso2mergedf
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Resonances//LFResonanceMergeDF.cxx" target="_blank">LFResonanceMergeDF.cxx</a>
 <div>
 
@@ -75978,7 +76946,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-f1protoninitializer
+### o2-analysis-lf-f1protoninitializer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Resonances//f1protonInitializer.cxx" target="_blank">f1protonInitializer.cxx</a>
 <div>
 
@@ -76029,7 +76998,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-f1protonreducedtable
+### o2-analysis-lf-f1protonreducedtable
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Resonances//f1protonreducedtable.cxx" target="_blank">f1protonreducedtable.cxx</a>
 <div>
 
@@ -76387,7 +77357,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-filterf1proton
+### o2-analysis-lf-filterf1proton
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Resonances//filterf1proton.cxx" target="_blank">filterf1proton.cxx</a>
 <div>
 
@@ -76424,7 +77395,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-strange-tree-creator
+### o2-analysis-lf-strange-tree-creator
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//LFStrangeTreeCreator.cxx" target="_blank">LFStrangeTreeCreator.cxx</a>
 <div>
 
@@ -77052,7 +78024,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-cascademlselectiontreecreator
+### o2-analysis-lf-cascademlselectiontreecreator
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//cascadeMLSelectionTreeCreator.cxx" target="_blank">cascadeMLSelectionTreeCreator.cxx</a>
 <div>
 
@@ -77406,7 +78379,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-cascadebuilder
+### o2-analysis-lf-cascadebuilder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//cascadebuilder.cxx" target="_blank">cascadebuilder.cxx</a>
 <div>
 
@@ -79224,7 +80198,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-cascadefinder
+### o2-analysis-lf-cascadefinder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//cascadefinder.cxx" target="_blank">cascadefinder.cxx</a>
 <div>
 
@@ -79820,7 +80795,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-cascadeflow
+### o2-analysis-lf-cascadeflow
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//cascadeflow.cxx" target="_blank">cascadeflow.cxx</a>
 <div>
 
@@ -80130,7 +81106,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-cascademcbuilder
+### o2-analysis-lf-cascademcbuilder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//cascademcbuilder.cxx" target="_blank">cascademcbuilder.cxx</a>
 <div>
 
@@ -80569,7 +81546,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-cascademcfinder
+### o2-analysis-lf-cascademcfinder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//cascademcfinder.cxx" target="_blank">cascademcfinder.cxx</a>
 <div>
 
@@ -80628,7 +81606,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-cascadepid
+### o2-analysis-lf-cascadepid
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//cascadepid.cxx" target="_blank">cascadepid.cxx</a>
 <div>
 
@@ -80784,7 +81763,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-cascqaanalysis
+### o2-analysis-lf-cascqaanalysis
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//cascqaanalysis.cxx" target="_blank">cascqaanalysis.cxx</a>
 <div>
 
@@ -81430,7 +82410,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-double-casc-tree-creator
+### o2-analysis-lf-double-casc-tree-creator
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//doubleCascTreeCreator.cxx" target="_blank">doubleCascTreeCreator.cxx</a>
 <div>
 
@@ -81602,7 +82583,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-hstrangecorrelationfilter
+### o2-analysis-lf-hstrangecorrelationfilter
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//hStrangeCorrelationFilter.cxx" target="_blank">hStrangeCorrelationFilter.cxx</a>
 <div>
 
@@ -81971,7 +82953,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-lambdakzeromlselectiontreecreator
+### o2-analysis-lf-lambdakzeromlselectiontreecreator
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//lambdakzeroMLSelectionTreeCreator.cxx" target="_blank">lambdakzeroMLSelectionTreeCreator.cxx</a>
 <div>
 
@@ -82304,7 +83287,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-lambdakzerobuilder
+### o2-analysis-lf-lambdakzerobuilder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//lambdakzerobuilder.cxx" target="_blank">lambdakzerobuilder.cxx</a>
 <div>
 
@@ -83400,7 +84384,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-lambdakzerofinder
+### o2-analysis-lf-lambdakzerofinder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//lambdakzerofinder.cxx" target="_blank">lambdakzerofinder.cxx</a>
 <div>
 
@@ -83663,7 +84648,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-lambdakzeromcbuilder
+### o2-analysis-lf-lambdakzeromcbuilder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//lambdakzeromcbuilder.cxx" target="_blank">lambdakzeromcbuilder.cxx</a>
 <div>
 
@@ -83773,7 +84759,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-lambdakzeromcfinder
+### o2-analysis-lf-lambdakzeromcfinder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//lambdakzeromcfinder.cxx" target="_blank">lambdakzeromcfinder.cxx</a>
 <div>
 
@@ -83891,7 +84878,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-lambdakzeromlselection
+### o2-analysis-lf-lambdakzeromlselection
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//lambdakzeromlselection.cxx" target="_blank">lambdakzeromlselection.cxx</a>
 <div>
 
@@ -84001,7 +84989,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-lambdakzeropid
+### o2-analysis-lf-lambdakzeropid
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//lambdakzeropid.cxx" target="_blank">lambdakzeropid.cxx</a>
 <div>
 
@@ -84251,7 +85240,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-sigma0builder
+### o2-analysis-lf-sigma0builder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//sigma0builder.cxx" target="_blank">sigma0builder.cxx</a>
 <div>
 
@@ -84835,7 +85825,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-st-coll-ids
+### o2-analysis-lf-st-coll-ids
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//stCollIds.cxx" target="_blank">stCollIds.cxx</a>
 <div>
 
@@ -84940,7 +85931,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-strangederivedbuilder
+### o2-analysis-lf-strangederivedbuilder
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//strangederivedbuilder.cxx" target="_blank">strangederivedbuilder.cxx</a>
 <div>
 
@@ -85377,10 +86369,10 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
     </table>
   </div>
 
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::StraStamps</button>
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::StraZDCSP</button>
   <div class="panel">
     <div>
-       information for ID-ing mag field if needed
+       events used to compute the ZDC spectator plane
     </div>
     <div>
       Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFStrangenessTables.h" target="_blank">PWGLF/DataModel/LFStrangenessTables.h</a>
@@ -85394,35 +86386,37 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <th>Comment</th>
       </tr>
       <tr>
-        <td>o2::aod::bc::RunNumber</td>
+        <td>o2::aod::spcalibrationtable::TriggerEventSP</td>
+        <td></td>
+        <td>triggereventsp</td>
+        <td>bool</td>
         <td></td>
-        <td>runNumber</td>
-        <td>int</td>
-        <td>Run number</td>
       </tr>
       <tr>
-        <td>o2::aod::timestamp::Timestamp</td>
+        <td>o2::aod::spcalibrationtable::PsiZDCA</td>
+        <td></td>
+        <td>psiZDCA</td>
+        <td>float</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>o2::aod::spcalibrationtable::PsiZDCC</td>
+        <td></td>
+        <td>psiZDCC</td>
+        <td>float</td>
         <td></td>
-        <td>timestamp</td>
-        <td>uint64_t</td>
-        <td>Timestamp of a BC in ms (epoch style)</td>
       </tr>
     </table>
   </div>
 
-  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::StraMCCollisions</button>
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::StraStamps</button>
   <div class="panel">
     <div>
-       MC collision properties
+       information for ID-ing mag field if needed
     </div>
     <div>
       Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/DataModel/LFStrangenessTables.h" target="_blank">PWGLF/DataModel/LFStrangenessTables.h</a>
     </div>
-    <div>Is used in:
-      <ul>
-        <li>o2::aod::StraMCCollision = o2::aod::StraMCCollisions::iterator</li>
-      </ul>
-    </div>
     <table class=DataModel>
       <tr>
         <th>Name</th>
@@ -85432,39 +86426,18 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
         <th>Comment</th>
       </tr>
       <tr>
-        <td>o2::soa::Index</td>
-        <td>GI</td>
-        <td>globalIndex</td>
-        <td>int64_t</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>o2::aod::mccollision::PosX</td>
-        <td></td>
-        <td>posX</td>
-        <td>float</td>
-        <td>X vertex position in cm</td>
-      </tr>
-      <tr>
-        <td>o2::aod::mccollision::PosY</td>
-        <td></td>
-        <td>posY</td>
-        <td>float</td>
-        <td>Y vertex position in cm</td>
-      </tr>
-      <tr>
-        <td>o2::aod::mccollision::PosZ</td>
+        <td>o2::aod::bc::RunNumber</td>
         <td></td>
-        <td>posZ</td>
-        <td>float</td>
-        <td>Z vertex position in cm</td>
+        <td>runNumber</td>
+        <td>int</td>
+        <td>Run number</td>
       </tr>
       <tr>
-        <td>o2::aod::mccollision::ImpactParameter</td>
+        <td>o2::aod::timestamp::Timestamp</td>
         <td></td>
-        <td>impactParameter</td>
-        <td>float</td>
-        <td>Impact parameter for A-A</td>
+        <td>timestamp</td>
+        <td>uint64_t</td>
+        <td>Timestamp of a BC in ms (epoch style)</td>
       </tr>
     </table>
   </div>
@@ -86261,7 +87234,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-v0qaanalysis
+### o2-analysis-lf-v0qaanalysis
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//v0qaanalysis.cxx" target="_blank">v0qaanalysis.cxx</a>
 <div>
 
@@ -86559,7 +87533,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 </div>
 
-###  o2-analysis-lf-v0-selector
+### o2-analysis-lf-v0-selector
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF/TableProducer/Strangeness//v0selector.cxx" target="_blank">v0selector.cxx</a>
 <div>
 
@@ -86567,7 +87542,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGLF
 
 ## PWG-MM
 
-###  o2-analysis-mm-particles-to-tracks
+### o2-analysis-mm-particles-to-tracks
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGMM/Mult/TableProducer//particles2tracks.cxx" target="_blank">particles2tracks.cxx</a>
 <div>
 
@@ -86625,7 +87601,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGMM
 
 </div>
 
-###  o2-analysis-mm-percentiles
+### o2-analysis-mm-percentiles
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGMM/Mult/TableProducer//percentiles.cxx" target="_blank">percentiles.cxx</a>
 <div>
 
@@ -86664,13 +87641,15 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGMM
 
 </div>
 
-###  o2-analysis-mm-reducer
+### o2-analysis-mm-reducer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGMM/Mult/TableProducer//reducer.cxx" target="_blank">reducer.cxx</a>
 <div>
 
 </div>
 
-###  o2-analysis-mm-reducer-post
+### o2-analysis-mm-reducer-post
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGMM/Mult/TableProducer//reducerPostprocess.cxx" target="_blank">reducerPostprocess.cxx</a>
 <div>
 
@@ -86765,7 +87744,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGMM
 
 </div>
 
-###  o2-analysis-mm-track-propagation
+### o2-analysis-mm-track-propagation
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGMM/Mult/TableProducer//trackPropagation.cxx" target="_blank">trackPropagation.cxx</a>
 <div>
 
@@ -87066,7 +88046,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGMM
 
 ## PWG-UD
 
-###  o2-analysis-ud-dgbccand-producer
+### o2-analysis-ud-dgbccand-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/TableProducer//DGBCCandProducer.cxx" target="_blank">DGBCCandProducer.cxx</a>
 <div>
 
@@ -88140,7 +89121,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD
 
 </div>
 
-###  o2-analysis-ud-dgcand-producer
+### o2-analysis-ud-dgcand-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/TableProducer//DGCandProducer.cxx" target="_blank">DGCandProducer.cxx</a>
 <div>
 
@@ -89659,7 +90641,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD
 
 </div>
 
-###  o2-analysis-ud-sgcand-producer
+### o2-analysis-ud-sgcand-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/TableProducer//SGCandProducer.cxx" target="_blank">SGCandProducer.cxx</a>
 <div>
 
@@ -90497,6 +91480,81 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD
     </table>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::UDTracksPIDExtra</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/DataModel/UDTables.h" target="_blank">PWGUD/DataModel/UDTables.h</a>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtpc::TPCNSigmaDe</td>
+        <td></td>
+        <td>tpcNSigmaDe</td>
+        <td>float</td>
+        <td>Nsigma separation with the TPC detector for deuteron</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtpc::TPCNSigmaTr</td>
+        <td></td>
+        <td>tpcNSigmaTr</td>
+        <td>float</td>
+        <td>Nsigma separation with the TPC detector for triton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtpc::TPCNSigmaHe</td>
+        <td></td>
+        <td>tpcNSigmaHe</td>
+        <td>float</td>
+        <td>Nsigma separation with the TPC detector for helium3</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtpc::TPCNSigmaAl</td>
+        <td></td>
+        <td>tpcNSigmaAl</td>
+        <td>float</td>
+        <td>Nsigma separation with the TPC detector for alpha</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtof::TOFNSigmaDe</td>
+        <td></td>
+        <td>tofNSigmaDe</td>
+        <td>float</td>
+        <td>Nsigma separation with the TOF detector for deuteron</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtof::TOFNSigmaTr</td>
+        <td></td>
+        <td>tofNSigmaTr</td>
+        <td>float</td>
+        <td>Nsigma separation with the TOF detector for triton</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtof::TOFNSigmaHe</td>
+        <td></td>
+        <td>tofNSigmaHe</td>
+        <td>float</td>
+        <td>Nsigma separation with the TOF detector for helium3</td>
+      </tr>
+      <tr>
+        <td>o2::aod::pidtof::TOFNSigmaAl</td>
+        <td></td>
+        <td>tofNSigmaAl</td>
+        <td>float</td>
+        <td>Nsigma separation with the TOF detector for alpha</td>
+      </tr>
+    </table>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::UDTracksExtra</button>
   <div class="panel">
     <div>
@@ -91209,7 +92267,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD
 
 </div>
 
-###  o2-analysis-ud-upccand-producer
+### o2-analysis-ud-upccand-producer
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/TableProducer//UPCCandidateProducer.cxx" target="_blank">UPCCandidateProducer.cxx</a>
 <div>
 
@@ -91698,6 +92757,65 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD
     </table>
   </div>
 
+  <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::UDCollisionSelExtras</button>
+  <div class="panel">
+    <div>
+
+    </div>
+    <div>
+      Header file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/DataModel/UDTables.h" target="_blank">PWGUD/DataModel/UDTables.h</a>
+    </div>
+    <div>Is used in:
+      <ul>
+        <li>o2::aod::UDCollisionSelExtra = o2::aod::UDCollisionSelExtras::iterator</li>
+      </ul>
+    </div>
+    <table class=DataModel>
+      <tr>
+        <th>Name</th>
+        <th></th>
+        <th>Getter</th>
+        <th>Type</th>
+        <th>Comment</th>
+      </tr>
+      <tr>
+        <td>o2::aod::udcollision::ChFT0A</td>
+        <td></td>
+        <td>chFT0A</td>
+        <td>uint8_t</td>
+        <td>number of FT0A active channels</td>
+      </tr>
+      <tr>
+        <td>o2::aod::udcollision::ChFT0C</td>
+        <td></td>
+        <td>chFT0C</td>
+        <td>uint8_t</td>
+        <td>number of FT0C active channels</td>
+      </tr>
+      <tr>
+        <td>o2::aod::udcollision::ChFDDA</td>
+        <td></td>
+        <td>chFDDA</td>
+        <td>uint8_t</td>
+        <td>number of FDDA active channels</td>
+      </tr>
+      <tr>
+        <td>o2::aod::udcollision::ChFDDC</td>
+        <td></td>
+        <td>chFDDC</td>
+        <td>uint8_t</td>
+        <td>number of FDDC active channels</td>
+      </tr>
+      <tr>
+        <td>o2::aod::udcollision::ChFV0A</td>
+        <td></td>
+        <td>chFV0A</td>
+        <td>uint8_t</td>
+        <td>number of FV0A active channels</td>
+      </tr>
+    </table>
+  </div>
+
   <button class="myaccordion"><i class="fa fa-table"></i> o2::aod::UDCollisionsSelsCent</button>
   <div class="panel">
     <div>
@@ -92658,7 +93776,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD
 
 </div>
 
-###  o2-analysis-ud-fwdtrack-propagation
+### o2-analysis-ud-fwdtrack-propagation
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/TableProducer//fwdTrackPropagation.cxx" target="_blank">fwdTrackPropagation.cxx</a>
 <div>
 
@@ -93027,7 +94146,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD
 
 </div>
 
-###  o2-analysis-ud-collisions-converter
+### o2-analysis-ud-collisions-converter
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/TableProducer/Converters//UDCollisionsConverter.cxx" target="_blank">UDCollisionsConverter.cxx</a>
 <div>
 
@@ -93127,7 +94247,8 @@ Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD
 
 </div>
 
-###  o2-analysis-ud-fwd-tracks-extra-converter
+### o2-analysis-ud-fwd-tracks-extra-converter
+
 Code file: <a href="https://github.com/AliceO2Group/O2Physics/tree/master//PWGUD/TableProducer/Converters//UDFwdTracksExtraConverter.cxx" target="_blank">UDFwdTracksExtraConverter.cxx</a>
 <div>