rootloader 1.2.6__tar.gz → 1.3.0__tar.gz

{rootloader-1.2.6 → rootloader-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rootloader
-Version: 1.2.6
+Version: 1.3.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-1.2.6 → rootloader-1.3.0}/rootloader/ttree.py

@@ -361,6 +361,17 @@ class ttree(object):
             new.set_filter(expression, inplace=True)
             return new
 
+    def to_array(self):
+        """Return numpy array of the data"""
+        df = self.to_dict()
+        output = np.stack([df[k] for k in df.keys()])
+
+        # single array output for one column
+        if output.shape[0] == 1:
+            return output[0]
+        else:
+            return output
+
     def to_dataframe(self):
         """Return pandas dataframe of the data"""
 
@@ -382,12 +393,16 @@ class ttree(object):
         df = pd.DataFrame(df)
 
         # set index
-        if self._index is not None and len(df.columns) > 1:
+        if self._index is not None:
             df.set_index(self._index, inplace=True)
 
         # convert to series?
         if len(df.columns) == 1:
             return df[df.columns[0]]
+        
+        # index only dataframe
+        if len(df.columns) == 0:
+            df[self._index] = df.index
 
         return df
 
@@ -420,7 +435,10 @@ class ttree(object):
     @property
     def size(self):
         return self._rdf.Count().GetValue()
-
+    @property
+    def values(self):
+        return self.to_array()
+    
     # STATS ================================
     def _getstat(self, fnname):
 

rootloader-1.3.0/rootloader/version.py

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

rootloader-1.2.6/rootloader/version.py

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