Skip to content

Commit 9ea4d84

Browse files
wiechulasawenzel
authored andcommitted
Adjust object name, add error messages
1 parent a866387 commit 9ea4d84

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

DataFormats/Detectors/TPC/include/DataFormatsTPC/CalibdEdxCorrection.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ class CalibdEdxCorrection
9191

9292
void clear();
9393

94-
void writeToFile(std::string_view fileName, std::string_view objName = "CalibdEdxCorrection") const;
95-
void loadFromFile(std::string_view fileName, std::string_view objName = "CalibdEdxCorrection");
94+
void writeToFile(std::string_view fileName, std::string_view objName = "ccdb_object") const;
95+
void loadFromFile(std::string_view fileName, std::string_view objName = "ccdb_object");
9696

9797
/// \param outFileName name of the output file
9898
void dumpToTree(const char* outFileName = "calib_dedx.root") const;

DataFormats/Detectors/TPC/src/CalibdEdxCorrection.cxx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <string_view>
1616

1717
// o2 includes
18+
#include "Framework/Logger.h"
1819
#include "DataFormatsTPC/Defs.h"
1920
#include "CommonUtils/TreeStreamRedirector.h"
2021

@@ -39,15 +40,27 @@ void CalibdEdxCorrection::clear()
3940
void CalibdEdxCorrection::writeToFile(std::string_view fileName, std::string_view objName) const
4041
{
4142
std::unique_ptr<TFile> file(TFile::Open(fileName.data(), "recreate"));
43+
if (!file) {
44+
LOGP(error, "Failed to open file {} for writing", fileName.data());
45+
return;
46+
}
47+
4248
file->WriteObject(this, objName.data());
4349
}
4450

4551
void CalibdEdxCorrection::loadFromFile(std::string_view fileName, std::string_view objName)
4652
{
4753
std::unique_ptr<TFile> file(TFile::Open(fileName.data()));
54+
if (!file || file->IsZombie()) {
55+
LOGP(error, "Failed to open file {}", fileName.data());
56+
return;
57+
}
58+
4859
auto tmp = file->Get<CalibdEdxCorrection>(objName.data());
4960
if (tmp != nullptr) {
5061
*this = *tmp;
62+
} else {
63+
LOGP(error, "Failed to load object with name {} from file {}", objName.data(), fileName.data());
5164
}
5265
}
5366

Detectors/TPC/workflow/src/CalibdEdxSpec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class CalibdEdxDevice : public Task
134134

135135
if (mDumpToFile) {
136136
mCalib->dumpToFile("calibdEdx_Obj.root", "calib");
137-
mCalib->getCalib().writeToFile("calibdEdx.root", "ccdb_object");
137+
mCalib->getCalib().writeToFile("calibdEdx.root");
138138
if (mDumpToFile > 1) {
139139
mCalib->writeTTree("calibdEdx.histo.tree.root");
140140
}

0 commit comments

Comments
 (0)