Skip to content

Commit

Permalink
Last data type/interpretation features before moving on to iteration. (…
Browse files Browse the repository at this point in the history 
…#35)

* All TTrees in scikit-hep-testdata can be _listed_ except issue475b.root:Event/Sim/SimHeader.

* Now _all_ TTrees in scikit-hep-testdata can be listed.

* Fix flake8.

* To read the TH2D file, we need TBranchObject.

* More stability.

* Renamed stl_container/STLContainer -> container/Container.

* Fix Cursor origin for entry_start != 0.

* Include type hint in AsDynamic.

* Adding missing offsets; it's not really necessary to look at TIOFeatures, though one could.

* Names in zipped arrays are split at _ . / only.
  • Loading branch information
@jpivarski
jpivarski authored Jul 2, 2020
1 parent fc74399 commit 1ac0cd5
Show file tree
Hide file tree
Showing 24 changed files with 599 additions and 344 deletions.
216 changes: 108 additions & 108 deletions tests/test_0018-array-fetching-interface.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,152 +339,152 @@ def test_arrays():
how="zip",
)
assert result.tolist() == [
{"i4": -15, "f4": -14.899999618530273, "A": []},
{"i4": -14, "f4": -13.899999618530273, "A": [{"i4": -15, "f8": -15.0}]},
{"i4": -15, "f4": -14.899999618530273, "jagged0": []},
{"i4": -14, "f4": -13.899999618530273, "jagged0": [{"Ai4": -15, "Af8": -15.0}]},
{
"i4": -13,
"f4": -12.899999618530273,
"A": [{"i4": -15, "f8": -15.0}, {"i4": -13, "f8": -13.9}],
"jagged0": [{"Ai4": -15, "Af8": -15.0}, {"Ai4": -13, "Af8": -13.9}],
},
{
"i4": -12,
"f4": -11.899999618530273,
"A": [
{"i4": -15, "f8": -15.0},
{"i4": -13, "f8": -13.9},
{"i4": -11, "f8": -12.8},
"jagged0": [
{"Ai4": -15, "Af8": -15.0},
{"Ai4": -13, "Af8": -13.9},
{"Ai4": -11, "Af8": -12.8},
],
},
{
"i4": -11,
"f4": -10.899999618530273,
"A": [
{"i4": -15, "f8": -15.0},
{"i4": -13, "f8": -13.9},
{"i4": -11, "f8": -12.8},
{"i4": -9, "f8": -11.7},
"jagged0": [
{"Ai4": -15, "Af8": -15.0},
{"Ai4": -13, "Af8": -13.9},
{"Ai4": -11, "Af8": -12.8},
{"Ai4": -9, "Af8": -11.7},
],
},
{"i4": -10, "f4": -9.899999618530273, "A": []},
{"i4": -9, "f4": -8.899999618530273, "A": [{"i4": -10, "f8": -10.0}]},
{"i4": -10, "f4": -9.899999618530273, "jagged0": []},
{"i4": -9, "f4": -8.899999618530273, "jagged0": [{"Ai4": -10, "Af8": -10.0}]},
{
"i4": -8,
"f4": -7.900000095367432,
"A": [{"i4": -10, "f8": -10.0}, {"i4": -8, "f8": -8.9}],
"jagged0": [{"Ai4": -10, "Af8": -10.0}, {"Ai4": -8, "Af8": -8.9}],
},
{
"i4": -7,
"f4": -6.900000095367432,
"A": [
{"i4": -10, "f8": -10.0},
{"i4": -8, "f8": -8.9},
{"i4": -6, "f8": -7.8},
"jagged0": [
{"Ai4": -10, "Af8": -10.0},
{"Ai4": -8, "Af8": -8.9},
{"Ai4": -6, "Af8": -7.8},
],
},
{
"i4": -6,
"f4": -5.900000095367432,
"A": [
{"i4": -10, "f8": -10.0},
{"i4": -8, "f8": -8.9},
{"i4": -6, "f8": -7.8},
{"i4": -4, "f8": -6.7},
"jagged0": [
{"Ai4": -10, "Af8": -10.0},
{"Ai4": -8, "Af8": -8.9},
{"Ai4": -6, "Af8": -7.8},
{"Ai4": -4, "Af8": -6.7},
],
},
{"i4": -5, "f4": -4.900000095367432, "A": []},
{"i4": -4, "f4": -3.9000000953674316, "A": [{"i4": -5, "f8": -5.0}]},
{"i4": -5, "f4": -4.900000095367432, "jagged0": []},
{"i4": -4, "f4": -3.9000000953674316, "jagged0": [{"Ai4": -5, "Af8": -5.0}]},
{
"i4": -3,
"f4": -2.9000000953674316,
"A": [{"i4": -5, "f8": -5.0}, {"i4": -3, "f8": -3.9}],
"jagged0": [{"Ai4": -5, "Af8": -5.0}, {"Ai4": -3, "Af8": -3.9}],
},
{
"i4": -2,
"f4": -1.899999976158142,
"A": [
{"i4": -5, "f8": -5.0},
{"i4": -3, "f8": -3.9},
{"i4": -1, "f8": -2.8},
"jagged0": [
{"Ai4": -5, "Af8": -5.0},
{"Ai4": -3, "Af8": -3.9},
{"Ai4": -1, "Af8": -2.8},
],
},
{
"i4": -1,
"f4": -0.8999999761581421,
"A": [
{"i4": -5, "f8": -5.0},
{"i4": -3, "f8": -3.9},
{"i4": -1, "f8": -2.8},
{"i4": 1, "f8": -1.7},
"jagged0": [
{"Ai4": -5, "Af8": -5.0},
{"Ai4": -3, "Af8": -3.9},
{"Ai4": -1, "Af8": -2.8},
{"Ai4": 1, "Af8": -1.7},
],
},
{"i4": 0, "f4": 0.10000000149011612, "A": []},
{"i4": 1, "f4": 1.100000023841858, "A": [{"i4": 0, "f8": 0.0}]},
{"i4": 0, "f4": 0.10000000149011612, "jagged0": []},
{"i4": 1, "f4": 1.100000023841858, "jagged0": [{"Ai4": 0, "Af8": 0.0}]},
{
"i4": 2,
"f4": 2.0999999046325684,
"A": [{"i4": 0, "f8": 0.0}, {"i4": 2, "f8": 1.1}],
"jagged0": [{"Ai4": 0, "Af8": 0.0}, {"Ai4": 2, "Af8": 1.1}],
},
{
"i4": 3,
"f4": 3.0999999046325684,
"A": [{"i4": 0, "f8": 0.0}, {"i4": 2, "f8": 1.1}, {"i4": 4, "f8": 2.2}],
"jagged0": [{"Ai4": 0, "Af8": 0.0}, {"Ai4": 2, "Af8": 1.1}, {"Ai4": 4, "Af8": 2.2}],
},
{
"i4": 4,
"f4": 4.099999904632568,
"A": [
{"i4": 0, "f8": 0.0},
{"i4": 2, "f8": 1.1},
{"i4": 4, "f8": 2.2},
{"i4": 6, "f8": 3.3},
"jagged0": [
{"Ai4": 0, "Af8": 0.0},
{"Ai4": 2, "Af8": 1.1},
{"Ai4": 4, "Af8": 2.2},
{"Ai4": 6, "Af8": 3.3},
],
},
{"i4": 5, "f4": 5.099999904632568, "A": []},
{"i4": 6, "f4": 6.099999904632568, "A": [{"i4": 5, "f8": 5.0}]},
{"i4": 5, "f4": 5.099999904632568, "jagged0": []},
{"i4": 6, "f4": 6.099999904632568, "jagged0": [{"Ai4": 5, "Af8": 5.0}]},
{
"i4": 7,
"f4": 7.099999904632568,
"A": [{"i4": 5, "f8": 5.0}, {"i4": 7, "f8": 6.1}],
"jagged0": [{"Ai4": 5, "Af8": 5.0}, {"Ai4": 7, "Af8": 6.1}],
},
{
"i4": 8,
"f4": 8.100000381469727,
"A": [{"i4": 5, "f8": 5.0}, {"i4": 7, "f8": 6.1}, {"i4": 9, "f8": 7.2}],
"jagged0": [{"Ai4": 5, "Af8": 5.0}, {"Ai4": 7, "Af8": 6.1}, {"Ai4": 9, "Af8": 7.2}],
},
{
"i4": 9,
"f4": 9.100000381469727,
"A": [
{"i4": 5, "f8": 5.0},
{"i4": 7, "f8": 6.1},
{"i4": 9, "f8": 7.2},
{"i4": 11, "f8": 8.3},
"jagged0": [
{"Ai4": 5, "Af8": 5.0},
{"Ai4": 7, "Af8": 6.1},
{"Ai4": 9, "Af8": 7.2},
{"Ai4": 11, "Af8": 8.3},
],
},
{"i4": 10, "f4": 10.100000381469727, "A": []},
{"i4": 11, "f4": 11.100000381469727, "A": [{"i4": 10, "f8": 10.0}]},
{"i4": 10, "f4": 10.100000381469727, "jagged0": []},
{"i4": 11, "f4": 11.100000381469727, "jagged0": [{"Ai4": 10, "Af8": 10.0}]},
{
"i4": 12,
"f4": 12.100000381469727,
"A": [{"i4": 10, "f8": 10.0}, {"i4": 12, "f8": 11.1}],
"jagged0": [{"Ai4": 10, "Af8": 10.0}, {"Ai4": 12, "Af8": 11.1}],
},
{
"i4": 13,
"f4": 13.100000381469727,
"A": [
{"i4": 10, "f8": 10.0},
{"i4": 12, "f8": 11.1},
{"i4": 14, "f8": 12.2},
"jagged0": [
{"Ai4": 10, "Af8": 10.0},
{"Ai4": 12, "Af8": 11.1},
{"Ai4": 14, "Af8": 12.2},
],
},
{
"i4": 14,
"f4": 14.100000381469727,
"A": [
{"i4": 10, "f8": 10.0},
{"i4": 12, "f8": 11.1},
{"i4": 14, "f8": 12.2},
{"i4": 16, "f8": 13.3},
"jagged0": [
{"Ai4": 10, "Af8": 10.0},
{"Ai4": 12, "Af8": 11.1},
{"Ai4": 14, "Af8": 12.2},
{"Ai4": 16, "Af8": 13.3},
],
},
]
Expand All @@ -496,100 +496,100 @@ def test_arrays():
how="zip",
)
assert result.tolist() == [
{"i4": -10, "f4": -9.899999618530273, "A": []},
{"i4": -9, "f4": -8.899999618530273, "A": [{"i4": -10, "f8": -10.0}]},
{"i4": -10, "f4": -9.899999618530273, "jagged0": []},
{"i4": -9, "f4": -8.899999618530273, "jagged0": [{"Ai4": -10, "Af8": -10.0}]},
{
"i4": -8,
"f4": -7.900000095367432,
"A": [{"i4": -10, "f8": -10.0}, {"i4": -8, "f8": -8.9}],
"jagged0": [{"Ai4": -10, "Af8": -10.0}, {"Ai4": -8, "Af8": -8.9}],
},
{
"i4": -7,
"f4": -6.900000095367432,
"A": [
{"i4": -10, "f8": -10.0},
{"i4": -8, "f8": -8.9},
{"i4": -6, "f8": -7.8},
"jagged0": [
{"Ai4": -10, "Af8": -10.0},
{"Ai4": -8, "Af8": -8.9},
{"Ai4": -6, "Af8": -7.8},
],
},
{
"i4": -6,
"f4": -5.900000095367432,
"A": [
{"i4": -10, "f8": -10.0},
{"i4": -8, "f8": -8.9},
{"i4": -6, "f8": -7.8},
{"i4": -4, "f8": -6.7},
"jagged0": [
{"Ai4": -10, "Af8": -10.0},
{"Ai4": -8, "Af8": -8.9},
{"Ai4": -6, "Af8": -7.8},
{"Ai4": -4, "Af8": -6.7},
],
},
{"i4": -5, "f4": -4.900000095367432, "A": []},
{"i4": -4, "f4": -3.9000000953674316, "A": [{"i4": -5, "f8": -5.0}]},
{"i4": -5, "f4": -4.900000095367432, "jagged0": []},
{"i4": -4, "f4": -3.9000000953674316, "jagged0": [{"Ai4": -5, "Af8": -5.0}]},
{
"i4": -3,
"f4": -2.9000000953674316,
"A": [{"i4": -5, "f8": -5.0}, {"i4": -3, "f8": -3.9}],
"jagged0": [{"Ai4": -5, "Af8": -5.0}, {"Ai4": -3, "Af8": -3.9}],
},
{
"i4": -2,
"f4": -1.899999976158142,
"A": [
{"i4": -5, "f8": -5.0},
{"i4": -3, "f8": -3.9},
{"i4": -1, "f8": -2.8},
"jagged0": [
{"Ai4": -5, "Af8": -5.0},
{"Ai4": -3, "Af8": -3.9},
{"Ai4": -1, "Af8": -2.8},
],
},
{
"i4": -1,
"f4": -0.8999999761581421,
"A": [
{"i4": -5, "f8": -5.0},
{"i4": -3, "f8": -3.9},
{"i4": -1, "f8": -2.8},
{"i4": 1, "f8": -1.7},
"jagged0": [
{"Ai4": -5, "Af8": -5.0},
{"Ai4": -3, "Af8": -3.9},
{"Ai4": -1, "Af8": -2.8},
{"Ai4": 1, "Af8": -1.7},
],
},
{"i4": 0, "f4": 0.10000000149011612, "A": []},
{"i4": 1, "f4": 1.100000023841858, "A": [{"i4": 0, "f8": 0.0}]},
{"i4": 0, "f4": 0.10000000149011612, "jagged0": []},
{"i4": 1, "f4": 1.100000023841858, "jagged0": [{"Ai4": 0, "Af8": 0.0}]},
{
"i4": 2,
"f4": 2.0999999046325684,
"A": [{"i4": 0, "f8": 0.0}, {"i4": 2, "f8": 1.1}],
"jagged0": [{"Ai4": 0, "Af8": 0.0}, {"Ai4": 2, "Af8": 1.1}],
},
{
"i4": 3,
"f4": 3.0999999046325684,
"A": [{"i4": 0, "f8": 0.0}, {"i4": 2, "f8": 1.1}, {"i4": 4, "f8": 2.2}],
"jagged0": [{"Ai4": 0, "Af8": 0.0}, {"Ai4": 2, "Af8": 1.1}, {"Ai4": 4, "Af8": 2.2}],
},
{
"i4": 4,
"f4": 4.099999904632568,
"A": [
{"i4": 0, "f8": 0.0},
{"i4": 2, "f8": 1.1},
{"i4": 4, "f8": 2.2},
{"i4": 6, "f8": 3.3},
"jagged0": [
{"Ai4": 0, "Af8": 0.0},
{"Ai4": 2, "Af8": 1.1},
{"Ai4": 4, "Af8": 2.2},
{"Ai4": 6, "Af8": 3.3},
],
},
{"i4": 5, "f4": 5.099999904632568, "A": []},
{"i4": 6, "f4": 6.099999904632568, "A": [{"i4": 5, "f8": 5.0}]},
{"i4": 5, "f4": 5.099999904632568, "jagged0": []},
{"i4": 6, "f4": 6.099999904632568, "jagged0": [{"Ai4": 5, "Af8": 5.0}]},
{
"i4": 7,
"f4": 7.099999904632568,
"A": [{"i4": 5, "f8": 5.0}, {"i4": 7, "f8": 6.1}],
"jagged0": [{"Ai4": 5, "Af8": 5.0}, {"Ai4": 7, "Af8": 6.1}],
},
{
"i4": 8,
"f4": 8.100000381469727,
"A": [{"i4": 5, "f8": 5.0}, {"i4": 7, "f8": 6.1}, {"i4": 9, "f8": 7.2}],
"jagged0": [{"Ai4": 5, "Af8": 5.0}, {"Ai4": 7, "Af8": 6.1}, {"Ai4": 9, "Af8": 7.2}],
},
{
"i4": 9,
"f4": 9.100000381469727,
"A": [
{"i4": 5, "f8": 5.0},
{"i4": 7, "f8": 6.1},
{"i4": 9, "f8": 7.2},
{"i4": 11, "f8": 8.3},
"jagged0": [
{"Ai4": 5, "Af8": 5.0},
{"Ai4": 7, "Af8": 6.1},
{"Ai4": 9, "Af8": 7.2},
{"Ai4": 11, "Af8": 8.3},
],
},
]
Expand Down
8 changes: 4 additions & 4 deletions tests/test_0029-more-string-types.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

import uproot4
from uproot4.interpretation.identify import parse_typename
from uproot4.stl_containers import AsString
from uproot4.stl_containers import AsVector
from uproot4.stl_containers import AsSet
from uproot4.stl_containers import AsMap
from uproot4.containers import AsString
from uproot4.containers import AsVector
from uproot4.containers import AsSet
from uproot4.containers import AsMap


def test_parse_typename():
Expand Down
8 changes: 4 additions & 4 deletions tests/test_0031-test-stl-containers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
from uproot4.interpretation.numerical import AsDtype
from uproot4.interpretation.jagged import AsJagged
from uproot4.interpretation.objects import AsObjects
from uproot4.stl_containers import AsString
from uproot4.stl_containers import AsVector
from uproot4.stl_containers import AsSet
from uproot4.stl_containers import AsMap
from uproot4.containers import AsString
from uproot4.containers import AsVector
from uproot4.containers import AsSet
from uproot4.containers import AsMap


def test_typename():
Expand Down
Loading

0 comments on commit 1ac0cd5

Please sign in to comment.