Catch up to the latest histogram protocol. (#219)

scikit-hep · Dec 5, 2020 · 63c4cb5 · 63c4cb5
1 parent 2aef482
commit 63c4cb5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 28 deletions.
diff --git a/uproot/behaviors/TH1.py b/uproot/behaviors/TH1.py
@@ -100,12 +100,12 @@ def weighted(self):
         raise NotImplementedError(repr(self))
 
     @property
-    def interpretation(self):
+    def kind(self):
         """
-        How to interpret ``values``: ``"count"`` for histograms and ``"mean"``
-        for profiles.
+        The meaning of this object: ``"COUNT"`` for true histograms (TH*) and
+        ``"MEAN"`` for profile plots (TProfile*).
         """
-        raise NotImplementedError(repr(self))
+        raise "COUNT"
 
     def values(self, flow=False):
         """
@@ -216,10 +216,6 @@ def weighted(self):
         sumw2 = self.member("fSumw2", none_if_missing=True)
         return sumw2 is not None and len(sumw2) == self.member("fNcells")
 
-    @property
-    def interpretation(self):
-        return "count"
-
     def values(self, flow=False):
         if hasattr(self, "_values"):
             values = self._values

diff --git a/uproot/behaviors/TH2.py b/uproot/behaviors/TH2.py
@@ -38,10 +38,6 @@ def weighted(self):
         sumw2 = self.member("fSumw2", none_if_missing=True)
         return sumw2 is not None and len(sumw2) == self.member("fNcells")
 
-    @property
-    def interpretation(self):
-        return "count"
-
     def values(self, flow=False):
         if hasattr(self, "_values"):
             values = self._values

diff --git a/uproot/behaviors/TH3.py b/uproot/behaviors/TH3.py
@@ -42,10 +42,6 @@ def weighted(self):
         sumw2 = self.member("fSumw2", none_if_missing=True)
         return sumw2 is not None and len(sumw2) == self.member("fNcells")
 
-    @property
-    def interpretation(self):
-        return "count"
-
     def values(self, flow=False):
         if hasattr(self, "_values"):
             values = self._values

diff --git a/uproot/behaviors/TProfile.py b/uproot/behaviors/TProfile.py
@@ -136,6 +136,10 @@ class Profile(uproot.behaviors.TH1.Histogram):
     Abstract class for profile plots.
     """
 
+    @property
+    def kind(self):
+        return "MEAN"
+
     def counts(self, flow=False):
         """
         Args:
@@ -236,10 +240,6 @@ def weighted(self):
         fBinSumw2 = self.member("fBinSumw2", none_if_missing=True)
         return fBinSumw2 is None or len(fBinSumw2) != len(self.member("fNcells"))
 
-    @property
-    def interpretation(self):
-        return "mean"
-
     def counts(self, flow=True):
         out = _effective_counts_1d(
             self.member("fBinEntries"),

diff --git a/uproot/behaviors/TProfile2D.py b/uproot/behaviors/TProfile2D.py
@@ -36,10 +36,6 @@ def weighted(self):
         fBinSumw2 = self.member("fBinSumw2", none_if_missing=True)
         return fBinSumw2 is None or len(fBinSumw2) != len(self.member("fNcells"))
 
-    @property
-    def interpretation(self):
-        return "mean"
-
     def counts(self, flow=False):
         fBinEntries = numpy.asarray(self.member("fBinEntries"))
         out = uproot.behaviors.TProfile._effective_counts_1d(

diff --git a/uproot/behaviors/TProfile3D.py b/uproot/behaviors/TProfile3D.py
@@ -40,10 +40,6 @@ def weighted(self):
         fBinSumw2 = self.member("fBinSumw2", none_if_missing=True)
         return fBinSumw2 is None or len(fBinSumw2) != len(self.member("fNcells"))
 
-    @property
-    def interpretation(self):
-        return "mean"
-
     def counts(self, flow=False):
         fBinEntries = numpy.asarray(self.member("fBinEntries"))
         out = uproot.behaviors.TProfile._effective_counts_1d(