[Common] Fuse new evsel with timestamp (#11827)

Co-authored-by: ALICE Builder <alibuild@users.noreply.github.com>

Author: ddobrigk

Common/TableProducer/CMakeLists.txt

@@ -59,6 +59,11 @@ o2physics_add_dpl_workflow(timestamp
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(timestamptester
+                    SOURCES timestampTester.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(weak-decay-indices
                     SOURCES weakDecayIndices.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore

Common/TableProducer/eventSelectionService.cxx

@@ -24,6 +24,7 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/Tools/EventSelectionTools.h"
+#include "Common/Tools/timestampModule.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
@@ -45,18 +46,22 @@ using namespace o2::framework;
 
 MetadataHelper metadataInfo; // Metadata helper
 
-using BCsWithRun2InfosTimestampsAndMatches = soa::Join<aod::BCs, aod::Run2BCInfos, aod::Timestamps, aod::Run2MatchedToBCSparse>;
-using BCsWithRun3Matchings = soa::Join<aod::BCs, aod::Timestamps, aod::Run3MatchedToBCSparse>;
+using BCsWithRun2InfosAndMatches = soa::Join<aod::BCs, aod::Run2BCInfos, aod::Run2MatchedToBCSparse>;
+using BCsWithRun3Matchings = soa::Join<aod::BCs, aod::Run3MatchedToBCSparse>;
 using FullTracks = soa::Join<aod::Tracks, aod::TracksExtra>;
 using FullTracksIU = soa::Join<aod::TracksIU, aod::TracksExtra>;
 
 struct eventselectionRun2 {
+  o2::common::timestamp::timestampConfigurables timestampConfigurables;
+  o2::common::timestamp::TimestampModule timestampMod;
+
   o2::common::eventselection::bcselConfigurables bcselOpts;
   o2::common::eventselection::BcSelectionModule bcselmodule;
 
   o2::common::eventselection::evselConfigurables evselOpts;
   o2::common::eventselection::EventSelectionModule evselmodule;
 
+  Produces<aod::Timestamps> timestampTable; /// Table with SOR timestamps produced by the task
   Produces<aod::BcSels> bcsel;
   Produces<aod::EvSels> evsel;
 
@@ -69,8 +74,8 @@ struct eventselectionRun2 {
 
   HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
 
-  // the best: have readable cursors
-  // this: a stopgap solution to avoid spawning yet another device
+  // buffering intermediate results for passing
+  std::vector<uint64_t> timestamps;
   std::vector<o2::common::eventselection::bcselEntry> bcselsbuffer;
 
   // auxiliary
@@ -85,11 +90,12 @@ struct eventselectionRun2 {
     ccdb->setURL(ccdburl.value);
 
     // task-specific
+    timestampMod.init(timestampConfigurables, metadataInfo);
     bcselmodule.init(context, bcselOpts, histos);
     evselmodule.init(context, evselOpts, histos, metadataInfo);
   }
 
-  void process(BCsWithRun2InfosTimestampsAndMatches const& bcs,
+  void process(BCsWithRun2InfosAndMatches const& bcs,
                aod::Collisions const& collisions,
                aod::Zdcs const&,
                aod::FV0As const&,
@@ -98,12 +104,16 @@ struct eventselectionRun2 {
                aod::FDDs const&,
                FullTracks const&)
   {
-    bcselmodule.processRun2(ccdb, bcs, bcselsbuffer, bcsel);
-    evselmodule.processRun2(ccdb, histos, collisions, tracklets, cache, bcselsbuffer, evsel);
+    timestampMod.process(bcs, ccdb, timestamps, timestampTable);
+    bcselmodule.processRun2(ccdb, bcs, timestamps, bcselsbuffer, bcsel);
+    evselmodule.processRun2(ccdb, histos, collisions, tracklets, cache, timestamps, bcselsbuffer, evsel);
   }
 };
 
 struct eventselectionRun3 {
+  o2::common::timestamp::timestampConfigurables timestampConfigurables;
+  o2::common::timestamp::TimestampModule timestampMod;
+
   o2::common::eventselection::bcselConfigurables bcselOpts;
   o2::common::eventselection::BcSelectionModule bcselmodule;
 
@@ -113,6 +123,7 @@ struct eventselectionRun3 {
   o2::common::eventselection::lumiConfigurables lumiOpts;
   o2::common::eventselection::LumiModule lumimodule;
 
+  Produces<aod::Timestamps> timestampTable; /// Table with SOR timestamps produced by the task
   Produces<aod::BcSels> bcsel;
   Produces<aod::EvSels> evsel;
 
@@ -127,6 +138,7 @@ struct eventselectionRun3 {
 
   // the best: have readable cursors
   // this: a stopgap solution to avoid spawning yet another device
+  std::vector<uint64_t> timestamps;
   std::vector<o2::common::eventselection::bcselEntry> bcselsbuffer;
 
   // auxiliary
@@ -141,6 +153,7 @@ struct eventselectionRun3 {
     ccdb->setURL(ccdburl.value);
 
     // task-specific
+    timestampMod.init(timestampConfigurables, metadataInfo);
     bcselmodule.init(context, bcselOpts, histos);
     evselmodule.init(context, evselOpts, histos, metadataInfo);
     lumimodule.init(context, lumiOpts, histos);
@@ -154,9 +167,10 @@ struct eventselectionRun3 {
                aod::FDDs const&,
                FullTracksIU const&)
   {
-    bcselmodule.processRun3(ccdb, histos, bcs, bcselsbuffer, bcsel);
-    evselmodule.processRun3(ccdb, histos, bcs, collisions, pvTracks, ft0s, cache, bcselsbuffer, evsel);
-    lumimodule.process(ccdb, histos, bcs, bcselsbuffer);
+    timestampMod.process(bcs, ccdb, timestamps, timestampTable);
+    bcselmodule.processRun3(ccdb, histos, bcs, timestamps, bcselsbuffer, bcsel);
+    evselmodule.processRun3(ccdb, histos, bcs, collisions, pvTracks, ft0s, cache, timestamps, bcselsbuffer, evsel);
+    lumimodule.process(ccdb, histos, bcs, timestamps, bcselsbuffer);
   }
 };
 

Common/TableProducer/timestampTester.cxx

@@ -0,0 +1,72 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+///
+/// \file   timestamp.cxx
+/// \author Nicolò Jacazio
+/// \since  2020-06-22
+/// \brief  A task to fill the timestamp table from run number.
+///         Uses headers from CCDB
+///
+#include "MetadataHelper.h"
+
+#include "Common/Tools/timestampModule.h"
+
+#include "CCDB/BasicCCDBManager.h"
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DetectorsRaw/HBFUtils.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <map>
+#include <vector>
+
+using namespace o2::framework;
+using namespace o2::header;
+using namespace o2;
+
+MetadataHelper metadataInfo; // Metadata helper
+
+struct TimestampTask {
+  Produces<aod::Timestamps> timestampTable; /// Table with SOR timestamps produced by the task
+  Service<o2::ccdb::BasicCCDBManager> ccdb; /// CCDB manager to access orbit-reset timestamp
+  o2::ccdb::CcdbApi ccdb_api;               /// API to access CCDB headers
+
+  Configurable<std::string> ccdb_url{"ccdb-url", "http://alice-ccdb.cern.ch", "URL of the CCDB database"};
+
+  o2::common::timestamp::timestampConfigurables timestampConfigurables;
+  o2::common::timestamp::TimestampModule timestampMod;
+
+  std::vector<int64_t> timestampBuffer;
+
+  void init(o2::framework::InitContext&)
+  {
+    // CCDB initialization
+    ccdb->setURL(ccdb_url.value);
+    ccdb_api.init(ccdb_url.value);
+
+    // timestamp configuration + init
+    timestampMod.init(timestampConfigurables, metadataInfo);
+  }
+
+  void process(aod::BCs const& bcs)
+  {
+    timestampMod.process(bcs, ccdb, timestampBuffer, timestampTable);
+  }
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  // Parse the metadata
+  metadataInfo.initMetadata(cfgc);
+
+  return WorkflowSpec{adaptAnalysisTask<TimestampTask>(cfgc)};
+}

Common/Tools/EventSelectionTools.h

@@ -264,17 +264,18 @@ class BcSelectionModule
   }
 
   //__________________________________________________
-  template <typename TCCDB, typename TBCs, typename TBcSelBuffer, typename TBcSelCursor>
-  void processRun2(TCCDB const& ccdb, TBCs const& bcs, TBcSelBuffer& bcselbuffer, TBcSelCursor& bcsel)
+  template <typename TCCDB, typename TBCs, typename TTimestamps, typename TBcSelBuffer, typename TBcSelCursor>
+  void processRun2(TCCDB const& ccdb, TBCs const& bcs, TTimestamps const& timestamps, TBcSelBuffer& bcselbuffer, TBcSelCursor& bcsel)
   {
     if (bcselOpts.amIneeded.value == 0) {
       bcselbuffer.clear();
       return;
     }
     bcselbuffer.clear();
     for (const auto& bc : bcs) {
-      par = ccdb->template getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", bc.timestamp());
-      aliases = ccdb->template getForTimeStamp<TriggerAliases>("EventSelection/TriggerAliases", bc.timestamp());
+      uint64_t timestamp = timestamps[bc.globalIndex()];
+      par = ccdb->template getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", timestamp);
+      aliases = ccdb->template getForTimeStamp<TriggerAliases>("EventSelection/TriggerAliases", timestamp);
       // fill fired aliases
       uint32_t alias{0};
       uint64_t triggerMask = bc.triggerMask();
@@ -401,8 +402,8 @@ class BcSelectionModule
   } // end processRun2
 
   //__________________________________________________
-  template <typename TCCDB, typename THistoRegistry, typename TBCs, typename TBcSelBuffer, typename TBcSelCursor>
-  void processRun3(TCCDB const& ccdb, THistoRegistry& histos, TBCs const& bcs, TBcSelBuffer& bcselbuffer, TBcSelCursor& bcsel)
+  template <typename TCCDB, typename THistoRegistry, typename TBCs, typename TTimestamps, typename TBcSelBuffer, typename TBcSelCursor>
+  void processRun3(TCCDB const& ccdb, THistoRegistry& histos, TBCs const& bcs, TTimestamps const& timestamps, TBcSelBuffer& bcselbuffer, TBcSelCursor& bcsel)
   {
     if (bcselOpts.amIneeded.value == 0) {
       bcselbuffer.clear();
@@ -426,15 +427,16 @@ class BcSelectionModule
 
     // bc loop
     for (auto bc : bcs) { // o2-linter: disable=const-ref-in-for-loop (use bc as nonconst iterator)
+      uint64_t timestamp = timestamps[bc.globalIndex()];
       // store rct flags
       uint32_t rct = lastRCT;
       int64_t thisTF = (bc.globalBC() - bcSOR) / nBCsPerTF;
       if (mapRCT != nullptr && thisTF != lastTF) { // skip for unanchored runs; do it once per TF
-        auto itrct = mapRCT->upper_bound(bc.timestamp());
+        auto itrct = mapRCT->upper_bound(timestamp);
         if (itrct != mapRCT->begin())
           itrct--;
         rct = itrct->second;
-        LOGP(debug, "sor={} eor={} ts={} rct={}", sorTimestamp, eorTimestamp, bc.timestamp(), rct);
+        LOGP(debug, "sor={} eor={} ts={} rct={}", sorTimestamp, eorTimestamp, timestamp, rct);
         lastRCT = rct;
         lastTF = thisTF;
       }
@@ -560,10 +562,10 @@ class BcSelectionModule
       LOGP(debug, "foundFT0={}", foundFT0);
 
       const char* srun = Form("%d", run);
-      if (bc.timestamp() < sorTimestamp || bc.timestamp() > eorTimestamp) {
+      if (timestamp < sorTimestamp || timestamp > eorTimestamp) {
         histos.template get<TH1>(HIST("bcselection/hCounterInvalidBCTimestamp"))->Fill(srun, 1);
         if (bcselOpts.confCheckRunDurationLimits.value) {
-          LOGF(warn, "Invalid BC timestamp: %d, run: %d, sor: %d, eor: %d", bc.timestamp(), run, sorTimestamp, eorTimestamp);
+          LOGF(warn, "Invalid BC timestamp: %d, run: %d, sor: %d, eor: %d", timestamp, run, sorTimestamp, eorTimestamp);
           alias = 0u;
           selection = 0u;
         }
@@ -692,8 +694,8 @@ class EventSelectionModule
   }
 
   //__________________________________________________
-  template <typename TCCDB, typename TBCs>
-  bool configure(TCCDB& ccdb, TBCs const& bcs)
+  template <typename TCCDB, typename TTimestamps, typename TBCs>
+  bool configure(TCCDB& ccdb, TTimestamps const& timestamps, TBCs const& bcs)
   {
     int run = bcs.iteratorAt(0).runNumber();
     // extract bc pattern from CCDB for data or anchored MC only
@@ -705,7 +707,8 @@ class EventSelectionModule
       // duration of TF in bcs
       nBCsPerTF = evselOpts.confNumberOfOrbitsPerTF < 0 ? runInfo.orbitsPerTF * nBCsPerOrbit : evselOpts.confNumberOfOrbitsPerTF * nBCsPerOrbit;
       // colliding bc pattern
-      int64_t ts = bcs.iteratorAt(0).timestamp();
+      int64_t ts = timestamps[0];
+
       // getForTimeStamp replaced with getSpecific to set metadata to zero
       // avoids crash related to specific run number
       auto grplhcif = ccdb->template getSpecific<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", ts);
@@ -721,15 +724,16 @@ class EventSelectionModule
   }
 
   //__________________________________________________
-  template <typename TCCDB, typename THistoRegistry, typename TCollisions, typename TTracklets, typename TSlicecache, typename TBcSelBuffer, typename TEvselCursor>
-  void processRun2(TCCDB const& ccdb, THistoRegistry& histos, TCollisions const& collisions, TTracklets const& tracklets, TSlicecache& cache, TBcSelBuffer const& bcselbuffer, TEvselCursor& evsel)
+  template <typename TCCDB, typename THistoRegistry, typename TCollisions, typename TTracklets, typename TSlicecache, typename TTimestamps, typename TBcSelBuffer, typename TEvselCursor>
+  void processRun2(TCCDB const& ccdb, THistoRegistry& histos, TCollisions const& collisions, TTracklets const& tracklets, TSlicecache& cache, TTimestamps const& timestamps, TBcSelBuffer const& bcselbuffer, TEvselCursor& evsel)
   {
     if (evselOpts.amIneeded.value == 0) {
       return; // dummy process
     }
     for (const auto& col : collisions) {
       auto bc = col.template bc_as<soa::Join<aod::BCs, aod::Run2BCInfos, aod::Timestamps, aod::Run2MatchedToBCSparse>>();
-      EventSelectionParams* par = ccdb->template getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", bc.timestamp());
+      uint64_t timestamp = timestamps[bc.globalIndex()];
+      EventSelectionParams* par = ccdb->template getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", timestamp);
       bool* applySelection = par->getSelection(evselOpts.muonSelection);
       if (evselOpts.isMC == 1) {
         applySelection[aod::evsel::kIsBBZAC] = 0;
@@ -802,13 +806,13 @@ class EventSelectionModule
   } // end processRun2
 
   //__________________________________________________
-  template <typename TCCDB, typename THistoRegistry, typename TBCs, typename TCollisions, typename TPVTracks, typename TFT0s, typename TSlicecache, typename TBcSelBuffer, typename TEvselCursor>
-  void processRun3(TCCDB const& ccdb, THistoRegistry& histos, TBCs const& bcs, TCollisions const& cols, TPVTracks const& pvTracks, TFT0s const& ft0s, TSlicecache& cache, TBcSelBuffer const& bcselbuffer, TEvselCursor& evsel)
+  template <typename TCCDB, typename THistoRegistry, typename TBCs, typename TCollisions, typename TPVTracks, typename TFT0s, typename TSlicecache, typename TTimestamps, typename TBcSelBuffer, typename TEvselCursor>
+  void processRun3(TCCDB const& ccdb, THistoRegistry& histos, TBCs const& bcs, TCollisions const& cols, TPVTracks const& pvTracks, TFT0s const& ft0s, TSlicecache& cache, TTimestamps const& timestamps, TBcSelBuffer const& bcselbuffer, TEvselCursor& evsel)
   {
     if (evselOpts.amIneeded.value == 0) {
       return; // dummy process
     }
-    if (!configure(ccdb, bcs))
+    if (!configure(ccdb, timestamps, bcs))
       return; // don't do anything in case configuration reported not ok
 
     int run = bcs.iteratorAt(0).runNumber();
@@ -1372,8 +1376,8 @@ class LumiModule
     }
   }
 
-  template <typename TCCDB, typename TBCs>
-  bool configure(TCCDB& ccdb, TBCs const& bcs)
+  template <typename TCCDB, typename TTimestamps, typename TBCs>
+  bool configure(TCCDB& ccdb, TTimestamps const& timestamps, TBCs const& bcs)
   {
     if (bcs.size() == 0)
       return false;
@@ -1382,7 +1386,7 @@ class LumiModule
       return false;
     if (run != lastRun && run >= 520259) { // o2-linter: disable=magic-number (scalers available for runs above 520120)
       lastRun = run;
-      int64_t ts = bcs.iteratorAt(0).timestamp();
+      int64_t ts = timestamps[0];
 
       // getting GRP LHCIF object to extract colliding system, energy and colliding bc pattern
       auto grplhcif = ccdb->template getForTimeStamp<parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", ts);
@@ -1511,14 +1515,14 @@ class LumiModule
   }
 
   //__________________________________________________
-  template <typename TCCDB, typename THistoRegistry, typename TBCs, typename TBcSelBuffer>
-  void process(TCCDB& ccdb, THistoRegistry& histos, TBCs const& bcs, TBcSelBuffer const& bcselBuffer)
+  template <typename TCCDB, typename THistoRegistry, typename TBCs, typename TTimestamps, typename TBcSelBuffer>
+  void process(TCCDB& ccdb, THistoRegistry& histos, TBCs const& bcs, TTimestamps const& timestamps, TBcSelBuffer const& bcselBuffer)
   {
     if (lumiOpts.amIneeded.value == 0) {
       return;
     }
 
-    if (!configure(ccdb, bcs))
+    if (!configure(ccdb, timestamps, bcs))
       return; // don't do anything in case configuration reported not ok
 
     int run = bcs.iteratorAt(0).runNumber();