groot/{rcmd,rdict}: add support for reading ROOT::VecOps::RVec<T>

Signed-off-by: Sebastien Binet <binet@cern.ch>
go-hep · May 12, 2022 · dc2dcf6 · dc2dcf6
1 parent fd8c2dc
commit dc2dcf6
Show file tree

Hide file tree

Showing 6 changed files with 301 additions and 5 deletions.
diff --git a/groot/rcmd/dump_test.go b/groot/rcmd/dump_test.go
@@ -328,6 +328,11 @@ key[004]: tree;1 "my tree title" (TTree)
 			name: "../testdata/tgme.root",
 			want: loadRef("testdata/tgme.root.txt"),
 		},
+		{
+			// ROOT::VecOps::RVec<T>
+			name: "../testdata/rvec.root",
+			want: loadRef("testdata/rvec.root.txt"),
+		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			got := new(strings.Builder)

diff --git a/groot/rcmd/testdata/rvec.root.txt b/groot/rcmd/testdata/rvec.root.txt
diff --git a/groot/rdict/rstreamer.go b/groot/rdict/rstreamer.go
@@ -210,7 +210,7 @@ func (si *StreamerInfo) makeROp(sictx rbytes.StreamerInfoContext, i int, descr e
 
 				case *StreamerSTL:
 					switch se.STLType() {
-					case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
+					case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
 						var (
 							ct       = se.ContainedType()
 							typename = se.TypeName()
@@ -467,7 +467,7 @@ func (si *StreamerInfo) makeROp(sictx rbytes.StreamerInfoContext, i int, descr e
 
 		case *StreamerSTL:
 			switch se.STLType() {
-			case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
+			case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
 				var (
 					ct       = se.ContainedType()
 					typename = se.TypeName()

diff --git a/groot/rdict/type.go b/groot/rdict/type.go
@@ -206,7 +206,7 @@ func TypeFromSE(ctx rbytes.StreamerInfoContext, se rbytes.StreamerElement) (refl
 
 	case *StreamerSTL:
 		switch se.STLType() {
-		case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
+		case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
 			var (
 				ct       = se.ContainedType()
 				typevers = int16(-1)

diff --git a/groot/rdict/wstreamer.go b/groot/rdict/wstreamer.go
@@ -202,7 +202,7 @@ func (si *StreamerInfo) makeWOp(sictx rbytes.StreamerInfoContext, i int, descr e
 
 				case *StreamerSTL:
 					switch se.STLType() {
-					case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
+					case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
 						var (
 							ct       = se.ContainedType()
 							typename = se.TypeName()
@@ -423,7 +423,7 @@ func (si *StreamerInfo) makeWOp(sictx rbytes.StreamerInfoContext, i int, descr e
 
 		case *StreamerSTL:
 			switch se.STLType() {
-			case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque:
+			case rmeta.STLvector, rmeta.STLlist, rmeta.STLdeque, rmeta.STLend:
 				var (
 					ct       = se.ContainedType()
 					typename = se.TypeName()

diff --git a/groot/testdata/rvec.root b/groot/testdata/rvec.root