Fix timing info in ITS cluster and track tasks (#1605)

* ranges updated to be compatible with back-bias calibration

* from current timestamp to TF timestamp

Author: iravasen

Modules/ITS/include/ITS/ITSClusterTask.h

@@ -26,6 +26,7 @@
 
 #include <DataFormatsITSMFT/TopologyDictionary.h>
 #include <ITSBase/GeometryTGeo.h>
+#include <Framework/TimingInfo.h>
 
 class TH1D;
 class TH2D;
@@ -96,7 +97,7 @@ class ITSClusterTask : public TaskInterface
   int mNRofs = 0;
   int mNRofsMonitor = 0;
   int nBCbins = 103;
-  long int mTimestamp;
+  long int mTimestamp = -1;
   std::string mGeomPath = "./";
   TString xLabel;
   std::string mGeoTimestamp = "1640991600000";

Modules/ITS/include/ITS/ITSTrackTask.h

@@ -22,6 +22,7 @@
 #include <TH2D.h>
 #include <DataFormatsITSMFT/TopologyDictionary.h>
 #include <ITSBase/GeometryTGeo.h>
+#include <Framework/TimingInfo.h>
 #include <TTree.h>
 #include <TLine.h>
 
@@ -83,7 +84,7 @@ class ITSTrackTask : public TaskInterface
   Int_t mNTracks = 0;
   Int_t mNRofs = 0;
   int nBCbins = 103;
-  long int mTimestamp;
+  long int mTimestamp = -1;
   int nVertices = 0;
   double mChipBins[2125]; // x bins for cos(lambda) plot
   double mCoslBins[25];   // y bins for cos(lambda) plot

Modules/ITS/src/ITSClusterTask.cxx

@@ -126,15 +126,6 @@ void ITSClusterTask::initialize(o2::framework::InitContext& /*ctx*/)
   mGeneralOccupancy->GetXaxis()->SetLabelSize(0);
   mGeneralOccupancy->GetZaxis()->SetTitle("Max Avg Cluster occ (clusters/event/chip)");
   publishHistos();
-
-  // get dict from ccdb
-  mTimestamp = std::stol(o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "dicttimestamp", "0"));
-  long int ts = mTimestamp ? mTimestamp : o2::ccdb::getCurrentTimestamp();
-  ILOG(Info, Support) << "Getting dictionary from ccdb - timestamp: " << ts << ENDM;
-  auto& mgr = o2::ccdb::BasicCCDBManager::instance();
-  mgr.setTimestamp(ts);
-  mDict = mgr.get<o2::itsmft::TopologyDictionary>("ITS/Calib/ClusterDictionary");
-  ILOG(Info, Support) << "Dictionary size: " << mDict->getSize() << ENDM;
 }
 
 void ITSClusterTask::startOfActivity(Activity& /*activity*/)
@@ -151,6 +142,16 @@ void ITSClusterTask::startOfCycle()
 void ITSClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
 {
 
+  if (mTimestamp == -1) { // get dict from ccdb
+    mTimestamp = std::stol(o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "dicttimestamp", "0"));
+    long int ts = mTimestamp ? mTimestamp : ctx.services().get<o2::framework::TimingInfo>().creation;
+    ILOG(Info, Support) << "Getting dictionary from ccdb - timestamp: " << ts << ENDM;
+    auto& mgr = o2::ccdb::BasicCCDBManager::instance();
+    mgr.setTimestamp(ts);
+    mDict = mgr.get<o2::itsmft::TopologyDictionary>("ITS/Calib/ClusterDictionary");
+    ILOG(Info, Support) << "Dictionary size: " << mDict->getSize() << ENDM;
+  }
+
   std::chrono::time_point<std::chrono::high_resolution_clock> start;
   std::chrono::time_point<std::chrono::high_resolution_clock> end;
   int difference;

Modules/ITS/src/ITSTrackTask.cxx

@@ -78,16 +78,6 @@ void ITSTrackTask::initialize(o2::framework::InitContext& /*ctx*/)
     auto line = new TLine(ChipBoundary[l], 0, ChipBoundary[l], 10);
     hNClusterVsChipITS->GetListOfFunctions()->Add(line);
   }
-
-  // get dict from ccdb
-  // mTimestamp = std::stol(mCustomParameters["dicttimestamp"]);
-  mTimestamp = std::stol(o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "dicttimestamp", "0"));
-  long int ts = mTimestamp ? mTimestamp : o2::ccdb::getCurrentTimestamp();
-  ILOG(Info, Support) << "Getting dictionary from ccdb - timestamp: " << ts << ENDM;
-  auto& mgr = o2::ccdb::BasicCCDBManager::instance();
-  mgr.setTimestamp(ts);
-  mDict = mgr.get<o2::itsmft::TopologyDictionary>("ITS/Calib/ClusterDictionary");
-  ILOG(Info, Support) << "Dictionary size: " << mDict->getSize() << ENDM;
 }
 
 void ITSTrackTask::startOfActivity(Activity& /*activity*/)
@@ -104,6 +94,17 @@ void ITSTrackTask::monitorData(o2::framework::ProcessingContext& ctx)
 {
 
   ILOG(Info, Support) << "START DOING QC General" << ENDM;
+
+  if (mTimestamp == -1) { // get dict from ccdb
+    mTimestamp = std::stol(o2::quality_control_modules::common::getFromConfig<string>(mCustomParameters, "dicttimestamp", "0"));
+    long int ts = mTimestamp ? mTimestamp : ctx.services().get<o2::framework::TimingInfo>().creation;
+    ILOG(Info, Support) << "Getting dictionary from ccdb - timestamp: " << ts << ENDM;
+    auto& mgr = o2::ccdb::BasicCCDBManager::instance();
+    mgr.setTimestamp(ts);
+    mDict = mgr.get<o2::itsmft::TopologyDictionary>("ITS/Calib/ClusterDictionary");
+    ILOG(Info, Support) << "Dictionary size: " << mDict->getSize() << ENDM;
+  }
+
   auto trackArr = ctx.inputs().get<gsl::span<o2::its::TrackITS>>("tracks");
   auto trackRofArr = ctx.inputs().get<gsl::span<o2::itsmft::ROFRecord>>("rofs");
   auto clusRofArr = ctx.inputs().get<gsl::span<o2::itsmft::ROFRecord>>("clustersrof");