fixing uproot compatibility issues

mattiasoldani · Jan 12, 2021 · 093d173 · 093d173
1 parent 2e35baa
commit 093d173
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "2021.1.2"
+version = "2021.1.3"
 
 setup(
     author="Mattia Soldani",
@@ -18,7 +18,7 @@
         "numpy",
         "pandas",
         "tqdm",
-        "uproot>=3.0,<4.0",
+        "uproot>=4.0",
     ],
     license="MIT",
     classifiers=[

diff --git a/succolib/io/root.py b/succolib/io/root.py
@@ -33,7 +33,7 @@ def rootToDfMulti(
             print("(%d/%d) %s -- descaling fraction: %14.12f" % (i + 1, len(fileIndex), iIndex, descFrac[iIndex]))
         for iName in tqdm((names)) if (bVerbose & bProgress) else names:  # for each value of iIndex, look for all the corresponding files
             tree = uproot.open(iName)[treeName]
-            dfTemp0 = tree.pandas.df()
+            dfTemp0 = tree.arrays(library="pd")
             dfTemp = dfTemp.append(dfTemp0[dfTemp0.index % int(1 / descFrac[iIndex]) == 0], ignore_index=True, sort=False)
 
         # data reshaping: removing the square brackets in the names & remapping all the names according to treeMap