Mat.LUT object must be saved as ccdb_object to be reachable from CCDB

Author: shahor02

Detectors/Base/include/DetectorsBase/MatLayerCylSet.h

@@ -74,9 +74,9 @@ class MatLayerCylSet : public o2::gpu::FlatObject
   void populateFromTGeo(int ntrPerCel = 10);
   void optimizePhiSlices(float maxRelDiff = 0.05);
 
-  void dumpToTree(const std::string outName = "matbudTree.root") const;
-  void writeToFile(std::string outFName = "matbud.root", std::string name = "MatBud");
-  static MatLayerCylSet* loadFromFile(std::string inpFName = "matbud.root", std::string name = "MatBud");
+  void dumpToTree(const std::string& outName = "matbudTree.root") const;
+  void writeToFile(const std::string& outFName = "matbud.root");
+  static MatLayerCylSet* loadFromFile(const std::string& inpFName = "matbud.root");
   static MatLayerCylSet* rectifyPtrFromFile(MatLayerCylSet* ptr);
 
   void flatten();

Detectors/Base/src/MatLayerCylSet.cxx

@@ -116,7 +116,7 @@ void MatLayerCylSet::populateFromTGeo(int ntrPerCell)
 }
 
 //________________________________________________________________________________
-void MatLayerCylSet::dumpToTree(const std::string outName) const
+void MatLayerCylSet::dumpToTree(const std::string& outName) const
 {
   /// dump per cell info to the tree
 
@@ -157,37 +157,32 @@ void MatLayerCylSet::dumpToTree(const std::string outName) const
 }
 
 //________________________________________________________________________________
-void MatLayerCylSet::writeToFile(std::string outFName, std::string name)
+void MatLayerCylSet::writeToFile(const std::string& outFName)
 {
   /// store to file
 
   TFile outf(outFName.data(), "recreate");
   if (outf.IsZombie()) {
     return;
   }
-  if (name.empty()) {
-    name = "matBud";
-  }
-  outf.WriteObjectAny(this, Class(), name.data());
+  outf.WriteObjectAny(this, Class(), "ccdb_object");
   outf.Close();
 }
 
 //________________________________________________________________________________
-MatLayerCylSet* MatLayerCylSet::loadFromFile(std::string inpFName, std::string name)
+MatLayerCylSet* MatLayerCylSet::loadFromFile(const std::string& inpFName)
 {
-  if (name.empty()) {
-    name = "MatBud";
-  }
   TFile inpf(inpFName.data());
   if (inpf.IsZombie()) {
     LOG(ERROR) << "Failed to open input file " << inpFName;
     return nullptr;
   }
-  MatLayerCylSet* mb = rectifyPtrFromFile(reinterpret_cast<MatLayerCylSet*>(inpf.GetObjectChecked(name.data(), Class())));
-  if (!mb) {
-    LOG(ERROR) << "Failed to load " << name << " from " << inpFName;
+  MatLayerCylSet* mb = reinterpret_cast<MatLayerCylSet*>(inpf.GetObjectChecked("ccdb_object", Class()));
+  if (!mb && !(mb = reinterpret_cast<MatLayerCylSet*>(inpf.GetObjectChecked("MatBud", Class())))) { // for old objects
+    LOG(ERROR) << "Failed to load mat.LUT from " << inpFName;
+    return nullptr;
   }
-  return mb;
+  return rectifyPtrFromFile(mb);
 }
 
 //________________________________________________________________________________

Detectors/Base/test/README.md

@@ -17,7 +17,7 @@ The optimized LUT will be stored in the matbud.root file.
 
 Load it as:
 ```
-auto mbr = o2::base::MatLayerCylSet::loadFromFile("matbud.root", "MatBud");
+auto mbr = o2::base::MatLayerCylSet::loadFromFile("matbud.root");
 ```
 
 To query mat. budget between 2 points use:

Detectors/Base/test/buildMatBudLUT.C

@@ -27,11 +27,9 @@
 
 o2::base::MatLayerCylSet mbLUT;
 
-bool testMBLUT(std::string lutName = "MatBud", std::string lutFile = "matbud.root");
+bool testMBLUT(const std::string& lutFile = "matbud.root");
 
-bool buildMatBudLUT(int nTst = 30, int maxLr = -1,
-                    std::string outName = "MatBud", std::string outFile = "matbud.root",
-                    std::string geomName = "");
+bool buildMatBudLUT(int nTst = 30, int maxLr = -1, const std::string& outFile = "matbud.root", const std::string& geomName = "");
 
 struct LrData {
   float rMin = 0.f;
@@ -46,7 +44,7 @@ struct LrData {
 std::vector<LrData> lrData;
 void configLayers();
 
-bool buildMatBudLUT(int nTst, int maxLr, std::string outName, std::string outFile, std::string geomNameInput)
+bool buildMatBudLUT(int nTst, int maxLr, const std::string& outFile, const std::string& geomNameInput)
 {
   auto geomName = o2::base::NameConf::getGeomFileName(geomNameInput);
   if (gSystem->AccessPathName(geomName.c_str())) { // if needed, create geometry
@@ -72,7 +70,7 @@ bool buildMatBudLUT(int nTst, int maxLr, std::string outName, std::string outFil
   mbLUT.optimizePhiSlices(); // move to populateFromTGeo
   mbLUT.flatten();           // move to populateFromTGeo
 
-  mbLUT.writeToFile(outFile, outName);
+  mbLUT.writeToFile(outFile);
   sw.Stop();
   sw.Print();
   sw.Start(false);
@@ -83,13 +81,13 @@ bool buildMatBudLUT(int nTst, int maxLr, std::string outName, std::string outFil
 }
 
 //_______________________________________________________________________
-bool testMBLUT(std::string lutName, std::string lutFile)
+bool testMBLUT(const std::string& lutFile)
 {
   // test reading and creation of copies
 
-  o2::base::MatLayerCylSet* mbr = o2::base::MatLayerCylSet::loadFromFile(lutFile, lutName);
+  o2::base::MatLayerCylSet* mbr = o2::base::MatLayerCylSet::loadFromFile(lutFile);
   if (!mbr) {
-    LOG(ERROR) << "Failed to read LUT " << lutName << " from " << lutFile;
+    LOG(ERROR) << "Failed to read LUT from " << lutFile;
     return false;
   }
 

GPU/GPUTracking/Standalone/tools/createLUT.C

@@ -9,7 +9,7 @@ using namespace GPUCA_NAMESPACE::gpu;
 
 void createLUT()
 {
-  o2::base::MatLayerCylSet* lut = o2::base::MatLayerCylSet::loadFromFile("matbud.root", "MatBud");
+  o2::base::MatLayerCylSet* lut = o2::base::MatLayerCylSet::loadFromFile("matbud.root");
   gSystem->Load("libO2GPUTracking");
   GPUReconstruction* rec = GPUReconstruction::CreateInstance(GPUReconstruction::DeviceType::CPU);
   GPUChainTracking* chain = rec->AddChain<GPUChainTracking>();

GPU/Workflow/src/GPUWorkflowSpec.cxx

@@ -248,7 +248,7 @@ DataProcessorSpec getGPURecoWorkflowSpec(gpuworkflow::CompletionPolicyData* poli
       }
 
       if (confParam.matLUTFile.size()) {
-        config.configCalib.matLUT = o2::base::MatLayerCylSet::loadFromFile(confParam.matLUTFile.c_str(), "MatBud");
+        config.configCalib.matLUT = o2::base::MatLayerCylSet::loadFromFile(confParam.matLUTFile.c_str());
       }
 
       if (confParam.dEdxFile.size()) {