Skip to content

Commit dc2dcf6

Browse files
committed
groot/{rcmd,rdict}: add support for reading ROOT::VecOps::RVec<T>
Signed-off-by: Sebastien Binet <binet@cern.ch>
1 parent fd8c2dc commit dc2dcf6

File tree

6 files changed

+301
-5
lines changed

6 files changed

+301
-5
lines changed

groot/rcmd/dump_test.go

+5
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,11 @@ key[004]: tree;1 "my tree title" (TTree)
328328
name: "../testdata/tgme.root",
329329
want: loadRef("testdata/tgme.root.txt"),
330330
},
331+
{
332+
// ROOT::VecOps::RVec<T>
333+
name: "../testdata/rvec.root",
334+
want: loadRef("testdata/rvec.root.txt"),
335+
},
331336
} {
332337
t.Run(tc.name, func(t *testing.T) {
333338
got := new(strings.Builder)

groot/rcmd/testdata/rvec.root.txt

+291
Large diffs are not rendered by default.

groot/rdict/rstreamer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func (si *StreamerInfo) makeROp(sictx rbytes.StreamerInfoContext, i int, descr e
210210

211211
case *StreamerSTL:
212212
switch se.STLType() {
213-
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
213+
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
214214
var (
215215
ct = se.ContainedType()
216216
typename = se.TypeName()
@@ -467,7 +467,7 @@ func (si *StreamerInfo) makeROp(sictx rbytes.StreamerInfoContext, i int, descr e
467467

468468
case *StreamerSTL:
469469
switch se.STLType() {
470-
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
470+
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
471471
var (
472472
ct = se.ContainedType()
473473
typename = se.TypeName()

groot/rdict/type.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func TypeFromSE(ctx rbytes.StreamerInfoContext, se rbytes.StreamerElement) (refl
206206

207207
case *StreamerSTL:
208208
switch se.STLType() {
209-
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
209+
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
210210
var (
211211
ct = se.ContainedType()
212212
typevers = int16(-1)

groot/rdict/wstreamer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func (si *StreamerInfo) makeWOp(sictx rbytes.StreamerInfoContext, i int, descr e
202202

203203
case *StreamerSTL:
204204
switch se.STLType() {
205-
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
205+
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
206206
var (
207207
ct = se.ContainedType()
208208
typename = se.TypeName()
@@ -423,7 +423,7 @@ func (si *StreamerInfo) makeWOp(sictx rbytes.StreamerInfoContext, i int, descr e
423423

424424
case *StreamerSTL:
425425
switch se.STLType() {
426-
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
426+
case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
427427
var (
428428
ct = se.ContainedType()
429429
typename = se.TypeName()

groot/testdata/rvec.root

41.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)