allow to fill summary canvases in existing canvas

Author: wiechula

Detectors/TPC/base/include/TPCBase/Painter.h

@@ -49,7 +49,7 @@ namespace painter
 /// \param CalDet object to draw
 /// \return TCanvas containing CalDet content
 template <class T>
-TCanvas* draw(const CalDet<T>& calDet, int nbins1D = 300, float xMin1D = 0, float xMax1D = 0);
+TCanvas* draw(const CalDet<T>& calDet, int nbins1D = 300, float xMin1D = 0, float xMax1D = 0, TCanvas* outputCanvas = nullptr);
 
 /// Drawing of a CalDet object
 /// \param CalArray object to draw
@@ -93,9 +93,10 @@ TH2* getHistogram2D(const CalArray<T>& calArray);
 /// \param nbins1D number of bins used for the 1D projections
 /// \param xMin1D minimum value for 1D distribution (xMin = 0 and xMax = 0 for auto scaling)
 /// \param xMax1D maximum value for 1D distribution (xMin = 0 and xMax = 0 for auto scaling)
+/// \param outputCanvases if outputCanvases are given, use them instead of creating new ones, 3 are required
 /// \return TCanvas containing CalDet content
 template <class T>
-std::vector<TCanvas*> makeSummaryCanvases(const CalDet<T>& calDet, int nbins1D = 300, float xMin1D = 0, float xMax1D = 0, bool onlyFilled = true);
+std::vector<TCanvas*> makeSummaryCanvases(const CalDet<T>& calDet, int nbins1D = 300, float xMin1D = 0, float xMax1D = 0, bool onlyFilled = true, std::vector<TCanvas*>* outputCanvases = nullptr);
 
 /// Create summary canvases for a CalDet object
 ///

Detectors/TPC/base/src/Painter.cxx

@@ -29,7 +29,7 @@
 using namespace o2::tpc;
 
 template <class T>
-TCanvas* painter::draw(const CalDet<T>& calDet, int nbins1D, float xMin1D, float xMax1D)
+TCanvas* painter::draw(const CalDet<T>& calDet, int nbins1D, float xMin1D, float xMax1D, TCanvas* outputCanvas)
 {
   using DetType = CalDet<T>;
   using CalType = CalArray<T>;
@@ -93,7 +93,11 @@ TCanvas* painter::draw(const CalDet<T>& calDet, int nbins1D, float xMin1D, float
   }
 
   // ===| Draw histograms |=====================================================
-  auto c = new TCanvas(Form("c_%s", name.c_str()), title, 1000, 1000);
+  auto c = outputCanvas;
+  if (!c) {
+    c = new TCanvas(Form("c_%s", name.c_str()), title, 1000, 1000);
+  }
+  c->Clear();
   c->Divide(2, 2);
 
   c->cd(1);
@@ -235,7 +239,7 @@ std::enable_if_t<std::is_unsigned<T>::value, bool> hasData(const CalArray<T>& ca
 }
 
 template <class T>
-std::vector<TCanvas*> painter::makeSummaryCanvases(const CalDet<T>& calDet, int nbins1D, float xMin1D, float xMax1D, bool onlyFilled)
+std::vector<TCanvas*> painter::makeSummaryCanvases(const CalDet<T>& calDet, int nbins1D, float xMin1D, float xMax1D, bool onlyFilled, std::vector<TCanvas*>* outputCanvases)
 {
 
   std::vector<TCanvas*> vecCanvases;
@@ -258,14 +262,33 @@ std::vector<TCanvas*> painter::makeSummaryCanvases(const CalDet<T>& calDet, int
   }
 
   // ===| set up canvases |===
+  TCanvas* cSides = nullptr;
+  TCanvas* cROCs1D = nullptr;
+  TCanvas* cROCs2D = nullptr;
   const std::string_view calName = calDet.getName();
-  auto cSides = draw(calDet, nbins1D, xMin1D, xMax1D);
-  auto cROCs1D = new TCanvas(fmt::format("c_ROCs_{}_1D", calName).data(), fmt::format("{} values for each ROC", calName).data(), 1400, 1000);
-  auto cROCs2D = new TCanvas(fmt::format("c_ROCs_{}_2D", calName).data(), fmt::format("{} values for each ROC", calName).data(), 1400, 1000);
+
+  if (outputCanvases) {
+    if (!(outputCanvases->size() < 3)) {
+      LOGP(error, "At least 3 canvases are needed to fill the output, only {} given", outputCanvases->size());
+      return vecCanvases;
+    }
+
+    cSides = outputCanvases->at(0);
+    cROCs1D = outputCanvases->at(1);
+    cROCs2D = outputCanvases->at(2);
+    cSides->Clear();
+    cROCs1D->Clear();
+    cROCs2D->Clear();
+  } else {
+
+    cROCs1D = new TCanvas(fmt::format("c_ROCs_{}_1D", calName).data(), fmt::format("{} values for each ROC", calName).data(), 1400, 1000);
+    cROCs2D = new TCanvas(fmt::format("c_ROCs_{}_2D", calName).data(), fmt::format("{} values for each ROC", calName).data(), 1400, 1000);
+  }
   vecCanvases.emplace_back(cSides);
   vecCanvases.emplace_back(cROCs1D);
   vecCanvases.emplace_back(cROCs2D);
 
+  cSides = draw(calDet, nbins1D, xMin1D, xMax1D, cSides);
   cROCs1D->DivideSquare(nROCs);
   cROCs2D->DivideSquare(nROCs);
 
@@ -327,34 +350,34 @@ std::vector<TCanvas*> painter::makeSummaryCanvases(const std::string_view fileNa
 // ===| explicit instantiations |===============================================
 // this is required to force the compiler to create instances with the types
 // we usually would like to deal with
-template TCanvas* painter::draw<float>(const CalDet<float>& calDet, int, float, float);
-template std::vector<TCanvas*> painter::makeSummaryCanvases<float>(const CalDet<float>& calDet, int, float, float, bool);
+template TCanvas* painter::draw<float>(const CalDet<float>& calDet, int, float, float, TCanvas*);
+template std::vector<TCanvas*> painter::makeSummaryCanvases<float>(const CalDet<float>& calDet, int, float, float, bool, std::vector<TCanvas*>*);
 template TCanvas* painter::draw<float>(const CalArray<float>& calArray);
 template void painter::fillHistogram2D<float>(TH2& h2D, const CalDet<float>& calDet, Side side);
 template void painter::fillHistogram2D<float>(TH2& h2D, const CalArray<float>& calArray);
 template TH2* painter::getHistogram2D<float>(const CalDet<float>& calDet, Side side);
 template TH2* painter::getHistogram2D<float>(const CalArray<float>& calArray);
 
-template TCanvas* painter::draw<double>(const CalDet<double>& calDet, int, float, float);
-template std::vector<TCanvas*> painter::makeSummaryCanvases<double>(const CalDet<double>& calDet, int, float, float, bool);
+template TCanvas* painter::draw<double>(const CalDet<double>& calDet, int, float, float, TCanvas*);
+template std::vector<TCanvas*> painter::makeSummaryCanvases<double>(const CalDet<double>& calDet, int, float, float, bool, std::vector<TCanvas*>*);
 template TCanvas* painter::draw<double>(const CalArray<double>& calArray);
 template TH2* painter::getHistogram2D<double>(const CalDet<double>& calDet, Side side);
 template TH2* painter::getHistogram2D<double>(const CalArray<double>& calArray);
 
-template TCanvas* painter::draw<int>(const CalDet<int>& calDet, int, float, float);
-template std::vector<TCanvas*> painter::makeSummaryCanvases<int>(const CalDet<int>& calDet, int, float, float, bool);
+template TCanvas* painter::draw<int>(const CalDet<int>& calDet, int, float, float, TCanvas*);
+template std::vector<TCanvas*> painter::makeSummaryCanvases<int>(const CalDet<int>& calDet, int, float, float, bool, std::vector<TCanvas*>*);
 template TCanvas* painter::draw<int>(const CalArray<int>& calArray);
 template TH2* painter::getHistogram2D<int>(const CalDet<int>& calDet, Side side);
 template TH2* painter::getHistogram2D<int>(const CalArray<int>& calArray);
 
-template TCanvas* painter::draw<short>(const CalDet<short>& calDet, int, float, float);
-template std::vector<TCanvas*> painter::makeSummaryCanvases<short>(const CalDet<short>& calDet, int, float, float, bool);
+template TCanvas* painter::draw<short>(const CalDet<short>& calDet, int, float, float, TCanvas*);
+template std::vector<TCanvas*> painter::makeSummaryCanvases<short>(const CalDet<short>& calDet, int, float, float, bool, std::vector<TCanvas*>*);
 template TCanvas* painter::draw<short>(const CalArray<short>& calArray);
 template TH2* painter::getHistogram2D<short>(const CalDet<short>& calDet, Side side);
 template TH2* painter::getHistogram2D<short>(const CalArray<short>& calArray);
 
-template TCanvas* painter::draw<bool>(const CalDet<bool>& calDet, int, float, float);
-template std::vector<TCanvas*> painter::makeSummaryCanvases<bool>(const CalDet<bool>& calDet, int, float, float, bool);
+template TCanvas* painter::draw<bool>(const CalDet<bool>& calDet, int, float, float, TCanvas*);
+template std::vector<TCanvas*> painter::makeSummaryCanvases<bool>(const CalDet<bool>& calDet, int, float, float, bool, std::vector<TCanvas*>*);
 template TCanvas* painter::draw<bool>(const CalArray<bool>& calArray);
 template TH2* painter::getHistogram2D<bool>(const CalDet<bool>& calDet, Side side);
 template TH2* painter::getHistogram2D<bool>(const CalArray<bool>& calArray);