rootloader 0.4.0__tar.gz → 0.4.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rootloader
-Version: 0.4.0
+Version: 0.4.2
 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.0 → rootloader-0.4.2}/rootloader/tdirectory.py

@@ -39,16 +39,17 @@ class tdirectory(attrdict):
 
                 # keep key if not yet in dict
                 if name not in keys.keys():
-                    keys[name] = key
+                    keys[name] = (name, key.GetCycle())
                 else:
 
                     # keep key with largest cycle number
-                    if key.GetCycle() > keys[name].GetCycle():
-                        keys[name] = key
+                    if key.GetCycle() > keys[name][1]:
+                        keys[name] = (name, key.GetCycle())
 
         # read trees and histograms from data file
-        for name, key in tqdm(keys.items(), desc=f'Loading {directory.GetName()}', leave=False):
-            obj = directory.Get(name)
+        for name, cycle in tqdm(keys.values(), desc=f'Loading {directory.GetName()}',
+                              leave=False, total=len(keys)):
+            obj = directory.Get(f'{name};{cycle}')
             classname = obj.ClassName()
 
             # TTree
@@ -84,6 +85,9 @@ class tdirectory(attrdict):
         if klist:
             klist.sort()
 
+            # drop hidden variables
+            klist = [k for k in klist if k[0] != '_']
+
             # get number of columns based on terminal size
             maxsize = max((len(k) for k in klist)) + 2
             terminal_width = os.get_terminal_size().columns - 4 # indent by 4 spaces below
@@ -128,7 +132,8 @@ class tdirectory(attrdict):
     def to_dataframe(self):
         """Convert all objects possible (th1, th2, and ttree) into pandas dataframes"""
         for k in self.keys():
-            try:
-                self[k] = self[k].to_dataframe()
-            except AttributeError:
-                pass
+            if type(self[k]) is not pd.DataFrame:
+                try:
+                    self[k] = self[k].to_dataframe()
+                except AttributeError:
+                    pass

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

@@ -67,6 +67,9 @@ class ttree(attrdict):
     def __dir__(self):
         return sorted(self.keys())
 
+    def __len__(self):
+        return self.entries
+
     def __repr__(self):
         klist = list(self.keys())
         if klist:

rootloader-0.4.2/rootloader/version.py

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

rootloader-0.4.0/rootloader/version.py

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