rootloader 0.4.1__tar.gz → 0.4.2__tar.gz

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

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

@@ -39,17 +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()}',
+        for name, cycle in tqdm(keys.values(), desc=f'Loading {directory.GetName()}',
                               leave=False, total=len(keys)):
-            obj = directory.Get(name)
+            obj = directory.Get(f'{name};{cycle}')
             classname = obj.ClassName()
 
             # TTree

rootloader-0.4.2/rootloader/version.py

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

rootloader-0.4.1/rootloader/version.py

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