Store GRPxxx objects under ccdb_object name

shahor02 · shahor02 · commit 14030198da52 · 2021-11-22T18:47:02.000+01:00
diff --git a/DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/NameConf.h b/DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/NameConf.h
@@ -52,6 +52,9 @@ class NameConf : public o2::conf::ConfigurableParamHelper<NameConf>
   // Filename of general run parameters from ECS (GRPECS)
   static std::string getGRPECSFileName(const std::string_view prefix = STANDARDSIMPREFIX);
 
+  // Filename of general run parameters from LHCIF (GRPLHCIF)
+  static std::string getGRPLHCIFFileName(const std::string_view prefix = STANDARDSIMPREFIX);
+
   // Filename of general run parameters fof B field (GRPMagField)
   static std::string getGRPMagFieldFileName(const std::string_view prefix = STANDARDSIMPREFIX);
 
@@ -133,6 +136,7 @@ class NameConf : public o2::conf::ConfigurableParamHelper<NameConf>
   static constexpr std::string_view DIGITS_STRING = "Digits"; // hardcoded
   static constexpr std::string_view GRP_STRING = "grp";       // hardcoded
   static constexpr std::string_view GRPECS_STRING = "grpecs"; // hardcoded
+  static constexpr std::string_view GRPLHCIF_STRING = "grplhcif";       // hardcoded
   static constexpr std::string_view GRPMAGFIELD_STRING = "grpMagField"; // hardcoded
   static constexpr std::string_view KINE_STRING = "Kine";     // hardcoded
   static constexpr std::string_view MCHEADER_STRING = "MCHeader"; // hardcoded
@@ -151,6 +155,7 @@ class NameConf : public o2::conf::ConfigurableParamHelper<NameConf>
   // these are configurable paths for some commonly used files
   std::string mDirGRP = "none";    // directory for GRP file ("none" == "")
   std::string mDirGRPECS = "none"; // directory for GRPECS file ("none" == "")
+  std::string mDirGRPLHCIF = "none";    // directory for GRPLHCIF file ("none" == "")
   std::string mDirGRPMagField = "none"; // directory for GRPMagField file ("none" == "")
   std::string mDirGeom = "none";   // directory for geometry file
   std::string mDirMatLUT = "none"; // directory for material LUT
diff --git a/DataFormats/Detectors/Common/src/NameConf.cxx b/DataFormats/Detectors/Common/src/NameConf.cxx
@@ -61,6 +61,12 @@ std::string NameConf::getGRPECSFileName(const std::string_view prefix)
   return buildFileName(prefix, "_", STANDARDSIMPREFIX, GRPECS_STRING, ROOT_EXT_STRING, Instance().mDirGRPECS);
 }
 
+// Filename to store general run parameters from LHCIF (GRPLHCIF)
+std::string NameConf::getGRPLHCIFFileName(const std::string_view prefix)
+{
+  return buildFileName(prefix, "_", STANDARDSIMPREFIX, GRPLHCIF_STRING, ROOT_EXT_STRING, Instance().mDirGRPLHCIF);
+}
+
 // Filename to store general run parameters from ECS (GRPECS)
 std::string NameConf::getGRPMagFieldFileName(const std::string_view prefix)
 {
diff --git a/DataFormats/Parameters/include/DataFormatsParameters/GRPECSObject.h b/DataFormats/Parameters/include/DataFormatsParameters/GRPECSObject.h
@@ -102,7 +102,7 @@ class GRPECSObject
   /// print itself
   void print() const;
 
-  static GRPECSObject* loadFrom(const std::string& grpecsFileName = "", const std::string& grpecsName = "GRPECS");
+  static GRPECSObject* loadFrom(const std::string& grpecsFileName = "");
 
  private:
   timePoint mTimeStart = 0; ///< DAQ_time_start entry from DAQ logbook
diff --git a/DataFormats/Parameters/include/DataFormatsParameters/GRPLHCIFData.h b/DataFormats/Parameters/include/DataFormatsParameters/GRPLHCIFData.h
@@ -95,6 +95,8 @@ class GRPLHCIFData
   /// helper function for BunchFilling
   void translateBucketsToBCNumbers(std::vector<int32_t>& bcNb, std::vector<int32_t>& buckets, int beam);
 
+  static GRPLHCIFData* loadFrom(const std::string& grpLHCIFFileName = "");
+
  private:
   std::pair<long, int32_t> mBeamEnergyPerZ; // beam energy per charge
   std::pair<long, int32_t> mFillNumber;
diff --git a/DataFormats/Parameters/include/DataFormatsParameters/GRPObject.h b/DataFormats/Parameters/include/DataFormatsParameters/GRPObject.h
@@ -140,7 +140,7 @@ class GRPObject
   /// print itself
   void print() const;
 
-  static GRPObject* loadFrom(const std::string& grpFileName = "", const std::string& grpName = "GRP");
+  static GRPObject* loadFrom(const std::string& grpFileName = "");
 
  private:
   timePoint mTimeStart = 0;      ///< DAQ_time_start entry from DAQ logbook
diff --git a/DataFormats/Parameters/src/GRPECSObject.cxx b/DataFormats/Parameters/src/GRPECSObject.cxx
@@ -79,20 +79,18 @@ GRPECSObject::ROMode GRPECSObject::getDetROMode(o2::detectors::DetID id) const
 }
 
 //_______________________________________________
-GRPECSObject* GRPECSObject::loadFrom(const std::string& grpecsFileName, const std::string& grpecsName)
+GRPECSObject* GRPECSObject::loadFrom(const std::string& grpecsFileName)
 {
   // load object from file
-  auto fname = o2::base::NameConf::getGRPECSFileName(grpecsFileName);
-  TFile flGRPECS(fname.c_str());
-  if (flGRPECS.IsZombie()) {
+  auto fname = o2::base::NameConf::getGRPFileName(grpecsFileName);
+  TFile flGRP(fname.c_str());
+  if (flGRP.IsZombie()) {
     LOG(ERROR) << "Failed to open " << fname;
-    throw std::runtime_error("Failed to open GRP ECS file");
+    throw std::runtime_error("Failed to open GRPECS file");
   }
-  auto grpecs = reinterpret_cast<o2::parameters::GRPECSObject*>(
-    flGRPECS.GetObjectChecked(grpecsName.data(), o2::parameters::GRPECSObject::Class()));
-  if (!grpecs) {
-    LOG(ERROR) << "Did not find GRP ECS object named " << grpecsName;
-    throw std::runtime_error("Failed to load GRP ECS object");
+  auto grp = reinterpret_cast<o2::parameters::GRPECSObject*>(flGRP.GetObjectChecked(o2::base::NameConf::CCDBOBJECT.data(), Class()));
+  if (!grp) {
+    throw std::runtime_error(fmt::format("Failed to load GRPECS object from {}", fname));
   }
-  return grpecs;
+  return grp;
 }
diff --git a/DataFormats/Parameters/src/GRPLHCIFData.cxx b/DataFormats/Parameters/src/GRPLHCIFData.cxx
@@ -13,6 +13,7 @@
 /// \brief Implementation of the LHC InterFace data
 
 #include "DataFormatsParameters/GRPLHCIFData.h"
+#include "DetectorsCommonDataFormats/NameConf.h"
 #include "CommonConstants/PhysicsConstants.h"
 #include <cmath>
 #include <FairLogger.h>
@@ -82,3 +83,20 @@ void GRPLHCIFData::translateBucketsToBCNumbers(std::vector<int32_t>& bcNb, std::
     bcNb.push_back(i = 0 ? 0 : (i / 10 + o2::constants::lhc::BunchOffsetsP2[beam]) % o2::constants::lhc::LHCMaxBunches);
   }
 }
+
+//_______________________________________________
+GRPLHCIFData* GRPLHCIFData::loadFrom(const std::string& grpFileName)
+{
+  // load object from file
+  auto fname = o2::base::NameConf::getGRPFileName(grpFileName);
+  TFile flGRP(fname.c_str());
+  if (flGRP.IsZombie()) {
+    LOG(ERROR) << "Failed to open " << fname;
+    throw std::runtime_error("Failed to open GRPLHCIF file");
+  }
+  auto grp = reinterpret_cast<o2::parameters::GRPLHCIFData*>(flGRP.GetObjectChecked(o2::base::NameConf::CCDBOBJECT.data(), Class()));
+  if (!grp) {
+    throw std::runtime_error(fmt::format("Failed to load GRPLHCIF object from {}", fname));
+  }
+  return grp;
+}
diff --git a/DataFormats/Parameters/src/GRPObject.cxx b/DataFormats/Parameters/src/GRPObject.cxx
@@ -111,7 +111,7 @@ GRPObject::ROMode GRPObject::getDetROMode(o2::detectors::DetID id) const
 }
 
 //_______________________________________________
-GRPObject* GRPObject::loadFrom(const std::string& grpFileName, const std::string& grpName)
+GRPObject* GRPObject::loadFrom(const std::string& grpFileName)
 {
   // load object from file
   auto fname = o2::base::NameConf::getGRPFileName(grpFileName);
@@ -120,11 +120,9 @@ GRPObject* GRPObject::loadFrom(const std::string& grpFileName, const std::string
     LOG(ERROR) << "Failed to open " << fname;
     throw std::runtime_error("Failed to open GRP file");
   }
-  auto grp = reinterpret_cast<o2::parameters::GRPObject*>(
-    flGRP.GetObjectChecked(grpName.data(), o2::parameters::GRPObject::Class()));
-  if (!grp) {
-    LOG(ERROR) << "Did not find GRP object named " << grpName;
-    throw std::runtime_error("Failed to load GRP object");
+  auto grp = reinterpret_cast<o2::parameters::GRPObject*>(flGRP.GetObjectChecked(o2::base::NameConf::CCDBOBJECT.data(), Class()));
+  if (!grp && !(grp = reinterpret_cast<o2::parameters::GRPObject*>(flGRP.GetObjectChecked("GRP", Class())))) { // for BWD compatibility
+    throw std::runtime_error(fmt::format("Failed to load GRP object from {}", fname));
   }
   return grp;
 }
diff --git a/Detectors/Base/include/DetectorsBase/Propagator.h b/Detectors/Base/include/DetectorsBase/Propagator.h
@@ -138,7 +138,7 @@ class PropagatorImpl
   }
 
   static int initFieldFromGRP(const o2::parameters::GRPObject* grp, bool verbose = false);
-  static int initFieldFromGRP(const std::string grpFileName = "", std::string grpName = "GRP", bool verbose = false);
+  static int initFieldFromGRP(const std::string grpFileName = "", bool verbose = false);
 #endif
 
   GPUd() MatBudget getMatBudget(MatCorrType corrType, const o2::math_utils::Point3D<value_type>& p0, const o2::math_utils::Point3D<value_type>& p1) const;
diff --git a/Detectors/Base/src/Propagator.cxx b/Detectors/Base/src/Propagator.cxx
@@ -63,13 +63,13 @@ PropagatorImpl<value_T>::PropagatorImpl(bool uninitialized)
 
 //____________________________________________________________
 template <typename value_T>
-int PropagatorImpl<value_T>::initFieldFromGRP(const std::string grpFileName, std::string grpName, bool verbose)
+int PropagatorImpl<value_T>::initFieldFromGRP(const std::string grpFileName, bool verbose)
 {
   /// load grp and init magnetic field
   if (verbose) {
     LOG(INFO) << "Loading field from GRP of " << grpFileName;
   }
-  const auto grp = o2::parameters::GRPObject::loadFrom(grpFileName, grpName);
+  const auto grp = o2::parameters::GRPObject::loadFrom(grpFileName);
   if (!grp) {
     return -1;
   }
diff --git a/Steer/DigitizerWorkflow/src/GRPUpdaterSpec.cxx b/Steer/DigitizerWorkflow/src/GRPUpdaterSpec.cxx
@@ -17,6 +17,7 @@
 #include "Framework/Task.h"
 #include "Framework/Lifetime.h"
 #include "DataFormatsParameters/GRPObject.h"
+#include "DetectorsCommonDataFormats/NameConf.h"
 #include <TFile.h>
 #include <FairLogger.h>
 #include <memory> // for make_shared, make_unique, unique_ptr
@@ -54,7 +55,7 @@ class GRPDPLUpdatedTask
 
   void run(framework::ProcessingContext& pc)
   {
-    const std::string grpName = "GRP";
+    const std::string grpName{o2::base::NameConf::CCDBOBJECT};
 
     // a standardized semaphore convention --> taking the current execution path should be enough
     // (the user enables this via O2_USEGRP_SEMA environment)
diff --git a/macro/initSimGeomAndField.C b/macro/initSimGeomAndField.C
@@ -10,14 +10,14 @@
 
 int initSimGeom(std::string geom = "");
 
-int initSimGeomAndField(std::string geom = "", std::string grpFileName = "o2sim_grp.root", std::string grpName = "GRP")
+int initSimGeomAndField(std::string geom = "", std::string grpFileName = "o2sim_grp.root")
 {
   int res = 0;
   res = initSimGeom(geom);
   if (res) {
     return res;
   }
-  res = o2::base::Propagator::initFieldFromGRP(grpFileName, grpName);
+  res = o2::base::Propagator::initFieldFromGRP(grpFileName);
   return res;
 }
 
diff --git a/macro/o2sim.C b/macro/o2sim.C
@@ -178,7 +178,7 @@ FairRunSim* o2sim_init(bool asservice)
     // save
     std::string grpfilename = o2::base::NameConf::getGRPFileName(confref.getOutPrefix());
     TFile grpF(grpfilename.c_str(), "recreate");
-    grpF.WriteObjectAny(&grp, grp.Class(), "GRP");
+    grpF.WriteObjectAny(&grp, grp.Class(), o2::base::NameConf::CCDBOBJECT.data());
   }
 
   // todo: save beam information in the grp

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,12 @@ std::string NameConf::getGRPECSFileName(const std::string_view prefix)`
`61`	`61`	`return buildFileName(prefix, "_", STANDARDSIMPREFIX, GRPECS_STRING, ROOT_EXT_STRING, Instance().mDirGRPECS);`
`62`	`62`	`}`
`63`	`63`
	`64`	`+// Filename to store general run parameters from LHCIF (GRPLHCIF)`
	`65`	`+std::string NameConf::getGRPLHCIFFileName(const std::string_view prefix)`
	`66`	`+{`
	`67`	`+ return buildFileName(prefix, "_", STANDARDSIMPREFIX, GRPLHCIF_STRING, ROOT_EXT_STRING, Instance().mDirGRPLHCIF);`
	`68`	`+}`
	`69`	`+`
`64`	`70`	`// Filename to store general run parameters from ECS (GRPECS)`
`65`	`71`	`std::string NameConf::getGRPMagFieldFileName(const std::string_view prefix)`
`66`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,20 +79,18 @@ GRPECSObject::ROMode GRPECSObject::getDetROMode(o2::detectors::DetID id) const`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`//_______________________________________________`
`82`		`-GRPECSObject* GRPECSObject::loadFrom(const std::string& grpecsFileName, const std::string& grpecsName)`
	`82`	`+GRPECSObject* GRPECSObject::loadFrom(const std::string& grpecsFileName)`
`83`	`83`	`{`
`84`	`84`	`// load object from file`
`85`		`- auto fname = o2::base::NameConf::getGRPECSFileName(grpecsFileName);`
`86`		`- TFile flGRPECS(fname.c_str());`
`87`		`- if (flGRPECS.IsZombie()) {`
	`85`	`+ auto fname = o2::base::NameConf::getGRPFileName(grpecsFileName);`
	`86`	`+ TFile flGRP(fname.c_str());`
	`87`	`+ if (flGRP.IsZombie()) {`
`88`	`88`	`LOG(ERROR) << "Failed to open " << fname;`
`89`		`- throw std::runtime_error("Failed to open GRP ECS file");`
	`89`	`+ throw std::runtime_error("Failed to open GRPECS file");`
`90`	`90`	`}`
`91`		`- auto grpecs = reinterpret_cast<o2::parameters::GRPECSObject*>(`
`92`		`- flGRPECS.GetObjectChecked(grpecsName.data(), o2::parameters::GRPECSObject::Class()));`
`93`		`- if (!grpecs) {`
`94`		`- LOG(ERROR) << "Did not find GRP ECS object named " << grpecsName;`
`95`		`- throw std::runtime_error("Failed to load GRP ECS object");`
	`91`	`+ auto grp = reinterpret_cast<o2::parameters::GRPECSObject*>(flGRP.GetObjectChecked(o2::base::NameConf::CCDBOBJECT.data(), Class()));`
	`92`	`+ if (!grp) {`
	`93`	`+ throw std::runtime_error(fmt::format("Failed to load GRPECS object from {}", fname));`
`96`	`94`	`}`
`97`		`- return grpecs;`
	`95`	`+ return grp;`
`98`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ GRPObject::ROMode GRPObject::getDetROMode(o2::detectors::DetID id) const`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`//_______________________________________________`
`114`		`-GRPObject* GRPObject::loadFrom(const std::string& grpFileName, const std::string& grpName)`
	`114`	`+GRPObject* GRPObject::loadFrom(const std::string& grpFileName)`
`115`	`115`	`{`
`116`	`116`	`// load object from file`
`117`	`117`	`auto fname = o2::base::NameConf::getGRPFileName(grpFileName);`
`@@ -120,11 +120,9 @@ GRPObject* GRPObject::loadFrom(const std::string& grpFileName, const std::string`
`120`	`120`	`LOG(ERROR) << "Failed to open " << fname;`
`121`	`121`	`throw std::runtime_error("Failed to open GRP file");`
`122`	`122`	`}`
`123`		`- auto grp = reinterpret_cast<o2::parameters::GRPObject*>(`
`124`		`- flGRP.GetObjectChecked(grpName.data(), o2::parameters::GRPObject::Class()));`
`125`		`- if (!grp) {`
`126`		`- LOG(ERROR) << "Did not find GRP object named " << grpName;`
`127`		`- throw std::runtime_error("Failed to load GRP object");`
	`123`	`+ auto grp = reinterpret_cast<o2::parameters::GRPObject*>(flGRP.GetObjectChecked(o2::base::NameConf::CCDBOBJECT.data(), Class()));`
	`124`	`+ if (!grp && !(grp = reinterpret_cast<o2::parameters::GRPObject*>(flGRP.GetObjectChecked("GRP", Class())))) { // for BWD compatibility`
	`125`	`+ throw std::runtime_error(fmt::format("Failed to load GRP object from {}", fname));`
`128`	`126`	`}`
`129`	`127`	`return grp;`
`130`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ class PropagatorImpl`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`static int initFieldFromGRP(const o2::parameters::GRPObject* grp, bool verbose = false);`
`141`		`- static int initFieldFromGRP(const std::string grpFileName = "", std::string grpName = "GRP", bool verbose = false);`
	`141`	`+ static int initFieldFromGRP(const std::string grpFileName = "", bool verbose = false);`
`142`	`142`	`#endif`
`143`	`143`
`144`	`144`	`GPUd() MatBudget getMatBudget(MatCorrType corrType, const o2::math_utils::Point3D<value_type>& p0, const o2::math_utils::Point3D<value_type>& p1) const;`
Original file line number	Diff line number	Diff line change
`@@ -63,13 +63,13 @@ PropagatorImpl<value_T>::PropagatorImpl(bool uninitialized)`
`63`	`63`
`64`	`64`	`//____________________________________________________________`
`65`	`65`	`template <typename value_T>`
`66`		`-int PropagatorImpl<value_T>::initFieldFromGRP(const std::string grpFileName, std::string grpName, bool verbose)`
	`66`	`+int PropagatorImpl<value_T>::initFieldFromGRP(const std::string grpFileName, bool verbose)`
`67`	`67`	`{`
`68`	`68`	`/// load grp and init magnetic field`
`69`	`69`	`if (verbose) {`
`70`	`70`	`LOG(INFO) << "Loading field from GRP of " << grpFileName;`
`71`	`71`	`}`
`72`		`- const auto grp = o2::parameters::GRPObject::loadFrom(grpFileName, grpName);`
	`72`	`+ const auto grp = o2::parameters::GRPObject::loadFrom(grpFileName);`
`73`	`73`	`if (!grp) {`
`74`	`74`	`return -1;`
`75`	`75`	`}`