[PWGLF] Fix Zorro initialization and extended table (#10137)

Co-authored-by: Carolina Reetz <c.reetz@cern.ch>

Author: wang-yuanzhe

PWGLF/DataModel/Reduced3BodyTables.h

@@ -226,29 +226,29 @@ DECLARE_SOA_TABLE_FULL(StoredRedIUTracks, "RedIUTracks", "AOD", "REDIUTRACK", //
                        reducedtracks3body::ITSClsSizeInLayer<reducedtracks3body::ITSClusterSizes>,
                        reducedtracks3body::TPCCrossedRowsOverFindableCls<reducedtracks3body::TPCNClsFindable, reducedtracks3body::TPCNClsFindableMinusCrossedRows>);
 
-DECLARE_SOA_EXTENDED_TABLE(RedIUTracks, StoredRedIUTracks, "EXREDIUTRACK", 0, //! Track parameters at inner most update (e.g. ITS) as it comes from the tracking
-                           reducedtracks3body::Pt,
-                           reducedtracks3body::P,
-                           reducedtracks3body::Eta,
-                           reducedtracks3body::Phi,
-                           // cov matrix
-                           reducedtracks3body::CYY,
-                           reducedtracks3body::CZY,
-                           reducedtracks3body::CZZ,
-                           reducedtracks3body::CSnpY,
-                           reducedtracks3body::CSnpZ,
-                           reducedtracks3body::CSnpSnp,
-                           reducedtracks3body::CTglY,
-                           reducedtracks3body::CTglZ,
-                           reducedtracks3body::CTglSnp,
-                           reducedtracks3body::CTglTgl,
-                           reducedtracks3body::C1PtY,
-                           reducedtracks3body::C1PtZ,
-                           reducedtracks3body::C1PtSnp,
-                           reducedtracks3body::C1PtTgl,
-                           reducedtracks3body::C1Pt21Pt2,
-                           // tracks extra
-                           reducedtracks3body::DetectorMap);
+DECLARE_SOA_EXTENDED_TABLE_USER(RedIUTracks, StoredRedIUTracks, "REDIUTRACKEXT", //! Track parameters at inner most update (e.g. ITS) as it comes from the tracking
+                                reducedtracks3body::Pt,
+                                reducedtracks3body::P,
+                                reducedtracks3body::Eta,
+                                reducedtracks3body::Phi,
+                                // cov matrix
+                                reducedtracks3body::CYY,
+                                reducedtracks3body::CZY,
+                                reducedtracks3body::CZZ,
+                                reducedtracks3body::CSnpY,
+                                reducedtracks3body::CSnpZ,
+                                reducedtracks3body::CSnpSnp,
+                                reducedtracks3body::CTglY,
+                                reducedtracks3body::CTglZ,
+                                reducedtracks3body::CTglSnp,
+                                reducedtracks3body::CTglTgl,
+                                reducedtracks3body::C1PtY,
+                                reducedtracks3body::C1PtZ,
+                                reducedtracks3body::C1PtSnp,
+                                reducedtracks3body::C1PtTgl,
+                                reducedtracks3body::C1Pt21Pt2,
+                                // tracks extra
+                                reducedtracks3body::DetectorMap);
 
 namespace reduceddecay3body
 {

PWGLF/TableProducer/Nuspex/reduced3bodyCreator.cxx

@@ -9,6 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+/// \file reduced3bodyCreator.cxx
 /// \brief Task to produce reduced AO2Ds for use in the hypertriton 3body reconstruction with the decay3bodybuilder.cxx
 /// \author Yuanzhe Wang <yuanzhe.wang@cern.ch>
 /// \author Carolina Reetz <c.reetz@cern.ch>
@@ -86,6 +87,8 @@ struct reduced3bodyCreator {
   Configurable<bool> fatalOnPassNotAvailable{"fatalOnPassNotAvailable", true, "Flag to throw a fatal if the pass is not available in the retrieved CCDB object"};
   // Zorro counting
   Configurable<bool> cfgSkimmedProcessing{"cfgSkimmedProcessing", false, "Skimmed dataset processing"};
+  // Flag for trigger
+  Configurable<bool> cfgOnlyKeepH3L3Body{"cfgOnlyKeepH3L3Body", false, "Flag to keep only H3L3Body trigger"};
 
   int mRunNumber;
   o2::pid::tof::TOFResoParamsV2 mRespParamsV2;
@@ -117,18 +120,21 @@ struct reduced3bodyCreator {
     hEventCounterZorro->GetXaxis()->SetBinLabel(2, "Zorro after evsel");
   }
 
+  void initZorroBC(aod::BCsWithTimestamps::iterator const& bc)
+  {
+    if (cfgSkimmedProcessing) {
+      zorro.initCCDB(ccdb.service, bc.runNumber(), bc.timestamp(), "fH3L3Body");
+      zorro.populateHistRegistry(registry, bc.runNumber());
+    }
+  }
+
   void initCCDB(aod::BCsWithTimestamps::iterator const& bc)
   {
     // In case override, don't proceed, please - no CCDB access required
     if (mRunNumber == bc.runNumber()) {
       return;
     }
-
     mRunNumber = bc.runNumber();
-    if (cfgSkimmedProcessing) {
-      zorro.initCCDB(ccdb.service, bc.runNumber(), bc.timestamp(), "fH3L3Body");
-      zorro.populateHistRegistry(registry, bc.runNumber());
-    }
 
     // Initial TOF PID Paras, copied from PIDTOF.h
     timestamp.value = bc.timestamp();
@@ -217,14 +223,20 @@ struct reduced3bodyCreator {
   void process(ColwithEvTimesMultsCents const& collisions, TrackExtPIDIUwithEvTimes const&, aod::Decay3Bodys const& decay3bodys, aod::BCsWithTimestamps const&)
   {
 
-    int lastCollisionID = -1; // collisionId of last analysed decay3body. Table is sorted.
-
+    int lastRunNumber = -1; // RunNumber of last collision, used for zorro counting
     // Event counting
     for (const auto& collision : collisions) {
+
+      auto bc = collision.bc_as<aod::BCsWithTimestamps>();
+      if (bc.runNumber() != lastRunNumber) {
+        initZorroBC(bc);
+        lastRunNumber = bc.runNumber(); // Update the last run number
+      }
+
       // Zorro event counting
       bool isZorroSelected = false;
       if (cfgSkimmedProcessing) {
-        isZorroSelected = zorro.isSelected(collision.bc_as<aod::BCsWithTimestamps>().globalBC());
+        isZorroSelected = zorro.isSelected(bc.globalBC());
         if (isZorroSelected) {
           registry.fill(HIST("hEventCounterZorro"), 0.5);
         }
@@ -247,6 +259,8 @@ struct reduced3bodyCreator {
       }
     }
 
+    int lastCollisionID = -1; // collisionId of last analysed decay3body. Table is sorted.
+
     // Creat reduced table
     for (const auto& d3body : decay3bodys) {
 
@@ -263,6 +277,13 @@ struct reduced3bodyCreator {
 
       auto bc = collision.bc_as<aod::BCsWithTimestamps>();
       initCCDB(bc);
+      bool isZorroSelected = false;
+      if (cfgSkimmedProcessing && cfgOnlyKeepH3L3Body) {
+        isZorroSelected = zorro.isSelected(bc.globalBC());
+        if (!isZorroSelected) {
+          continue;
+        }
+      }
 
       // Save the collision
       if (collision.globalIndex() != lastCollisionID) {