From 4c95e35e7c9089daadf4942053febff8944b6fbc Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 24 Apr 2025 09:39:41 +0200 Subject: [PATCH 1/7] [doNOTmerge] Investigate if adding empty functions changes file size See https://github.com/root-project/root/pull/18459#discussion_r2056563805 --- hist/hist/inc/TH1.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h index afdddd087e055..b57229c63bdb0 100644 --- a/hist/hist/inc/TH1.h +++ b/hist/hist/inc/TH1.h @@ -97,7 +97,7 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { friend class TH1Merger; protected: - Int_t fNcells; ///< Number of bins(1D), cells (2D) +U/Overflows + Int_t fNcells; ///< Number of bins (1D) / total of cells (2D) / voxels (3D) +Under/Overflows TAxis fXaxis; ///< X axis descriptor TAxis fYaxis; ///< Y axis descriptor TAxis fZaxis; ///< Z axis descriptor @@ -209,6 +209,8 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { virtual void AddBinContent(Int_t bin, Double_t w) = 0; static void AddDirectory(Bool_t add=kTRUE); static Bool_t AddDirectoryStatus(); + virtual void AutoZoom() {}; // *MENU* + virtual void UnZoom() {}; // *MENU* void Browse(TBrowser *b) override; virtual Bool_t CanExtendAllAxes() const; virtual Double_t Chi2Test(const TH1* h2, Option_t *option = "UU", Double_t *res = nullptr) const; @@ -323,6 +325,7 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { virtual Int_t GetQuantiles(Int_t n, Double_t *xp, const Double_t *p = nullptr); virtual Double_t GetRandom(TRandom * rng = nullptr) const; + void GetRangeOfFilledWeights(const Int_t, Int_t, Int_t, bool) const {}; virtual void GetStats(Double_t *stats) const; virtual Double_t GetStdDev(Int_t axis=1) const; virtual Double_t GetStdDevError(Int_t axis=1) const; From 29823e9ab9c55c140909ed95fdba85d7e4952565 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 24 Apr 2025 10:24:38 +0200 Subject: [PATCH 2/7] [doNOTmerge] investigate if file size increases with number of functions see https://github.com/root-project/root/pull/18459#discussion_r2056563805 --- hist/hist/inc/TH1.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h index b57229c63bdb0..1fe96d4da695c 100644 --- a/hist/hist/inc/TH1.h +++ b/hist/hist/inc/TH1.h @@ -210,6 +210,21 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { static void AddDirectory(Bool_t add=kTRUE); static Bool_t AddDirectoryStatus(); virtual void AutoZoom() {}; // *MENU* + virtual void AutoZoom1() {}; // *MENU* + virtual void AutoZoom2() {}; // *MENU* + virtual void AutoZoom3() {}; // *MENU* + virtual void AutoZoom4() {}; // *MENU* + virtual void AutoZoom5() {}; // *MENU* + virtual void AutoZoom6() {}; // *MENU* + virtual void AutoZoom7() {}; // *MENU* + virtual void AutoZoom8() {}; // *MENU* + virtual void AutoZoom9() {}; // *MENU* + virtual void AutoZoom10() {}; // *MENU* + virtual void AutoZoom11() {}; // *MENU* + virtual void AutoZoom12() {}; // *MENU* + virtual void AutoZoom13() {}; // *MENU* + virtual void AutoZoom14() {}; // *MENU* + virtual void AutoZoom15() {}; // *MENU* virtual void UnZoom() {}; // *MENU* void Browse(TBrowser *b) override; virtual Bool_t CanExtendAllAxes() const; From 7d4f061fd35ff5ba8739039e0ee8bd7e864d66d9 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 24 Apr 2025 11:26:06 +0200 Subject: [PATCH 3/7] [doNOTmerge] removing extra functions --- hist/hist/inc/TH1.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h index 1fe96d4da695c..f41f6cbdba7d4 100644 --- a/hist/hist/inc/TH1.h +++ b/hist/hist/inc/TH1.h @@ -209,23 +209,6 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { virtual void AddBinContent(Int_t bin, Double_t w) = 0; static void AddDirectory(Bool_t add=kTRUE); static Bool_t AddDirectoryStatus(); - virtual void AutoZoom() {}; // *MENU* - virtual void AutoZoom1() {}; // *MENU* - virtual void AutoZoom2() {}; // *MENU* - virtual void AutoZoom3() {}; // *MENU* - virtual void AutoZoom4() {}; // *MENU* - virtual void AutoZoom5() {}; // *MENU* - virtual void AutoZoom6() {}; // *MENU* - virtual void AutoZoom7() {}; // *MENU* - virtual void AutoZoom8() {}; // *MENU* - virtual void AutoZoom9() {}; // *MENU* - virtual void AutoZoom10() {}; // *MENU* - virtual void AutoZoom11() {}; // *MENU* - virtual void AutoZoom12() {}; // *MENU* - virtual void AutoZoom13() {}; // *MENU* - virtual void AutoZoom14() {}; // *MENU* - virtual void AutoZoom15() {}; // *MENU* - virtual void UnZoom() {}; // *MENU* void Browse(TBrowser *b) override; virtual Bool_t CanExtendAllAxes() const; virtual Double_t Chi2Test(const TH1* h2, Option_t *option = "UU", Double_t *res = nullptr) const; From 9da5243882520dfe68171867fde61a537ab54bc7 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 24 Apr 2025 11:26:48 +0200 Subject: [PATCH 4/7] revert comment change --- hist/hist/inc/TH1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h index f41f6cbdba7d4..b5498e76b0b6e 100644 --- a/hist/hist/inc/TH1.h +++ b/hist/hist/inc/TH1.h @@ -97,7 +97,7 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { friend class TH1Merger; protected: - Int_t fNcells; ///< Number of bins (1D) / total of cells (2D) / voxels (3D) +Under/Overflows + Int_t fNcells; ///< Number of bins(1D), cells (2D) +U/Overflows TAxis fXaxis; ///< X axis descriptor TAxis fYaxis; ///< Y axis descriptor TAxis fZaxis; ///< Z axis descriptor From f77a807e28d4c6939916b39a4929015b555f1258 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 24 Apr 2025 12:27:47 +0200 Subject: [PATCH 5/7] Update hist/hist/inc/TH1.h --- hist/hist/inc/TH1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h index b5498e76b0b6e..865e715c08a85 100644 --- a/hist/hist/inc/TH1.h +++ b/hist/hist/inc/TH1.h @@ -323,7 +323,7 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { virtual Int_t GetQuantiles(Int_t n, Double_t *xp, const Double_t *p = nullptr); virtual Double_t GetRandom(TRandom * rng = nullptr) const; - void GetRangeOfFilledWeights(const Int_t, Int_t, Int_t, bool) const {}; + void GetRangeOfFilledWeights(Int_t, Int_t, Int_t, bool) const {}; virtual void GetStats(Double_t *stats) const; virtual Double_t GetStdDev(Int_t axis=1) const; virtual Double_t GetStdDevError(Int_t axis=1) const; From 27ae4384d7753a33a2807aa86feb301e81ce1344 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 24 Apr 2025 13:34:03 +0200 Subject: [PATCH 6/7] Update TH1.h --- hist/hist/inc/TH1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h index 865e715c08a85..b5498e76b0b6e 100644 --- a/hist/hist/inc/TH1.h +++ b/hist/hist/inc/TH1.h @@ -323,7 +323,7 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { virtual Int_t GetQuantiles(Int_t n, Double_t *xp, const Double_t *p = nullptr); virtual Double_t GetRandom(TRandom * rng = nullptr) const; - void GetRangeOfFilledWeights(Int_t, Int_t, Int_t, bool) const {}; + void GetRangeOfFilledWeights(const Int_t, Int_t, Int_t, bool) const {}; virtual void GetStats(Double_t *stats) const; virtual Double_t GetStdDev(Int_t axis=1) const; virtual Double_t GetStdDevError(Int_t axis=1) const; From 4554210bfdee243f9900622fdb15acd375fd80ea Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 24 Apr 2025 14:36:08 +0200 Subject: [PATCH 7/7] comment --- hist/hist/inc/TH1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h index b5498e76b0b6e..f41f6cbdba7d4 100644 --- a/hist/hist/inc/TH1.h +++ b/hist/hist/inc/TH1.h @@ -97,7 +97,7 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker { friend class TH1Merger; protected: - Int_t fNcells; ///< Number of bins(1D), cells (2D) +U/Overflows + Int_t fNcells; ///< Number of bins (1D) / total of cells (2D) / voxels (3D) +Under/Overflows TAxis fXaxis; ///< X axis descriptor TAxis fYaxis; ///< Y axis descriptor TAxis fZaxis; ///< Z axis descriptor