Skip to content

[hist] Clean up includes and rely on injected-class-name #20678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hahnjo wants to merge 2 commits into
base: master
Choose a base branch
from
+34 −29
Open

[hist] Clean up includes and rely on injected-class-name #20678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1873a42
[hist] Add and remove some includes as needed
hahnjo Dec 9, 2025
dcf0d1d
[hist] Rely on injected-class-name
hahnjo Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hist/histv7/inc/ROOT/RAxes.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "RVariableBinAxis.hxx"

#include <array>
#include <cassert>
#include <cstddef>
#include <cstdint>
#include <stdexcept>
Expand Down
1 change: 1 addition & 0 deletions hist/histv7/inc/ROOT/RBinIndexRange.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "RBinIndex.hxx"

#include <cassert>
#include <cstddef> // for std::ptrdiff_t
#include <cstdint>
#include <iterator>

Expand Down
19 changes: 10 additions & 9 deletions hist/histv7/inc/ROOT/RHist.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
#ifndef ROOT_RHist
#define ROOT_RHist

#include "RAxes.hxx" // for RAxisVariant
#include "RBinIndex.hxx"
#include "RHistEngine.hxx"
#include "RHistStats.hxx"
#include "RRegularAxis.hxx"
#include "RWeight.hxx"

#include <array>
#include <cassert>
#include <cstddef>
#include <cstdint>
#include <stdexcept>
Expand Down Expand Up @@ -90,21 +91,21 @@ public:
///
/// Copying all bin contents can be an expensive operation, depending on the number of bins. If required, users can
/// explicitly call Clone().
RHist(const RHist<BinContentType> &) = delete;
RHist(const RHist &) = delete;
/// Efficiently move construct a histogram.
///
/// After this operation, the moved-from object is invalid.
RHist(RHist<BinContentType> &&) = default;
RHist(RHist &&) = default;

/// The copy assignment operator is deleted.
///
/// Copying all bin contents can be an expensive operation, depending on the number of bins. If required, users can
/// explicitly call Clone().
RHist<BinContentType> &operator=(const RHist<BinContentType> &) = delete;
RHist &operator=(const RHist &) = delete;
/// Efficiently move a histogram.
///
/// After this operation, the moved-from object is invalid.
RHist<BinContentType> &operator=(RHist<BinContentType> &&) = default;
RHist &operator=(RHist &&) = default;

~RHist() = default;

Expand Down Expand Up @@ -177,7 +178,7 @@ public:
/// Throws an exception if the axes configurations are not identical.
///
/// \param[in] other another histogram
void Add(const RHist<BinContentType> &other)
void Add(const RHist &other)
{
fEngine.Add(other.fEngine);
fStats.Add(other.fStats);
Expand All @@ -188,7 +189,7 @@ public:
/// Throws an exception if the axes configurations are not identical.
///
/// \param[in] other another histogram that must not be modified during the operation
void AddAtomic(const RHist<BinContentType> &other)
void AddAtomic(const RHist &other)
{
fEngine.AddAtomic(other.fEngine);
fStats.AddAtomic(other.fStats);
Expand All @@ -206,9 +207,9 @@ public:
/// Copying all bin contents can be an expensive operation, depending on the number of bins.
///
/// \return the cloned object
RHist<BinContentType> Clone() const
RHist Clone() const
{
RHist<BinContentType> h(fEngine.Clone());
RHist h(fEngine.Clone());
h.fStats = fStats;
return h;
}
Expand Down
2 changes: 2 additions & 0 deletions hist/histv7/inc/ROOT/RHistAutoAxisFiller.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
#include "RWeight.hxx"

#include <algorithm>
#include <cassert>
#include <cmath>
#include <cstddef>
#include <cstdint>
#include <limits>
#include <optional>
#include <stdexcept>
#include <type_traits> // for std::conditional_t
#include <utility>
#include <vector>

Expand Down
10 changes: 4 additions & 6 deletions hist/histv7/inc/ROOT/RHistConcurrentFiller.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
#define ROOT_RHistConcurrentFiller

#include "RHist.hxx"
#include "RHistEngine.hxx"
#include "RHistFillContext.hxx"
#include "RWeight.hxx"

#include <exception>
#include <memory>
Expand Down Expand Up @@ -56,10 +54,10 @@ public:
}
}

RHistConcurrentFiller(const RHistConcurrentFiller<BinContentType> &) = delete;
RHistConcurrentFiller(RHistConcurrentFiller<BinContentType> &&) = delete;
RHistConcurrentFiller<BinContentType> &operator=(const RHistConcurrentFiller<BinContentType> &) = delete;
RHistConcurrentFiller<BinContentType> &operator=(RHistConcurrentFiller<BinContentType> &&) = delete;
RHistConcurrentFiller(const RHistConcurrentFiller &) = delete;
RHistConcurrentFiller(RHistConcurrentFiller &&) = delete;
RHistConcurrentFiller &operator=(const RHistConcurrentFiller &) = delete;
RHistConcurrentFiller &operator=(RHistConcurrentFiller &&) = delete;

~RHistConcurrentFiller()
{
Expand Down
16 changes: 8 additions & 8 deletions hist/histv7/inc/ROOT/RHistEngine.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,21 @@ public:
///
/// Copying all bin contents can be an expensive operation, depending on the number of bins. If required, users can
/// explicitly call Clone().
RHistEngine(const RHistEngine<BinContentType> &) = delete;
RHistEngine(const RHistEngine &) = delete;
/// Efficiently move construct a histogram engine.
///
/// After this operation, the moved-from object is invalid.
RHistEngine(RHistEngine<BinContentType> &&) = default;
RHistEngine(RHistEngine &&) = default;

/// The copy assignment operator is deleted.
///
/// Copying all bin contents can be an expensive operation, depending on the number of bins. If required, users can
/// explicitly call Clone().
RHistEngine<BinContentType> &operator=(const RHistEngine<BinContentType> &) = delete;
RHistEngine &operator=(const RHistEngine &) = delete;
/// Efficiently move a histogram engine.
///
/// After this operation, the moved-from object is invalid.
RHistEngine<BinContentType> &operator=(RHistEngine<BinContentType> &&) = default;
RHistEngine &operator=(RHistEngine &&) = default;

~RHistEngine() = default;

Expand Down Expand Up @@ -187,7 +187,7 @@ public:
/// Throws an exception if the axes configurations are not identical.
///
/// \param[in] other another histogram
void Add(const RHistEngine<BinContentType> &other)
void Add(const RHistEngine &other)
{
if (fAxes != other.fAxes) {
throw std::invalid_argument("axes configurations not identical in Add");
Expand All @@ -202,7 +202,7 @@ public:
/// Throws an exception if the axes configurations are not identical.
///
/// \param[in] other another histogram that must not be modified during the operation
void AddAtomic(const RHistEngine<BinContentType> &other)
void AddAtomic(const RHistEngine &other)
{
if (fAxes != other.fAxes) {
throw std::invalid_argument("axes configurations not identical in AddAtomic");
Expand All @@ -225,9 +225,9 @@ public:
/// Copying all bin contents can be an expensive operation, depending on the number of bins.
///
/// \return the cloned object
RHistEngine<BinContentType> Clone() const
RHistEngine Clone() const
{
RHistEngine<BinContentType> h(fAxes.Get());
RHistEngine h(fAxes.Get());
for (std::size_t i = 0; i < fBinContents.size(); i++) {
h.fBinContents[i] = fBinContents[i];
}
Expand Down
11 changes: 7 additions & 4 deletions hist/histv7/inc/ROOT/RHistFillContext.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
#include "RHist.hxx"
#include "RHistEngine.hxx"
#include "RHistStats.hxx"
#include "RWeight.hxx"

#include <tuple>

namespace ROOT {
namespace Experimental {
Expand Down Expand Up @@ -37,10 +40,10 @@ private:

/// \sa RHistConcurrentFiller::CreateFillContent()
explicit RHistFillContext(RHist<BinContentType> &hist) : fHist(&hist), fStats(hist.GetNDimensions()) {}
RHistFillContext(const RHistFillContext<BinContentType> &) = delete;
RHistFillContext(RHistFillContext<BinContentType> &&) = default;
RHistFillContext<BinContentType> &operator=(const RHistFillContext<BinContentType> &) = delete;
RHistFillContext<BinContentType> &operator=(RHistFillContext<BinContentType> &&) = default;
RHistFillContext(const RHistFillContext &) = delete;
RHistFillContext(RHistFillContext &&) = default;
RHistFillContext &operator=(const RHistFillContext &) = delete;
RHistFillContext &operator=(RHistFillContext &&) = default;

public:
~RHistFillContext() { Flush(); }
Expand Down
2 changes: 1 addition & 1 deletion hist/histv7/inc/ROOT/RHistStats.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
#define ROOT_RHistStats

#include "RHistUtils.hxx"
#include "RLinearizedIndex.hxx"
#include "RWeight.hxx"

#include <cmath>
#include <cstddef>
#include <cstdint>
#include <stdexcept>
#include <tuple>
#include <type_traits>
#include <vector>

class TBuffer;
Expand Down
1 change: 1 addition & 0 deletions hist/histv7/inc/ROOT/RVariableBinAxis.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <cassert>
#include <cstddef>
#include <cstdint>
#include <stdexcept>
#include <string>
#include <utility>
Expand Down
Loading