fixes #2: numbers NameError and proper handling of weights scalar-to-…

…array broadcasting
scikit-hep · Sep 20, 2018 · 4091e51 · 4091e51
1 parent 2378068
commit 4091e51
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/uproot_methods/classes/TH1.py b/uproot_methods/classes/TH1.py
@@ -28,6 +28,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import numbers
 import sys
 
 import numpy
@@ -183,7 +184,7 @@ def fillallw(self, data, weights):
             data = numpy.array(data)
 
         if isinstance(weights, numbers.Real):
-            weights = numpy.empty_like(data)
+            weights = numpy.full(data.shape, weights)
 
         freq, edges = numpy.histogram(data, bins=numbins, range=(low, high), weights=weights, density=False)
         for i, x in enumerate(freq):

diff --git a/uproot_methods/classes/TH2.py b/uproot_methods/classes/TH2.py
@@ -28,6 +28,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import numbers
 import sys
 
 import numpy
@@ -236,9 +237,7 @@ def fillallw(self, datax, datay, weights):
             datay = numpy.array(datay)
 
         if isinstance(weights, numbers.Real):
-            tmp_weight = weights
-            weights = numpy.empty_like(datax)
-            weights.fill(tmp_weight)            # assign all elements of the array to the initial value
+            weights = numpy.full(datax.shape, weights)
 
         freq, xedges, yedges = numpy.histogram2d(datax,
                                                  datay,

diff --git a/uproot_methods/version.py b/uproot_methods/version.py
@@ -30,7 +30,7 @@
 
 import re
 
-__version__ = "0.0.8"
+__version__ = "0.0.9"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))