throw exceptions

Author: siliataider

hist/hist/inc/TH1.h

@@ -216,15 +216,17 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker {
    TH1* Slice(Args... args){
       constexpr size_t ndim = sizeof...(args) / 2;
       if (ndim != fDimension) {
-         Error("TH1::Slice", "Number of dimensions in slice does not match histogram dimension.");
+         throw std::invalid_argument("Number of dimensions in slice does not match histogram dimension.");
       }
 
       std::array<Int_t, sizeof...(args)> binsArray{args...};
       std::vector<Int_t> nBins(ndim);
       std::vector<Double_t> binLowEdge(ndim), binUpEdge(ndim);
       std::vector<Int_t> shiftedBins(ndim*2);
-
-      auto configureAxis = [&](size_t i, const auto &axis) {
+   
+      // Configure all axes
+      for (size_t i = 0; i < ndim; ++i) {
+         const auto &axis = (i == 0) ? fXaxis : (i == 1) ? fYaxis : fZaxis;
          Int_t binLow = std::max(1, binsArray[i * 2]);
          Int_t binUp = std::min(axis.GetNbins() + 1, binsArray[i * 2 + 1]);
          binsArray[i * 2] = binLow;
@@ -234,37 +236,28 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker {
          binUpEdge[i] = axis.GetBinLowEdge(binUp);
          shiftedBins[i * 2] = 1;
          shiftedBins[i * 2 + 1] = nBins[i] + 1;
-      };
-   
-      // Configure all axes
-      for (size_t i = 0; i < ndim; ++i) {
-            const auto &axis = (i == 0) ? fXaxis : (i == 1) ? fYaxis : fZaxis;
-            configureAxis(i, axis);
       }
 
       // Create a new histogram of the same type as this
       std::unique_ptr<TH1> hSlice(static_cast<TH1*>(IsA()->GetNew()(nullptr)));
 
       if (!hSlice) {
-         Error("TH1::Slice", "Failed to create a new histogram instance.");
+         throw std::runtime_error("Failed to create a new histogram instance.");
       }
 
       // Configure name, title and bins
       hSlice->SetNameTitle(Form("%s_slice", GetName()), GetTitle());
 
-      auto configureBins = [&](auto &hist) {
-         if constexpr (ndim == 1) {
-             hist.SetBins(nBins[0], binLowEdge[0], binUpEdge[0]);
-         } else if constexpr (ndim == 2) {
-             hist.SetBins(nBins[0], binLowEdge[0], binUpEdge[0],
-                          nBins[1], binLowEdge[1], binUpEdge[1]);
-         } else if constexpr (ndim == 3) {
-             hist.SetBins(nBins[0], binLowEdge[0], binUpEdge[0],
-                          nBins[1], binLowEdge[1], binUpEdge[1],
-                          nBins[2], binLowEdge[2], binUpEdge[2]);
-         }
-      };
-      configureBins(*hSlice);
+      if constexpr (ndim == 1) {
+         hSlice->SetBins(nBins[0], binLowEdge[0], binUpEdge[0]);
+      } else if constexpr (ndim == 2) {
+         hSlice->SetBins(nBins[0], binLowEdge[0], binUpEdge[0],
+                     nBins[1], binLowEdge[1], binUpEdge[1]);
+      } else if constexpr (ndim == 3) {
+         hSlice->SetBins(nBins[0], binLowEdge[0], binUpEdge[0],
+                     nBins[1], binLowEdge[1], binUpEdge[1],
+                     nBins[2], binLowEdge[2], binUpEdge[2]);
+      }
 
       std::vector<Double_t> sliceContents;
       std::unordered_set<Int_t> processedBins;
@@ -317,7 +310,7 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker {
    void SetSliceContent(const std::variant<std::vector<Double_t>, Double_t> &input, Args... args) {
       constexpr auto ndim = sizeof...(args) / 2;
       if (ndim != fDimension) {
-         Error("TH1::SetSliceContent", "Number of edges in the specified slice does not match histogram dimension.");
+         throw std::invalid_argument("Number of edges in the specified slice does not match histogram dimension.");
       }
 
       // Extract low/up edges in pairs
@@ -343,8 +336,7 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker {
       }, input);
 
       if (values.size() != sliceIndices.size()) {
-         Error("TH1::SetSliceContent", "Number of provided values does not match number of bins to set. ");
-         return;
+         throw std::invalid_argument("Number of provided values does not match number of bins to set.");
       }
 
       unpack_caller<ndim> caller;