From baa058b596f20cfa19bb01df8bdee174ba45ad43 Mon Sep 17 00:00:00 2001 From: Sebastien Binet Date: Wed, 26 Jan 2022 10:59:08 +0100 Subject: [PATCH] groot/{rdict,rtree,rvers}: bump to ROOT-6.24/06 --- groot/rdict/cxx_root_streamers_gen.go | 102 +++++++++++++------------- groot/rtree/writer_example_test.go | 4 +- groot/rvers/versions_gen.go | 6 +- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/groot/rdict/cxx_root_streamers_gen.go b/groot/rdict/cxx_root_streamers_gen.go index 3f44a43e4..0cc1241f5 100644 --- a/groot/rdict/cxx_root_streamers_gen.go +++ b/groot/rdict/cxx_root_streamers_gen.go @@ -4374,34 +4374,6 @@ func init() { Factor: 0.000000, }.New()}, })) - StreamerInfos.Add(NewCxxStreamerInfo("TBranchObject", 1, 0xa4720f49, []rbytes.StreamerElement{ - NewStreamerBase(Element{ - Name: *rbase.NewNamed("TBranch", "Branch descriptor"), - Type: rmeta.Base, - Size: 0, - ArrLen: 0, - ArrDim: 0, - MaxIdx: [5]int32{0, 278366892, 0, 0, 0}, - Offset: 0, - EName: "BASE", - XMin: 0.000000, - XMax: 0.000000, - Factor: 0.000000, - }.New(), 13), - &StreamerString{StreamerElement: Element{ - Name: *rbase.NewNamed("fClassName", "Class name of referenced object"), - Type: rmeta.TString, - Size: 24, - ArrLen: 0, - ArrDim: 0, - MaxIdx: [5]int32{0, 0, 0, 0, 0}, - Offset: 0, - EName: "TString", - XMin: 0.000000, - XMax: 0.000000, - Factor: 0.000000, - }.New()}, - })) StreamerInfos.Add(NewCxxStreamerInfo("TBranchElement", 10, 0xe74f5e63, []rbytes.StreamerElement{ NewStreamerBase(Element{ Name: *rbase.NewNamed("TBranch", "Branch descriptor"), @@ -4560,6 +4532,34 @@ func init() { Factor: 0.000000, }.New()}, })) + StreamerInfos.Add(NewCxxStreamerInfo("TBranchObject", 1, 0xa4720f49, []rbytes.StreamerElement{ + NewStreamerBase(Element{ + Name: *rbase.NewNamed("TBranch", "Branch descriptor"), + Type: rmeta.Base, + Size: 0, + ArrLen: 0, + ArrDim: 0, + MaxIdx: [5]int32{0, 278366892, 0, 0, 0}, + Offset: 0, + EName: "BASE", + XMin: 0.000000, + XMax: 0.000000, + Factor: 0.000000, + }.New(), 13), + &StreamerString{StreamerElement: Element{ + Name: *rbase.NewNamed("fClassName", "Class name of referenced object"), + Type: rmeta.TString, + Size: 24, + ArrLen: 0, + ArrDim: 0, + MaxIdx: [5]int32{0, 0, 0, 0, 0}, + Offset: 0, + EName: "TString", + XMin: 0.000000, + XMax: 0.000000, + Factor: 0.000000, + }.New()}, + })) StreamerInfos.Add(NewCxxStreamerInfo("TBranchRef", 1, 0x2360b3fd, []rbytes.StreamerElement{ NewStreamerBase(Element{ Name: *rbase.NewNamed("TBranch", "Branch descriptor"), @@ -4761,7 +4761,7 @@ func init() { Factor: 0.000000, }.New()}, })) - StreamerInfos.Add(NewCxxStreamerInfo("TLeafObject", 4, 0x26ba7c4c, []rbytes.StreamerElement{ + StreamerInfos.Add(NewCxxStreamerInfo("TLeafElement", 1, 0xa04f8893, []rbytes.StreamerElement{ NewStreamerBase(Element{ Name: *rbase.NewNamed("TLeaf", "Leaf: description of a Branch data type"), Type: rmeta.Base, @@ -4776,20 +4776,33 @@ func init() { Factor: 0.000000, }.New(), 2), &StreamerBasicType{StreamerElement: Element{ - Name: *rbase.NewNamed("fVirtual", "Support for polymorphism, when set classname is written with object."), - Type: rmeta.Bool, - Size: 1, + Name: *rbase.NewNamed("fID", "element serial number in fInfo"), + Type: rmeta.Int, + Size: 4, ArrLen: 0, ArrDim: 0, MaxIdx: [5]int32{0, 0, 0, 0, 0}, Offset: 0, - EName: "bool", + EName: "int", + XMin: 0.000000, + XMax: 0.000000, + Factor: 0.000000, + }.New()}, + &StreamerBasicType{StreamerElement: Element{ + Name: *rbase.NewNamed("fType", "leaf type"), + Type: rmeta.Int, + Size: 4, + ArrLen: 0, + ArrDim: 0, + MaxIdx: [5]int32{0, 0, 0, 0, 0}, + Offset: 0, + EName: "int", XMin: 0.000000, XMax: 0.000000, Factor: 0.000000, }.New()}, })) - StreamerInfos.Add(NewCxxStreamerInfo("TLeafElement", 1, 0xa04f8893, []rbytes.StreamerElement{ + StreamerInfos.Add(NewCxxStreamerInfo("TLeafObject", 4, 0x26ba7c4c, []rbytes.StreamerElement{ NewStreamerBase(Element{ Name: *rbase.NewNamed("TLeaf", "Leaf: description of a Branch data type"), Type: rmeta.Base, @@ -4804,27 +4817,14 @@ func init() { Factor: 0.000000, }.New(), 2), &StreamerBasicType{StreamerElement: Element{ - Name: *rbase.NewNamed("fID", "element serial number in fInfo"), - Type: rmeta.Int, - Size: 4, - ArrLen: 0, - ArrDim: 0, - MaxIdx: [5]int32{0, 0, 0, 0, 0}, - Offset: 0, - EName: "int", - XMin: 0.000000, - XMax: 0.000000, - Factor: 0.000000, - }.New()}, - &StreamerBasicType{StreamerElement: Element{ - Name: *rbase.NewNamed("fType", "leaf type"), - Type: rmeta.Int, - Size: 4, + Name: *rbase.NewNamed("fVirtual", "Support for polymorphism, when set classname is written with object."), + Type: rmeta.Bool, + Size: 1, ArrLen: 0, ArrDim: 0, MaxIdx: [5]int32{0, 0, 0, 0, 0}, Offset: 0, - EName: "int", + EName: "bool", XMin: 0.000000, XMax: 0.000000, Factor: 0.000000, diff --git a/groot/rtree/writer_example_test.go b/groot/rtree/writer_example_test.go index 14d7e9cf2..3de37da8f 100644 --- 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: 62400 + // version: 62406 // 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: 62400 + // version: 62406 // 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 index e7533295d..a75f80f0f 100644 --- a/groot/rvers/versions_gen.go +++ b/groot/rvers/versions_gen.go @@ -7,7 +7,7 @@ package rvers // ROOT version -const ROOT = 62400 +const ROOT = 62406 // ROOT classes versions const ( @@ -86,13 +86,13 @@ const ( ROOT_IOFeatures = 1 // ROOT version for ROOT::TIOFeatures Basket = 3 // ROOT version for TBasket Branch = 13 // ROOT version for TBranch - BranchObject = 1 // ROOT version for TBranchObject BranchElement = 10 // ROOT version for TBranchElement + BranchObject = 1 // ROOT version for TBranchObject BranchRef = 1 // ROOT version for TBranchRef Chain = 5 // ROOT version for TChain Leaf = 2 // ROOT version for TLeaf - LeafObject = 4 // ROOT version for TLeafObject LeafElement = 1 // ROOT version for TLeafElement + LeafObject = 4 // ROOT version for TLeafObject LeafO = 1 // ROOT version for TLeafO LeafB = 1 // ROOT version for TLeafB LeafS = 1 // ROOT version for TLeafS