Merge pull request #54 from CoffeaTeam/topic_uproot_methods_order

Update to uproot-methods 0.4.3
scikit-hep · Feb 22, 2019 · 3a97cdd · 3a97cdd
2 parents b6ee9db + 735d88e
commit 3a97cdd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/fnal_column_analysis_tools/lookup_tools/dense_lookup.py b/fnal_column_analysis_tools/lookup_tools/dense_lookup.py
@@ -35,8 +35,7 @@ def _evaluate(self,*args):
             indices.append(np.clip(np.searchsorted(self._axes, args[0], side='right')-1,0,self._values.shape[0]-1))
         else:
             for dim in range(self._dimension):
-                indices.append(np.clip(np.searchsorted(self._axes[dim], args[dim], side='right')-1,0,self._values.shape[len(self._axes)-dim-1]-1))
-        indices.reverse()
+                indices.append(np.clip(np.searchsorted(self._axes[dim], args[dim], side='right')-1,0,self._values.shape[dim]-1))        
         return self._values[tuple(indices)]
 
     def __repr__(self):

diff --git a/fnal_column_analysis_tools/lookup_tools/json_converters.py b/fnal_column_analysis_tools/lookup_tools/json_converters.py
@@ -74,5 +74,5 @@ def convert_histo_json_file(filename):
         for axis in names_and_orders[name]:
             bins_in_order.append(axes[axis])
         for vname in valsdict:
-            wrapped_up[(name+'_'+vname,'dense_lookup')] = (valsdict[vname].T,tuple(bins_in_order))
+            wrapped_up[(name+'_'+vname,'dense_lookup')] = (valsdict[vname],tuple(bins_in_order))
     return wrapped_up
diff --git a/fnal_column_analysis_tools/lookup_tools/root_converters.py b/fnal_column_analysis_tools/lookup_tools/root_converters.py
@@ -5,7 +5,7 @@
 cycle = re.compile(br";\d+")
 killcycle = lambda s: cycle.sub(b"", s)
 
-histTypes = [b'TH1D', b'TH1F', b'TH2D', b'TH2F']
+histTypes = [b'TH1D', b'TH1F', b'TH2D', b'TH2F',b'TH3D', b'TH3F']
 graphTypes = [b'TGraphAsymmErrors', b'TGraph2D']
 
 

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

diff --git a/setup.py b/setup.py
@@ -69,13 +69,13 @@ def get_description():
       license = "BSD 3-clause",
       test_suite = "tests",
       install_requires = [
-          "awkward>=0.8.3",
+          "awkward>=0.8.4",
           "matplotlib<3" if six.PY2 else "matplotlib>=3",
           "numba>=0.42.0",
           "numpy>=1.13.1",
           "scipy>=1.1.0",
-          "uproot-methods>=0.4.2",
-          "uproot>=3.4.4",
+          "uproot-methods>=0.4.3",
+          "uproot>=3.4.5",
       ],
       setup_requires = ["pytest-runner"],
       tests_require = ["pytest"],