CCDBPopulator adds runNumber (if any) tag to metadata

shahor02 · shahor02 · commit fb905df8b09d · 2021-12-18T03:08:45.000+01:00
Since the tag might be queried, define its name via common constexpr
diff --git a/Common/Utils/include/CommonUtils/NameConf.h b/Common/Utils/include/CommonUtils/NameConf.h
@@ -66,6 +66,7 @@ class NameConf : public o2::conf::ConfigurableParamHelper<NameConf>
   static constexpr std::string_view CCDBOBJECT = "ccdb_object"; // hardcoded
   static constexpr std::string_view CCDBMETA = "ccdb_meta";     // hardcoded
   static constexpr std::string_view CCDBQUERY = "ccdb_query";   // hardcoded
+  static constexpr std::string_view CCDBRunTag = "runNumber";
 
   // Filename to store geometry file
   static std::string getGeomFileName(const std::string_view prefix = "");
diff --git a/Detectors/Calibration/workflow/CCDBPopulatorSpec.h b/Detectors/Calibration/workflow/CCDBPopulatorSpec.h
@@ -28,6 +28,7 @@
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
 #include "CCDB/CcdbObjectInfo.h"
+#include "CommonUtils/NameConf.h"
 
 using CcdbManager = o2::ccdb::BasicCCDBManager;
 
@@ -54,15 +55,27 @@ class CCDBPopulator : public o2::framework::Task
   {
     int nSlots = pc.inputs().getNofParts(0);
     assert(pc.inputs().getNofParts(1) == nSlots);
+    auto runNoFromDH = o2::framework::DataRefUtils::getHeader<o2::header::DataHeader*>(pc.inputs().getFirstValid(true))->runNumber;
+    std::string runNoStr;
+    if (runNoFromDH > 0) {
+      runNoStr = std::to_string(runNoFromDH);
+    }
 
+    std::map<std::string, std::string> metadata;
     for (int isl = 0; isl < nSlots; isl++) {
       const auto wrp = pc.inputs().get<CcdbObjectInfo*>("clbWrapper", isl);
       const auto pld = pc.inputs().get<gsl::span<char>>("clbPayload", isl); // this is actually an image of TMemFile
+      const auto* md = &wrp->getMetaData();
+      if (runNoFromDH > 0 && md->find(o2::base::NameConf::CCDBRunTag.data()) == md->end()) { // if valid run number is provided and it is not filled in the metadata, add it to the clone
+        metadata = *md;                                                                      // clone since the md from the message is const
+        metadata[o2::base::NameConf::CCDBRunTag.data()] = runNoStr;
+        md = &metadata;
+      }
 
       LOG(info) << "Storing in ccdb " << wrp->getPath() << "/" << wrp->getFileName() << " of size " << pld.size()
                 << " Valid for " << wrp->getStartValidityTimestamp() << " : " << wrp->getEndValidityTimestamp();
       mAPI.storeAsBinaryFile(&pld[0], pld.size(), wrp->getFileName(), wrp->getObjectType(), wrp->getPath(),
-                             wrp->getMetaData(), wrp->getStartValidityTimestamp(), wrp->getEndValidityTimestamp());
+                             *md, wrp->getStartValidityTimestamp(), wrp->getEndValidityTimestamp());
     }
   }
 
diff --git a/Detectors/TPC/base/include/TPCBase/CDBInterface.h b/Detectors/TPC/base/include/TPCBase/CDBInterface.h
@@ -25,6 +25,7 @@
 #include "CCDB/CcdbApi.h"
 #include "TPCBase/CalDet.h"
 #include "DataFormatsTPC/LtrCalibData.h"
+#include "CommonUtils/NameConf.h"
 
 namespace o2::tpc
 {
@@ -312,7 +313,7 @@ class CDBStorage
 
   void setRunNumber(int run)
   {
-    mMetaData["runNumber"] = std::to_string(run);
+    mMetaData[o2::base::NameConf::CCDBRunTag.data()] = std::to_string(run);
   }
 
   template <typename T>
diff --git a/Detectors/TPC/workflow/include/TPCWorkflow/CalibLaserTracksSpec.h b/Detectors/TPC/workflow/include/TPCWorkflow/CalibLaserTracksSpec.h
@@ -24,6 +24,7 @@
 #include "Framework/WorkflowSpec.h"
 #include "CCDB/CcdbApi.h"
 #include "CCDB/CcdbObjectInfo.h"
+#include "CommonUtils/NameConf.h"
 
 #include "TPCWorkflow/ProcessingHelpers.h"
 
@@ -102,7 +103,7 @@ class CalibLaserTracksDevice : public o2::framework::Task
     auto image = o2::ccdb::CcdbApi::createObjectImage(&ltrCalib, &w);
 
     md = w.getMetaData();
-    md["runNumber"] = std::to_string(mRunNumber);
+    md[o2::base::NameConf::CCDBRunTag.data()] = std::to_string(mRunNumber);
     w.setMetaData(md);
 
     const auto now = std::chrono::system_clock::now();
diff --git a/Detectors/TPC/workflow/src/CalDetMergerPublisherSpec.cxx b/Detectors/TPC/workflow/src/CalDetMergerPublisherSpec.cxx
@@ -39,6 +39,7 @@
 #include "TPCBase/CalDet.h"
 #include "TPCWorkflow/CalDetMergerPublisherSpec.h"
 #include "TPCWorkflow/ProcessingHelpers.h"
+#include "CommonUtils/NameConf.h"
 
 using namespace o2::framework;
 using namespace o2::tpc;
@@ -178,7 +179,7 @@ class CalDetMergerPublisherSpec : public o2::framework::Task
       w.setEndValidityTimestamp(timeEnd);
 
       md = w.getMetaData();
-      md["runNumber"] = std::to_string(mRunNumber);
+      md[o2::base::NameConf::CCDBRunTag.data()] = std::to_string(mRunNumber);
       w.setMetaData(md);
 
       LOGP(info, "Sending object {}/{} of size {} bytes, valid for {} : {}", w.getPath(), w.getFileName(), image->size(), w.getStartValidityTimestamp(), w.getEndValidityTimestamp());
@@ -197,7 +198,7 @@ class CalDetMergerPublisherSpec : public o2::framework::Task
       w.setEndValidityTimestamp(timeEnd);
 
       md = w.getMetaData();
-      md["runNumber"] = std::to_string(mRunNumber);
+      md[o2::base::NameConf::CCDBRunTag.data()] = std::to_string(mRunNumber);
       w.setMetaData(md);
 
       LOG(info) << "Sending object " << w.getPath() << "/" << w.getFileName() << " of size " << image->size()
diff --git a/macro/CreateGRPECSObject.C b/macro/CreateGRPECSObject.C
@@ -56,7 +56,7 @@ void CreateGRPECSObject(timePoint start, uint32_t nHBPerTF, DetID::mask_t detsRe
   api.init(ccdbPath);
   std::map<std::string, std::string> metadata;
   metadata["responsible"] = "ECS";
-  metadata["run_number"] = std::to_string(run);
+  metadata[o2::base::NameConf::CCDBRunTag.data()] = std::to_string(run);
   //long ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
   if (end < 0) {
     end = (start + 60 * 60 * 10) * 1000; // start + 10h, in ms

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`#include "CCDB/CcdbApi.h"`
`26`	`26`	`#include "TPCBase/CalDet.h"`
`27`	`27`	`#include "DataFormatsTPC/LtrCalibData.h"`
	`28`	`+#include "CommonUtils/NameConf.h"`
`28`	`29`
`29`	`30`	`namespace o2::tpc`
`30`	`31`	`{`
`@@ -312,7 +313,7 @@ class CDBStorage`
`312`	`313`
`313`	`314`	`void setRunNumber(int run)`
`314`	`315`	`{`
`315`		`- mMetaData["runNumber"] = std::to_string(run);`
	`316`	`+ mMetaData[o2::base::NameConf::CCDBRunTag.data()] = std::to_string(run);`
`316`	`317`	`}`
`317`	`318`
`318`	`319`	`template <typename T>`