TPC: small fixes

wiechula · shahor02 · commit bdd262ffebae · 2021-10-30T01:30:11.000+02:00
* pass by referenc
* fix output file name
* only save if formats are given
diff --git a/Detectors/TPC/base/include/TPCBase/Utils.h b/Detectors/TPC/base/include/TPCBase/Utils.h
@@ -27,9 +27,7 @@ class TCanvas;
 class TH1;
 class TChain;
 
-namespace o2
-{
-namespace tpc
+namespace o2::tpc
 {
 
 /// \namespace utils
@@ -47,7 +45,7 @@ const std::vector<std::string> tokenize(const std::string_view input, const std:
 TH1* getBinInfoXY(int& binx, int& biny, float& bincx, float& bincy);
 void addFECInfo();
 void saveCanvases(TObjArray& arr, std::string_view outDir, std::string_view types = "png,pdf", std::string_view rootFileName = "");
-void saveCanvases(std::vector<TCanvas*> canvases, std::string_view outDir, std::string_view types = "png,pdf", std::string_view rootFileName = "");
+void saveCanvases(std::vector<TCanvas*>& canvases, std::string_view outDir, std::string_view types = "png,pdf", std::string_view rootFileName = "");
 void saveCanvas(TCanvas& c, std::string_view outDir, std::string_view types);
 std::vector<CalPad*> readCalPads(const std::string_view fileName, const std::vector<std::string>& calPadNames);
 std::vector<CalPad*> readCalPads(const std::string_view fileName, const std::string_view calPadNames);
@@ -72,7 +70,6 @@ void mergeCalPads(std::string_view outputFileName, std::string_view inputFileNam
 TChain* buildChain(std::string_view command, std::string_view treeName, std::string_view treeTitle);
 
 } // namespace utils
-} // namespace tpc
-} // namespace o2
+} // namespace o2::tpc
 
 #endif
diff --git a/Detectors/TPC/base/src/Utils.cxx b/Detectors/TPC/base/src/Utils.cxx
@@ -121,18 +121,20 @@ void utils::addFECInfo()
 
 void utils::saveCanvases(TObjArray& arr, std::string_view outDir, std::string_view types, std::string_view rootFileName)
 {
-  for (auto c : arr) {
-    utils::saveCanvas(*static_cast<TCanvas*>(c), outDir, types);
+  if (types.size()) {
+    for (auto c : arr) {
+      utils::saveCanvas(*static_cast<TCanvas*>(c), outDir, types);
+    }
   }
 
   if (rootFileName.size()) {
-    std::unique_ptr<TFile> outFile(TFile::Open(fmt::format("{}/NoiseAndPedestalCanvases.root", outDir).data(), "recreate"));
+    std::unique_ptr<TFile> outFile(TFile::Open(fmt::format("{}/{}", outDir, rootFileName).data(), "recreate"));
     arr.Write(arr.GetName(), TObject::kSingleKey);
     outFile->Close();
   }
 }
 
-void utils::saveCanvases(std::vector<TCanvas*> canvases, std::string_view outDir, std::string_view types, std::string_view rootFileName)
+void utils::saveCanvases(std::vector<TCanvas*>& canvases, std::string_view outDir, std::string_view types, std::string_view rootFileName)
 {
   TObjArray arr;
   for (auto c : canvases) {
@@ -144,6 +146,9 @@ void utils::saveCanvases(std::vector<TCanvas*> canvases, std::string_view outDir
 
 void utils::saveCanvas(TCanvas& c, std::string_view outDir, std::string_view types)
 {
+  if (!types.size()) {
+    return;
+  }
   const auto typesVec = tokenize(types, ",");
   for (const auto& type : typesVec) {
     c.SaveAs(fmt::format("{}/{}.{}", outDir, c.GetName(), type).data());

Original file line number	Diff line number	Diff line change
`@@ -121,18 +121,20 @@ void utils::addFECInfo()`
`121`	`121`
`122`	`122`	`void utils::saveCanvases(TObjArray& arr, std::string_view outDir, std::string_view types, std::string_view rootFileName)`
`123`	`123`	`{`
`124`		`- for (auto c : arr) {`
`125`		`- utils::saveCanvas(static_cast<TCanvas>(c), outDir, types);`
	`124`	`+ if (types.size()) {`
	`125`	`+ for (auto c : arr) {`
	`126`	`+ utils::saveCanvas(static_cast<TCanvas>(c), outDir, types);`
	`127`	`+ }`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`if (rootFileName.size()) {`
`129`		`- std::unique_ptr<TFile> outFile(TFile::Open(fmt::format("{}/NoiseAndPedestalCanvases.root", outDir).data(), "recreate"));`
	`131`	`+ std::unique_ptr<TFile> outFile(TFile::Open(fmt::format("{}/{}", outDir, rootFileName).data(), "recreate"));`
`130`	`132`	`arr.Write(arr.GetName(), TObject::kSingleKey);`
`131`	`133`	`outFile->Close();`
`132`	`134`	`}`
`133`	`135`	`}`
`134`	`136`
`135`		`-void utils::saveCanvases(std::vector<TCanvas*> canvases, std::string_view outDir, std::string_view types, std::string_view rootFileName)`
	`137`	`+void utils::saveCanvases(std::vector<TCanvas*>& canvases, std::string_view outDir, std::string_view types, std::string_view rootFileName)`
`136`	`138`	`{`
`137`	`139`	`TObjArray arr;`
`138`	`140`	`for (auto c : canvases) {`
`@@ -144,6 +146,9 @@ void utils::saveCanvases(std::vector<TCanvas*> canvases, std::string_view outDir`
`144`	`146`
`145`	`147`	`void utils::saveCanvas(TCanvas& c, std::string_view outDir, std::string_view types)`
`146`	`148`	`{`
	`149`	`+ if (!types.size()) {`
	`150`	`+ return;`
	`151`	`+ }`
`147`	`152`	`const auto typesVec = tokenize(types, ",");`
`148`	`153`	`for (const auto& type : typesVec) {`
`149`	`154`	`c.SaveAs(fmt::format("{}/{}.{}", outDir, c.GetName(), type).data());`