diff --git a/tree/treeplayer/inc/ROOT/TDFActionHelpers.hxx b/tree/treeplayer/inc/ROOT/TDFActionHelpers.hxx index d6d89d92ef09faece406d6fce678bb6d1f2dcbb1..b4664feb121d277d1586c7eaefc09e1d5bf6bbbc 100644 --- a/tree/treeplayer/inc/ROOT/TDFActionHelpers.hxx +++ b/tree/treeplayer/inc/ROOT/TDFActionHelpers.hxx @@ -83,10 +83,10 @@ class FillHelper { std::vector<Buf_t> fBuffers; std::vector<Buf_t> fWBuffers; const std::shared_ptr<Hist_t> fResultHist; - /// Histograms containing "snapshots" of partial results. Non-null only if a registered callback requires it. - std::vector<std::unique_ptr<Hist_t>> fPartialHists; unsigned int fNSlots; unsigned int fBufSize; + /// Histograms containing "snapshots" of partial results. Non-null only if a registered callback requires it. + std::vector<std::unique_ptr<Hist_t>> fPartialHists; Buf_t fMin; Buf_t fMax; @@ -245,9 +245,6 @@ public: } void Finalize() { fTo->Merge(); } - // Must be implemented to activate callbacks for Histo1D<T> actions. - // Currently no-op, meaning we leave the result object as it is: - // the result object is already being filled because FillTOHelper keeps it in its working slot 0 HIST *PartialUpdate(unsigned int slot) { return fTo->GetAtSlotRaw(slot); } }; diff --git a/tree/treeplayer/src/TDFActionHelpers.cxx b/tree/treeplayer/src/TDFActionHelpers.cxx index 6f2344b342d01a8c5739d643e3496c3bf54f3705..b742244f2261ac6ed01b97006e7846576e900e5c 100644 --- a/tree/treeplayer/src/TDFActionHelpers.cxx +++ b/tree/treeplayer/src/TDFActionHelpers.cxx @@ -46,7 +46,7 @@ void FillHelper::UpdateMinMax(unsigned int slot, double v) } FillHelper::FillHelper(const std::shared_ptr<Hist_t> &h, const unsigned int nSlots) - : fResultHist(h), fNSlots(nSlots), fBufSize(fgTotalBufSize / nSlots), + : fResultHist(h), fNSlots(nSlots), fBufSize(fgTotalBufSize / nSlots), fPartialHists(fNSlots), fMin(nSlots, std::numeric_limits<BufEl_t>::max()), fMax(nSlots, std::numeric_limits<BufEl_t>::lowest()) { fBuffers.reserve(fNSlots);