groot: bump to ROOT 6.28/04

Signed-off-by: Sebastien Binet <binet@cern.ch>
go-hep · Sep 6, 2023 · 7cb2fac · 7cb2fac
1 parent 548d277
commit 7cb2fac
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   GOPROXY: "https://proxy.golang.org"
-  ROOT_VERSION: "6.26.00"
+  ROOT_VERSION: "6.28.04"
   TAGS: "-tags=ci"
   COVERAGE: "-coverpkg=go-hep.org/x/hep/..."
   EGL_PLATFORM: "x11"

diff --git a/ci/build-cxx-root.go b/ci/build-cxx-root.go
@@ -21,7 +21,7 @@ func main() {
 	log.SetPrefix("")
 	log.SetFlags(0)
 
-	rvers := flag.String("root-version", "6.26.00", "ROOT version to build")
+	rvers := flag.String("root-version", "6.28.04", "ROOT version to build")
 	nproc := flag.Int("j", runtime.NumCPU(), "number of parallel build processes")
 
 	flag.Parse()
@@ -97,7 +97,7 @@ apt update  -yq
 apt install -yq    \
 		cmake curl \
 		g++ git    \
-		python     \
+		python3    \
 ;
 
 export ROOT_VERSION="%[1]s"

diff --git a/ci/install-cxx-root.go b/ci/install-cxx-root.go
@@ -23,7 +23,7 @@ func main() {
 	log.SetFlags(0)
 
 	var (
-		rvers = flag.String("root-version", "6.26.00", "ROOT version to install")
+		rvers = flag.String("root-version", "6.28.04", "ROOT version to install")
 		odir  = flag.String("o", "", "install directory for ROOT")
 	)
 

diff --git a/groot/rdict/cxx_root_streamers_gen.go b/groot/rdict/cxx_root_streamers_gen.go
@@ -4710,7 +4710,7 @@ func init() {
 	}))
 	StreamerInfos.Add(NewCxxStreamerInfo("TDirectoryFile", 5, 0xbf9f443e, []rbytes.StreamerElement{
 		NewStreamerBase(Element{
-			Name:   *rbase.NewNamed("TDirectory", ""),
+			Name:   *rbase.NewNamed("TDirectory", "Describe directory structure in memory"),
 			Type:   rmeta.Base,
 			Size:   0,
 			ArrLen: 0,
@@ -4881,7 +4881,7 @@ func init() {
 	}))
 	StreamerInfos.Add(NewCxxStreamerInfo("TFile", 8, 0x9468e382, []rbytes.StreamerElement{
 		NewStreamerBase(Element{
-			Name:   *rbase.NewNamed("TDirectoryFile", ""),
+			Name:   *rbase.NewNamed("TDirectoryFile", "Describe directory structure in a ROOT file"),
 			Type:   rmeta.Base,
 			Size:   0,
 			ArrLen: 0,

diff --git a/groot/rtree/writer_example_test.go b/groot/rtree/writer_example_test.go
@@ -482,7 +482,7 @@ func Example_createEventNtupleNoSplit() {
 	// -- filled tree with 5 entries
 	// -- read back ROOT file
 	// === [../testdata/groot-event-ntuple-nosplit.root] ===
-	// version: 62600
+	// version: 62804
 	//   TTree mytree          (entries=5)
 	//     evt "evt"   TBranchElement
 	//
@@ -627,7 +627,7 @@ func Example_createEventNtupleFullSplit() {
 	// -- filled tree with 5 entries
 	// -- read back ROOT file
 	// === [../testdata/groot-event-ntuple-fullsplit.root] ===
-	// version: 62600
+	// version: 62804
 	//   TTree mytree             (entries=5)
 	//     i32 "i32/I"    TBranch
 	//     f64 "f64/D"    TBranch

diff --git a/groot/rvers/versions_gen.go b/groot/rvers/versions_gen.go
@@ -7,7 +7,7 @@
 package rvers
 
 // ROOT version
-const ROOT = 62600
+const ROOT = 62804
 
 // ROOT classes versions
 const (