Merge pull request #204 from ndawe/master

[MRG] array2hist: return the hist to allow chaining and list comprehensions

Author: ndawe

root_numpy/_hist.py

@@ -219,6 +219,11 @@ def array2hist(array, hist):
     hist : ROOT TH1, TH2, or TH3
         A ROOT histogram.
 
+    Returns
+    -------
+    hist : ROOT TH1, TH2, or TH3
+        The ROOT histogram with bin contents set from the array.
+
     Raises
     ------
     TypeError
@@ -258,7 +263,7 @@ def array2hist(array, hist):
            [2, 0, 5, 6, 8],
            [0, 0, 6, 5, 2],
            [2, 2, 1, 5, 4]])
-    >>> array2hist(array, hist)
+    >>> _ = array2hist(array, hist)
     >>> # dtype matches histogram type (D, F, I, S, C)
     >>> hist2array(hist)
     array([[ 9.,  7.,  6.],
@@ -347,3 +352,4 @@ def array2hist(array, hist):
         ROOT.AsCObject(hist), np.ravel(np.transpose(_array)))
     # Set the number of entries to the number of array elements
     hist.SetEntries(_array.size)
+    return hist

root_numpy/info.py

@@ -6,5 +6,5 @@
 |_|  \___/ \___/ \__|___|_| |_|\__,_|_| |_| |_| .__/ \__, |  {0}
                    |_____|                    |_|    |___/
 """
-__version__ = '4.2.0.dev0'
+__version__ = '4.2.1.dev0'
 __doc__ = __doc__.format(__version__)  # pylint:disable=redefined-builtin