rootloader 0.4.2__tar.gz → 0.6.0__tar.gz

{rootloader-0.4.2 → rootloader-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: rootloader
-Version: 0.4.2
+Version: 0.6.0
 Summary: Read simple root files into memory
 Project-URL: Homepage, https://github.com/ucn-triumf/rootloader
 Project-URL: Bug Tracker, https://github.com/ucn-triumf/rootloader/issues

{rootloader-0.4.2 → rootloader-0.6.0}/docs/rootloader/attrdict.md

@@ -6,7 +6,7 @@
 
 - [attrdict](#attrdict)
   - [attrdict](#attrdict-1)
-    - [attrdict().copy](#attrdict()copy)
+    - [attrdict.copy](#attrdictcopy)
 
 ## attrdict
 
@@ -20,7 +20,7 @@ Provides common functions for dictionaries of data containers
 class attrdict(dict): ...
 ```
 
-### attrdict().copy
+### attrdict.copy
 
 [Show source in attrdict.py:38](../../rootloader/attrdict.py#L38)
 

{rootloader-0.4.2 → rootloader-0.6.0}/docs/rootloader/tdirectory.md

@@ -6,9 +6,9 @@
 
 - [tdirectory](#tdirectory)
   - [tdirectory](#tdirectory-1)
-    - [tdirectory().copy](#tdirectory()copy)
-    - [tdirectory().from_dataframe](#tdirectory()from_dataframe)
-    - [tdirectory().to_dataframe](#tdirectory()to_dataframe)
+    - [tdirectory.copy](#tdirectorycopy)
+    - [tdirectory.from_dataframe](#tdirectoryfrom_dataframe)
+    - [tdirectory.to_dataframe](#tdirectoryto_dataframe)
 
 ## tdirectory
 
@@ -25,17 +25,23 @@ key_filter (function handle): a function with the following signature:
     bool fn(str) -- takes as input a string and returns a bool
     indicating whether the object with the corresponding key should
     be read
+- `tree_filter` *dict* - {treename: (filter_string, [columns])}
+    - `treename` *str* - name of the tree to apply elements to
+    - `filter_string` *str|None* - if not none then pass this to [`RDataFrame.Filter`](https://root.cern/doc/master/classROOT_1_1RDF_1_1RInterface.html#ad6a94ba7e70fc8f6425a40a4057d40a0)
+    - `[columns]` *list|None* - list of column names to include in fetch, if None, get all
 
 #### Signature
 
 ```python
 class tdirectory(attrdict):
-    def __init__(self, directory, empty_ok=True, quiet=True, key_filter=None): ...
+    def __init__(
+        self, directory, empty_ok=True, quiet=True, key_filter=None, tree_filter=None
+    ): ...
 ```
 
-### tdirectory().copy
+### tdirectory.copy
 
-[Show source in tdirectory.py:108](../../rootloader/tdirectory.py#L108)
+[Show source in tdirectory.py:121](../../rootloader/tdirectory.py#L121)
 
 Make a copy of this object
 
@@ -45,9 +51,9 @@ Make a copy of this object
 def copy(self): ...
 ```
 
-### tdirectory().from_dataframe
+### tdirectory.from_dataframe
 
-[Show source in tdirectory.py:117](../../rootloader/tdirectory.py#L117)
+[Show source in tdirectory.py:130](../../rootloader/tdirectory.py#L130)
 
 Convert all elements contained in self to original objects
 
@@ -57,9 +63,9 @@ Convert all elements contained in self to original objects
 def from_dataframe(self): ...
 ```
 
-### tdirectory().to_dataframe
+### tdirectory.to_dataframe
 
-[Show source in tdirectory.py:128](../../rootloader/tdirectory.py#L128)
+[Show source in tdirectory.py:141](../../rootloader/tdirectory.py#L141)
 
 Convert all objects possible (th1, th2, and ttree) into pandas dataframes
 

{rootloader-0.4.2 → rootloader-0.6.0}/docs/rootloader/tfile.md

@@ -6,7 +6,7 @@
 
 - [tfile](#tfile)
   - [tfile](#tfile-1)
-    - [tfile().copy](#tfile()copy)
+    - [tfile.copy](#tfilecopy)
 
 ## tfile
 
@@ -24,19 +24,29 @@ key_filter (function handle): a function with the following signature:
         bool fn(str) -- takes as input a string and returns a bool
         indicating whether the object with the corresponding key should
         be read
+- `tree_filter` *dict* - {treename: (filter_string, [columns])}
+    - `treename` *str* - name of the tree to apply elements to
+    - `filter_string` *str|None* - if not none then pass this to [`RDataFrame.Filter`](https://root.cern/doc/master/classROOT_1_1RDF_1_1RInterface.html#ad6a94ba7e70fc8f6425a40a4057d40a0)
+    - `[columns]` *list|None* - list of column names to include in fetch, if None, get all
 
 #### Signature
 
 ```python
 class tfile(tdirectory):
     def __init__(
-        self, filename, as_dataframe=False, empty_ok=True, quiet=True, key_filter=None
+        self,
+        filename,
+        as_dataframe=False,
+        empty_ok=True,
+        quiet=True,
+        key_filter=None,
+        tree_filter=None,
     ): ...
 ```
 
-### tfile().copy
+### tfile.copy
 
-[Show source in tfile.py:48](../../rootloader/tfile.py#L48)
+[Show source in tfile.py:54](../../rootloader/tfile.py#L54)
 
 Make a copy of this object
 

{rootloader-0.4.2 → rootloader-0.6.0}/docs/rootloader/th1.md

@@ -6,9 +6,9 @@
 
 - [th1](#th1)
   - [th1](#th1-1)
-    - [th1().copy](#th1()copy)
-    - [th1().plot](#th1()plot)
-    - [th1().to_dataframe](#th1()to_dataframe)
+    - [th1.copy](#th1copy)
+    - [th1.plot](#th1plot)
+    - [th1.to_dataframe](#th1to_dataframe)
 
 ## th1
 
@@ -42,7 +42,7 @@ class th1(object):
     def __init__(self, hist=None): ...
 ```
 
-### th1().copy
+### th1.copy
 
 [Show source in th1.py:84](../../rootloader/th1.py#L84)
 
@@ -54,7 +54,7 @@ Produce a copy of this object
 def copy(self): ...
 ```
 
-### th1().plot
+### th1.plot
 
 [Show source in th1.py:94](../../rootloader/th1.py#L94)
 
@@ -72,7 +72,7 @@ Draw the histogram
 def plot(self, ax=None, data_only=False, **kwargs): ...
 ```
 
-### th1().to_dataframe
+### th1.to_dataframe
 
 [Show source in th1.py:122](../../rootloader/th1.py#L122)
 

{rootloader-0.4.2 → rootloader-0.6.0}/docs/rootloader/th2.md

@@ -6,9 +6,9 @@
 
 - [th2](#th2)
   - [th2](#th2-1)
-    - [th2().copy](#th2()copy)
-    - [th2().plot](#th2()plot)
-    - [th2().to_dataframe](#th2()to_dataframe)
+    - [th2.copy](#th2copy)
+    - [th2.plot](#th2plot)
+    - [th2.to_dataframe](#th2to_dataframe)
 
 ## th2
 
@@ -42,7 +42,7 @@ class th2(object):
     def __init__(self, hist=None): ...
 ```
 
-### th2().copy
+### th2.copy
 
 [Show source in th2.py:95](../../rootloader/th2.py#L95)
 
@@ -54,7 +54,7 @@ Produce a copy of this object
 def copy(self): ...
 ```
 
-### th2().plot
+### th2.plot
 
 [Show source in th2.py:105](../../rootloader/th2.py#L105)
 
@@ -73,7 +73,7 @@ Draw the histogram
 def plot(self, ax=None, flat=True, **kwargs): ...
 ```
 
-### th2().to_dataframe
+### th2.to_dataframe
 
 [Show source in th2.py:143](../../rootloader/th2.py#L143)
 

{rootloader-0.4.2 → rootloader-0.6.0}/docs/rootloader/tleaf.md

@@ -6,14 +6,14 @@
 
 - [tleaf](#tleaf)
   - [tleaf](#tleaf-1)
-    - [tleaf().branch](#tleaf()branch)
-    - [tleaf().copy](#tleaf()copy)
-    - [tleaf().fullname](#tleaf()fullname)
-    - [tleaf().get_entry](#tleaf()get_entry)
-    - [tleaf().leaftype](#tleaf()leaftype)
-    - [tleaf().len](#tleaf()len)
-    - [tleaf().name](#tleaf()name)
-    - [tleaf().value](#tleaf()value)
+    - [tleaf.branch](#tleafbranch)
+    - [tleaf.copy](#tleafcopy)
+    - [tleaf.fullname](#tleaffullname)
+    - [tleaf.get_entry](#tleafget_entry)
+    - [tleaf.leaftype](#tleafleaftype)
+    - [tleaf.len](#tleaflen)
+    - [tleaf.name](#tleafname)
+    - [tleaf.value](#tleafvalue)
 
 ## tleaf
 
@@ -32,7 +32,7 @@ class tleaf(object):
     def __init__(self, leaf): ...
 ```
 
-### tleaf().branch
+### tleaf.branch
 
 [Show source in tleaf.py:25](../../rootloader/tleaf.py#L25)
 
@@ -43,7 +43,7 @@ class tleaf(object):
 def branch(self): ...
 ```
 
-### tleaf().copy
+### tleaf.copy
 
 [Show source in tleaf.py:17](../../rootloader/tleaf.py#L17)
 
@@ -55,7 +55,7 @@ Make a copy of this object
 def copy(self): ...
 ```
 
-### tleaf().fullname
+### tleaf.fullname
 
 [Show source in tleaf.py:27](../../rootloader/tleaf.py#L27)
 
@@ -66,7 +66,7 @@ def copy(self): ...
 def fullname(self): ...
 ```
 
-### tleaf().get_entry
+### tleaf.get_entry
 
 [Show source in tleaf.py:21](../../rootloader/tleaf.py#L21)
 
@@ -76,7 +76,7 @@ def fullname(self): ...
 def get_entry(self, i): ...
 ```
 
-### tleaf().leaftype
+### tleaf.leaftype
 
 [Show source in tleaf.py:31](../../rootloader/tleaf.py#L31)
 
@@ -87,7 +87,7 @@ def get_entry(self, i): ...
 def leaftype(self): ...
 ```
 
-### tleaf().len
+### tleaf.len
 
 [Show source in tleaf.py:33](../../rootloader/tleaf.py#L33)
 
@@ -98,7 +98,7 @@ def leaftype(self): ...
 def len(self): ...
 ```
 
-### tleaf().name
+### tleaf.name
 
 [Show source in tleaf.py:29](../../rootloader/tleaf.py#L29)
 
@@ -109,7 +109,7 @@ def len(self): ...
 def name(self): ...
 ```
 
-### tleaf().value
+### tleaf.value
 
 [Show source in tleaf.py:35](../../rootloader/tleaf.py#L35)
 

{rootloader-0.4.2 → rootloader-0.6.0}/docs/rootloader/ttree.md

@@ -6,11 +6,11 @@
 
 - [ttree](#ttree)
   - [ttree](#ttree-1)
-    - [ttree().copy](#ttree()copy)
-    - [ttree().entries](#ttree()entries)
-    - [ttree().get_subtree](#ttree()get_subtree)
-    - [ttree().plot](#ttree()plot)
-    - [ttree().to_dataframe](#ttree()to_dataframe)
+    - [ttree.copy](#ttreecopy)
+    - [ttree.entries](#ttreeentries)
+    - [ttree.get_subtree](#ttreeget_subtree)
+    - [ttree.plot](#ttreeplot)
+    - [ttree.to_dataframe](#ttreeto_dataframe)
 
 ## ttree
 
@@ -21,17 +21,19 @@ Extract ROOT.TTree fully into memory
 #### Arguments
 
 - `tree` *ROOT.TTree|pd.DataFrame* - tree to load
+- `filter_string` *str|None* - if not none then pass this to [`RDataFrame.Filter`](https://root.cern/doc/master/classROOT_1_1RDF_1_1RInterface.html#ad6a94ba7e70fc8f6425a40a4057d40a0)
+- `columns` *list|None* - list of column names to include in fetch, if None, get all
 
 #### Signature
 
 ```python
 class ttree(attrdict):
-    def __init__(self, tree=None): ...
+    def __init__(self, tree=None, filter_str=None, columns=None): ...
 ```
 
-### ttree().copy
+### ttree.copy
 
-[Show source in ttree.py:144](../../rootloader/ttree.py#L144)
+[Show source in ttree.py:162](../../rootloader/ttree.py#L162)
 
 Produce a copy of this object
 
@@ -41,9 +43,9 @@ Produce a copy of this object
 def copy(self): ...
 ```
 
-### ttree().entries
+### ttree.entries
 
-[Show source in ttree.py:155](../../rootloader/ttree.py#L155)
+[Show source in ttree.py:173](../../rootloader/ttree.py#L173)
 
 #### Signature
 
@@ -52,15 +54,15 @@ def copy(self): ...
 def entries(self): ...
 ```
 
-### ttree().get_subtree
+### ttree.get_subtree
 
-[Show source in ttree.py:158](../../rootloader/ttree.py#L158)
+[Show source in ttree.py:176](../../rootloader/ttree.py#L176)
 
 Return a copy of self but only for a subset of entries
 
 #### Arguments
 
-- [ttree().entries](#ttreeentries) *list|np.array* - list of entries to get from tree
+- [ttree.entries](#ttreeentries) *list|np.array* - list of entries to get from tree
 
 #### Returns
 
@@ -72,9 +74,9 @@ Return a copy of self but only for a subset of entries
 def get_subtree(self, entries): ...
 ```
 
-### ttree().plot
+### ttree.plot
 
-[Show source in ttree.py:180](../../rootloader/ttree.py#L180)
+[Show source in ttree.py:198](../../rootloader/ttree.py#L198)
 
 Convert to dataframe and plot. Arguments passed to [pandas.DataFrame.plot](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.plot.html)
 
@@ -88,9 +90,9 @@ same as pandas.DataFrame.plot
 def plot(self, *args, **kwargs): ...
 ```
 
-### ttree().to_dataframe
+### ttree.to_dataframe
 
-[Show source in ttree.py:188](../../rootloader/ttree.py#L188)
+[Show source in ttree.py:206](../../rootloader/ttree.py#L206)
 
 Convert tree to pandas dataframe
 

rootloader-0.6.0/gen_documentation.bash

@@ -0,0 +1,25 @@
+#!/bin/bash
+# generate documentation with working links
+# Derek Fujimoto
+# Nov 2024
+
+# note: requires handsdown (https://github.com/vemel/handsdown)
+
+# generate the documentation
+# cd rootloader
+handsdown -o docs --theme readthedocs
+
+# fix the broken links
+cd docs/rootloader
+for file in *;
+do
+    if [ -f "$file" ];  then
+
+        # replace bad empty parentheses
+        sed -i 's/()././' $file
+
+        # repace broken table of contents links
+        name=$(basename $file .md)
+        sed -i "s/#${name}()/#${name}/" $file
+    fi
+done

{rootloader-0.4.2 → rootloader-0.6.0}/rootloader/tdirectory.py

@@ -15,19 +15,28 @@ class tdirectory(attrdict):
     """Contains root file data
 
     Args:
-            directory (ROOT.TDirectoryFile|ROOT.TFile): object to parse
-            empty_ok (bool): if true, save empty objects
-            quiet (bool): if true, don't print skipped statement if object empty
-            key_filter (function handle): a function with the following signature:
-                bool fn(str) -- takes as input a string and returns a bool
-                indicating whether the object with the corresponding key should
-                be read
+        directory (ROOT.TDirectoryFile|ROOT.TFile): object to parse
+        empty_ok (bool): if true, save empty objects
+        quiet (bool): if true, don't print skipped statement if object empty
+        key_filter (function handle): a function with the following signature:
+            bool fn(str) -- takes as input a string and returns a bool
+            indicating whether the object with the corresponding key should
+            be read
+        tree_filter (dict): {treename: (filter_string, [columns])}
+            treename (str): name of the tree to apply elements to
+            filter_string (str|None): if not none then pass this to [`RDataFrame.Filter`](https://root.cern/doc/master/classROOT_1_1RDF_1_1RInterface.html#ad6a94ba7e70fc8f6425a40a4057d40a0)
+            [columns] (list|None): list of column names to include in fetch, if None, get all
     """
 
-    def __init__(self, directory, empty_ok=True, quiet=True, key_filter=None):
+    def __init__(self, directory, empty_ok=True, quiet=True, key_filter=None,
+                 tree_filter=None):
 
+        # copy
         if directory is None: return
+
+        # defaults
         if key_filter is None: key_filter = lambda x: True
+        tree_filter = {} if tree_filter is None else tree_filter
 
         # get keys and read only those with highest cycle number
         keys = {}
@@ -55,7 +64,7 @@ class tdirectory(attrdict):
             # TTree
             if 'TTree' == classname:
                 if empty_ok or obj.GetEntries() > 0:
-                    self[name] = ttree(obj)
+                    self[name] = ttree(obj, *tree_filter.get(name, (None, None)))
                 elif not quiet:
                     tqdm.write(f'Skipped "{name}" due to lack of entries')
 

{rootloader-0.4.2 → rootloader-0.6.0}/rootloader/tfile.py

@@ -18,10 +18,14 @@ class tfile(tdirectory):
                 bool fn(str) -- takes as input a string and returns a bool
                 indicating whether the object with the corresponding key should
                 be read
+        tree_filter (dict): {treename: (filter_string, [columns])}
+            treename (str): name of the tree to apply elements to
+            filter_string (str|None): if not none then pass this to [`RDataFrame.Filter`](https://root.cern/doc/master/classROOT_1_1RDF_1_1RInterface.html#ad6a94ba7e70fc8f6425a40a4057d40a0)
+            [columns] (list|None): list of column names to include in fetch, if None, get all
     """
 
     def __init__(self, filename, as_dataframe=False, empty_ok=True, quiet=True,
-                 key_filter=None):
+                 key_filter=None, tree_filter=None):
 
         if filename is None: return
 
@@ -36,7 +40,9 @@ class tfile(tdirectory):
         super().__init__(fid,
                          empty_ok=empty_ok,
                          quiet=quiet,
-                         key_filter=key_filter)
+                         key_filter=key_filter,
+                         tree_filter=tree_filter,
+                         )
 
         # close the file
         fid.Close()

{rootloader-0.4.2 → rootloader-0.6.0}/rootloader/th1.py

@@ -114,8 +114,13 @@ class th1(object):
 
         # plot elements
         if not data_only:
-            ax.set_xlabel(self.xlabel)
-            ax.set_ylabel(self.ylabel)
+
+            if len(self.xlabel) > 15:   ax.set_xlabel(self.xlabel, fontsize='x-small')
+            else:                       ax.set_xlabel(self.xlabel)
+
+            if len(self.ylabel) > 15:   ax.set_ylabel(self.ylabel, fontsize='x-small')
+            else:                       ax.set_ylabel(self.ylabel)
+
             ax.set_title(self.title, fontsize='x-small')
             plt.tight_layout()
 
@@ -138,4 +143,7 @@ class th1(object):
         for key in keys:
             df.attrs[key] = getattr(self, key)
 
+        # special draw function
+        df.draw = lambda ax=None, data_only=False, **kwargs: th1(df).plot(ax, data_only, **kwargs)
+
         return df

{rootloader-0.4.2 → rootloader-0.6.0}/rootloader/th2.py

@@ -67,6 +67,9 @@ class th2(object):
         self.z = self.z.reshape(self.nbinsx, self.nbinsy)
         self.dz = self.dz.reshape(self.nbinsx, self.nbinsy)
 
+        self.z = self.z.transpose()
+        self.dz = self.dz.transpose()
+
     def __len__(self):
         return self.nbins
 
@@ -89,8 +92,8 @@ class th2(object):
         level = df.index.names.index(self.ylabel)
         self.y = df.index.get_level_values(level).unique().values
 
-        self.z = df[self.zlabel].values.reshape(self.nbinsy, self.nbinsx)
-        self.dz = df[self.zlabel + " error"].values.reshape(self.nbinsy, self.nbinsx)
+        self.z = df[self.zlabel].values.reshape(self.nbinsx, self.nbinsy)
+        self.dz = df[self.zlabel + " error"].values.reshape(self.nbinsx, self.nbinsy)
 
     def copy(self):
         """Produce a copy of this object"""
@@ -117,7 +120,8 @@ class th2(object):
         # draw flat
         if flat:
             if ax is None:
-                ax = plt.gcf().add_subplot()
+                plt.figure()
+                ax = plt.gca()
 
             # defaults
             if 'cmap' not in kwargs.keys(): kwargs['cmap'] = 'RdBu'
@@ -125,20 +129,32 @@ class th2(object):
             c = ax.pcolormesh(xx, yy, self.z, **kwargs)
             ax.axis([self.x.min(), self.x.max(), self.y.min(), self.y.max()])
             plt.gcf().colorbar(c, ax=ax)
-            ax.set_xlabel(self.xlabel)
-            ax.set_ylabel(self.ylabel)
-            ax.set_title(self.title)
+
+            if len(self.xlabel) > 15:   ax.set_xlabel(self.xlabel, fontsize='x-small')
+            else:                       ax.set_xlabel(self.xlabel)
+
+            if len(self.ylabel) > 15:   ax.set_ylabel(self.ylabel, fontsize='x-small')
+            else:                       ax.set_ylabel(self.ylabel)
+
+            ax.set_title(self.title, fontsize='x-small')
 
         # draw 3d
         else:
 
             if ax is None:
-                ax = plt.gcf().add_subplot(projection='3d')
+                plt.figure()
+                ax = plt.gca().add_subplot(projection='3d')
 
             ax.plot_surface(xx, yy, self.z, **kwargs)
-            ax.set_xlabel(self.xlabel)
-            ax.set_ylabel(self.ylabel)
-            ax.set_zlabel(self.zlabel)
+
+            if len(self.xlabel) > 15:   ax.set_xlabel(self.xlabel, fontsize='x-small')
+            else:                       ax.set_xlabel(self.xlabel)
+
+            if len(self.ylabel) > 15:   ax.set_ylabel(self.ylabel, fontsize='x-small')
+            else:                       ax.set_ylabel(self.ylabel)
+
+            if len(self.zlabel) > 15:   ax.set_zlabel(self.zlabel, fontsize='x-small')
+            else:                       ax.set_zlabel(self.zlabel)
 
     def to_dataframe(self):
         """Convert tree to pandas dataframe
@@ -149,8 +165,8 @@ class th2(object):
         xx, yy = np.meshgrid(self.x, self.y)
         idx = pd.MultiIndex.from_arrays((xx.flatten(), yy.flatten()),
                                         names=(self.xlabel, self.ylabel))
-        df = pd.DataFrame({self.zlabel: self.z.flatten(),
-                           f'{self.zlabel} error': self.dz.flatten()},
+        df = pd.DataFrame({self.zlabel: self.z.transpose().flatten(),
+                           f'{self.zlabel} error': self.dz.transpose().flatten()},
                            index=idx)
 
         # reconvert instructions
@@ -160,4 +176,7 @@ class th2(object):
         for key in keys:
             df.attrs[key] = getattr(self, key)
 
+        # special draw function
+        df.draw = lambda ax=None, flat=True, **kwargs: th2(df).plot(ax, flat, **kwargs)
+
         return df

{rootloader-0.4.2 → rootloader-0.6.0}/rootloader/ttree.py

@@ -14,13 +14,19 @@ class ttree(attrdict):
 
     Args:
         tree (ROOT.TTree|pd.DataFrame): tree to load
+        filter_string (str|None): if not none then pass this to [`RDataFrame.Filter`](https://root.cern/doc/master/classROOT_1_1RDF_1_1RInterface.html#ad6a94ba7e70fc8f6425a40a4057d40a0)
+        columns (list|None): list of column names to include in fetch, if None, get all
     """
 
-    def __init__(self, tree=None):
+    def __init__(self, tree=None, filter_str=None, columns=None):
 
         if tree is None:
             return
 
+        # check input
+        if isinstance(columns, str):
+            columns = [columns]
+
         # extract from dataframe
         if type(tree) is pd.DataFrame:
             self._from_dataframe(tree)
@@ -40,12 +46,15 @@ class ttree(attrdict):
 
         # extraction of data: fast
         try:
-            data = self._extract_event_fast(tree)
+            if filter_str is None:
+                data = self._extract_event_fast(tree, columns)
+            else:
+                data = self._extract_event_fast_filtered(tree, filter_str, columns)
 
         # if there is a problem, revert to slower, but more robust version
         except Exception:
 
-            tqdm.write("Reverting to robust ttree reader")
+            tqdm.write(f"{tree.GetName()}: Reverting to robust ttree reader")
             entries = tree.GetEntries()
             if entries == 0: return
 
@@ -96,9 +105,15 @@ class ttree(attrdict):
         else:
             return self.__class__.__name__ + "()"
 
-    def _extract_event_fast(self, tree):
+    def _extract_event_fast(self, tree, columns):
+        # fast version of getting events using RDataFrame
+        data = ROOT.RDataFrame(tree).AsNumpy(columns=columns)
+        for key, value in data.items():
+            setattr(self, key, pd.Series(value))
+
+    def _extract_event_fast_filtered(self, tree, filter_str, columns):
         # fast version of getting events using RDataFrame
-        data = ROOT.RDataFrame(tree).AsNumpy()
+        data = ROOT.RDataFrame(tree).Filter(filter_str).AsNumpy(columns=columns)
         for key, value in data.items():
             setattr(self, key, pd.Series(value))
 

rootloader-0.6.0/rootloader/version.py

@@ -0,0 +1 @@
+__version__ = '0.6.0'

rootloader-0.4.2/rootloader/version.py

@@ -1 +0,0 @@
-__version__ = '0.4.2'