Adjust object name, add error messages

wiechula · Feb 11, 2025 · f4788ab · f4788ab
1 parent 43d17e8
commit f4788ab
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/CalibdEdxCorrection.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/CalibdEdxCorrection.h
@@ -91,8 +91,8 @@ class CalibdEdxCorrection
 
   void clear();
 
-  void writeToFile(std::string_view fileName, std::string_view objName = "CalibdEdxCorrection") const;
-  void loadFromFile(std::string_view fileName, std::string_view objName = "CalibdEdxCorrection");
+  void writeToFile(std::string_view fileName, std::string_view objName = "ccdb_object") const;
+  void loadFromFile(std::string_view fileName, std::string_view objName = "ccdb_object");
 
   /// \param outFileName name of the output file
   void dumpToTree(const char* outFileName = "calib_dedx.root") const;

diff --git a/DataFormats/Detectors/TPC/src/CalibdEdxCorrection.cxx b/DataFormats/Detectors/TPC/src/CalibdEdxCorrection.cxx
@@ -15,6 +15,7 @@
 #include <string_view>
 
 // o2 includes
+#include "Framework/Logger.h"
 #include "DataFormatsTPC/Defs.h"
 #include "CommonUtils/TreeStreamRedirector.h"
 
@@ -39,15 +40,27 @@ void CalibdEdxCorrection::clear()
 void CalibdEdxCorrection::writeToFile(std::string_view fileName, std::string_view objName) const
 {
   std::unique_ptr<TFile> file(TFile::Open(fileName.data(), "recreate"));
+  if (!file) {
+    LOGP(error, "Failed to open file {} for writing", fileName.data());
+    return;
+  }
+
   file->WriteObject(this, objName.data());
 }
 
 void CalibdEdxCorrection::loadFromFile(std::string_view fileName, std::string_view objName)
 {
   std::unique_ptr<TFile> file(TFile::Open(fileName.data()));
+  if (!file || file->IsZombie()) {
+    LOGP(error, "Failed to open file {}", fileName.data());
+    return;
+  }
+
   auto tmp = file->Get<CalibdEdxCorrection>(objName.data());
   if (tmp != nullptr) {
     *this = *tmp;
+  } else {
+    LOGP(error, "Failed to load object with name {} from file {}", objName.data(), fileName.data());
   }
 }
 

diff --git a/Detectors/TPC/workflow/src/CalibdEdxSpec.cxx b/Detectors/TPC/workflow/src/CalibdEdxSpec.cxx
@@ -134,7 +134,7 @@ class CalibdEdxDevice : public Task
 
     if (mDumpToFile) {
       mCalib->dumpToFile("calibdEdx_Obj.root", "calib");
-      mCalib->getCalib().writeToFile("calibdEdx.root", "ccdb_object");
+      mCalib->getCalib().writeToFile("calibdEdx.root");
       if (mDumpToFile > 1) {
         mCalib->writeTTree("calibdEdx.histo.tree.root");
       }