addresses issue #168: provide a way to skip speedbump bytes

tests/test_issues.py

@@ -173,3 +173,11 @@ def test_geant4(self):
         assert [len(x) for x in f["HitStrips"].arrays().values()] == [4808, 4808, 4808]
         assert sum(f["edep_inner"].values), 1547 == 0
         assert sum(sum(x) for x in f["recon_orig"].values), 141 == 0
+
+    ### file is too big to include
+    # def test_issue168(self):
+    #     t = uproot.open("tests/samples/issue168.root")["Events"]
+    #     a1 = t["MRawEvtData.fHiGainFadcSamples"].array(t["MRawEvtData.fHiGainFadcSamples"].interpretation.speedbump(False), entrystop=4)
+    #     assert a1[0]._fArray.shape == (108400,)
+    #     a2 = t["MRawEvtData.fHiGainPixId"].array(t["MRawEvtData.fHiGainPixId"].interpretation.speedbump(False))
+    #     assert a2[0]._fArray.shape == (1084,)

uproot/interp/auto.py

@@ -28,6 +28,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import copy
 import re
 import ast
 from functools import reduce
@@ -114,18 +115,24 @@ def _leaf2dtype(leaf):
     else:
         raise _NotNumerical
 
-def _obj_or_genobj(streamerClass, branch, isjagged, cntvers=False, tobject=True):
+def _obj_or_genobj(streamerClass, branch, isjagged, cntvers=False, tobject=True, speedbump=True):
     if len(branch._fBranches) != 0:
         return None
 
     try:
         recarray = streamerClass._recarray_dtype(cntvers=cntvers, tobject=tobject)
 
     except (AttributeError, ValueError):
+        if not speedbump:
+            context = copy.copy(branch._context)
+            context.speedbump = False
+        else:
+            context = branch._context
+
         if isjagged:
-            return asgenobj(SimpleArray(streamerClass), branch._context, 0)
+            return asgenobj(SimpleArray(streamerClass), context, 0)
         else:
-            return asgenobj(streamerClass, branch._context, 0)
+            return asgenobj(streamerClass, context, 0)
 
     else:
         if streamerClass._methods is None:
@@ -142,7 +149,7 @@ def _obj_or_genobj(streamerClass, branch, isjagged, cntvers=False, tobject=True)
                 else:
                     return asobj(astable(asdtype(recarray)), streamerClass._methods)
 
-def interpret(branch, swapbytes=True, cntvers=False, tobject=True):
+def interpret(branch, swapbytes=True, cntvers=False, tobject=True, speedbump=True):
     dims, isjagged = (), False
     if len(branch._fLeaves) == 1:
         m = interpret._titlehasdims.match(branch._fLeaves[0]._fTitle)
@@ -163,7 +170,7 @@ def interpret(branch, swapbytes=True, cntvers=False, tobject=True):
                     obj = obj[:-1]
                 obj = uproot.rootio._safename(obj)
                 if obj in branch._context.classes:
-                    return _obj_or_genobj(branch._context.classes.get(obj), branch, isjagged, cntvers=cntvers, tobject=tobject)
+                    return _obj_or_genobj(branch._context.classes.get(obj), branch, isjagged, cntvers=cntvers, tobject=tobject, speedbump=speedbump)
 
             if branch._fLeaves[0].__class__.__name__ == "TLeafElement" and branch._fLeaves[0]._fType == uproot.const.kDouble32:
                 def transform(node, tofloat=True):
@@ -238,14 +245,14 @@ def transform(node, tofloat=True):
                 if obj == "string":
                     return asgenobj(STLString(), branch._context, 0)
                 elif obj in branch._context.classes:
-                    return _obj_or_genobj(branch._context.classes.get(obj), branch, isjagged, cntvers=cntvers, tobject=tobject)
+                    return _obj_or_genobj(branch._context.classes.get(obj), branch, isjagged, cntvers=cntvers, tobject=tobject, speedbump=speedbump)
 
             if isinstance(branch._streamer, uproot.rootio.TStreamerInfo):
                 obj = uproot.rootio._safename(branch._streamer._fName)
                 if obj == "string":
                     return asgenobj(STLString(), branch._context, 0)
                 elif obj in branch._context.classes:
-                    return _obj_or_genobj(branch._context.classes.get(obj), branch, isjagged, cntvers=cntvers, tobject=tobject)
+                    return _obj_or_genobj(branch._context.classes.get(obj), branch, isjagged, cntvers=cntvers, tobject=tobject, speedbump=speedbump)
 
             if branch._fLeaves[0].__class__.__name__ == "TLeafC":
                 return asstring(skipbytes=1)

uproot/interp/objects.py

@@ -28,6 +28,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import copy
 import struct
 
 import awkward
@@ -282,6 +283,13 @@ def __repr__(self):
     def __init__(self, cls, context, skipbytes):
         super(asgenobj, self).__init__(uproot.interp.jagged.asjagged(uproot.interp.numerical.asdtype(awkward.util.CHARTYPE), skipbytes=skipbytes), asgenobj._Wrapper(cls, context))
 
+    def speedbump(self, value):
+        out = copy.copy(self)
+        out.generator = copy.copy(self.generator)
+        out.generator.context = copy.copy(out.generator.context)
+        out.generator.context.speedbump = value
+        return out
+
     def __repr__(self):
         return "asgenobj({0})".format(self.generator)
 

uproot/rootio.py

@@ -682,7 +682,8 @@ def _defineclasses(streamerinfos, classes):
                     bases.append(_safename(element._fName))
 
                 elif isinstance(element, TStreamerBasicPointer):
-                    code.append("        cursor.skip(1)")
+                    code.append("        if getattr(context, \"speedbump\", True):")
+                    code.append("            cursor.skip(1)")
 
                     assert uproot.const.kOffsetP < element._fType < uproot.const.kOffsetP + 20
                     fType = element._fType - uproot.const.kOffsetP

uproot/tree.py

@@ -257,6 +257,7 @@ def _attachstreamer(self, branch, streamer, streamerinfosmap):
     def _postprocess(self, source, cursor, context, parent):
         self._context = context
         self._context.treename = self.name
+        self._context.speedbump = True
 
         for branch in self._fBranches:
             self._attachstreamer(branch, context.streamerinfosmap.get(getattr(branch, "_fClassName", None), None), context.streamerinfosmap)

uproot/version.py

@@ -30,7 +30,7 @@
 
 import re
 
-__version__ = "3.2.5"
+__version__ = "3.2.6"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))