fixes #23: named constants are recognized as constants only if not sp…

…ecified in fill()
scikit-hep · Jun 18, 2018 · 0067ae6 · 0067ae6
1 parent 3b21444
commit 0067ae6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/histbook/hist.py b/histbook/hist.py
@@ -107,6 +107,8 @@ def recurse(node):
     def _fill(self, arrays):
         self.fields  # for the side-effect of creating self._instructions
 
+        maybeconstants = {"pi": numpy.pi, "Pi": numpy.pi, "e": numpy.e, "E": numpy.e, "inf": numpy.inf, "Inf": numpy.inf, "infinity": numpy.inf, "Infinity": numpy.inf, "nan": numpy.nan, "NaN": numpy.nan, "Nan": numpy.nan}
+
         length = None
         firstinstruction = None
         firstarray = None
@@ -115,7 +117,10 @@ def _fill(self, arrays):
                 try:
                     array = arrays[instruction.extern.value]
                 except KeyError:
-                    raise ValueError("required field {0} not found in fill arguments".format(repr(str(instruction.extern))))
+                    if instruction.extern.value in maybeconstants:
+                        continue
+                    else:
+                        raise ValueError("required field {0} not found in fill arguments".format(repr(str(instruction.extern))))
 
                 if not isinstance(array, numpy.ndarray):
                     array = numpy.array(array)
@@ -139,7 +144,10 @@ def _fill(self, arrays):
                     try:
                         array = arrays[instruction.extern.value]
                     except KeyError:
-                        raise ValueError("required field {0} not found in fill arguments".format(repr(str(instruction.extern))))
+                        if instruction.extern.value in maybeconstants:
+                            array = numpy.full(length, maybeconstants[instruction.extern.value])
+                        else:
+                            raise ValueError("required field {0} not found in fill arguments".format(repr(str(instruction.extern))))
 
                 if not isinstance(array, numpy.ndarray):
                     array = numpy.array(array)