Skip to content

Commit baa058b

Browse files
sbinetsbinet
committed
groot/{rdict,rtree,rvers}: bump to ROOT-6.24/06
1 parent bc00032 commit baa058b

File tree

3 files changed

+56
-56
lines changed

3 files changed

+56
-56
lines changed

‎groot/rdict/cxx_root_streamers_gen.go

+51-51
Original file line numberDiff line numberDiff line change
@@ -4374,34 +4374,6 @@ func init() {
43744374
Factor: 0.000000,
43754375
}.New()},
43764376
}))
4377-
StreamerInfos.Add(NewCxxStreamerInfo("TBranchObject", 1, 0xa4720f49, []rbytes.StreamerElement{
4378-
NewStreamerBase(Element{
4379-
Name: *rbase.NewNamed("TBranch", "Branch descriptor"),
4380-
Type: rmeta.Base,
4381-
Size: 0,
4382-
ArrLen: 0,
4383-
ArrDim: 0,
4384-
MaxIdx: [5]int32{0, 278366892, 0, 0, 0},
4385-
Offset: 0,
4386-
EName: "BASE",
4387-
XMin: 0.000000,
4388-
XMax: 0.000000,
4389-
Factor: 0.000000,
4390-
}.New(), 13),
4391-
&StreamerString{StreamerElement: Element{
4392-
Name: *rbase.NewNamed("fClassName", "Class name of referenced object"),
4393-
Type: rmeta.TString,
4394-
Size: 24,
4395-
ArrLen: 0,
4396-
ArrDim: 0,
4397-
MaxIdx: [5]int32{0, 0, 0, 0, 0},
4398-
Offset: 0,
4399-
EName: "TString",
4400-
XMin: 0.000000,
4401-
XMax: 0.000000,
4402-
Factor: 0.000000,
4403-
}.New()},
4404-
}))
44054377
StreamerInfos.Add(NewCxxStreamerInfo("TBranchElement", 10, 0xe74f5e63, []rbytes.StreamerElement{
44064378
NewStreamerBase(Element{
44074379
Name: *rbase.NewNamed("TBranch", "Branch descriptor"),
@@ -4560,6 +4532,34 @@ func init() {
45604532
Factor: 0.000000,
45614533
}.New()},
45624534
}))
4535+
StreamerInfos.Add(NewCxxStreamerInfo("TBranchObject", 1, 0xa4720f49, []rbytes.StreamerElement{
4536+
NewStreamerBase(Element{
4537+
Name: *rbase.NewNamed("TBranch", "Branch descriptor"),
4538+
Type: rmeta.Base,
4539+
Size: 0,
4540+
ArrLen: 0,
4541+
ArrDim: 0,
4542+
MaxIdx: [5]int32{0, 278366892, 0, 0, 0},
4543+
Offset: 0,
4544+
EName: "BASE",
4545+
XMin: 0.000000,
4546+
XMax: 0.000000,
4547+
Factor: 0.000000,
4548+
}.New(), 13),
4549+
&StreamerString{StreamerElement: Element{
4550+
Name: *rbase.NewNamed("fClassName", "Class name of referenced object"),
4551+
Type: rmeta.TString,
4552+
Size: 24,
4553+
ArrLen: 0,
4554+
ArrDim: 0,
4555+
MaxIdx: [5]int32{0, 0, 0, 0, 0},
4556+
Offset: 0,
4557+
EName: "TString",
4558+
XMin: 0.000000,
4559+
XMax: 0.000000,
4560+
Factor: 0.000000,
4561+
}.New()},
4562+
}))
45634563
StreamerInfos.Add(NewCxxStreamerInfo("TBranchRef", 1, 0x2360b3fd, []rbytes.StreamerElement{
45644564
NewStreamerBase(Element{
45654565
Name: *rbase.NewNamed("TBranch", "Branch descriptor"),
@@ -4761,7 +4761,7 @@ func init() {
47614761
Factor: 0.000000,
47624762
}.New()},
47634763
}))
4764-
StreamerInfos.Add(NewCxxStreamerInfo("TLeafObject", 4, 0x26ba7c4c, []rbytes.StreamerElement{
4764+
StreamerInfos.Add(NewCxxStreamerInfo("TLeafElement", 1, 0xa04f8893, []rbytes.StreamerElement{
47654765
NewStreamerBase(Element{
47664766
Name: *rbase.NewNamed("TLeaf", "Leaf: description of a Branch data type"),
47674767
Type: rmeta.Base,
@@ -4776,20 +4776,33 @@ func init() {
47764776
Factor: 0.000000,
47774777
}.New(), 2),
47784778
&StreamerBasicType{StreamerElement: Element{
4779-
Name: *rbase.NewNamed("fVirtual", "Support for polymorphism, when set classname is written with object."),
4780-
Type: rmeta.Bool,
4781-
Size: 1,
4779+
Name: *rbase.NewNamed("fID", "element serial number in fInfo"),
4780+
Type: rmeta.Int,
4781+
Size: 4,
47824782
ArrLen: 0,
47834783
ArrDim: 0,
47844784
MaxIdx: [5]int32{0, 0, 0, 0, 0},
47854785
Offset: 0,
4786-
EName: "bool",
4786+
EName: "int",
4787+
XMin: 0.000000,
4788+
XMax: 0.000000,
4789+
Factor: 0.000000,
4790+
}.New()},
4791+
&StreamerBasicType{StreamerElement: Element{
4792+
Name: *rbase.NewNamed("fType", "leaf type"),
4793+
Type: rmeta.Int,
4794+
Size: 4,
4795+
ArrLen: 0,
4796+
ArrDim: 0,
4797+
MaxIdx: [5]int32{0, 0, 0, 0, 0},
4798+
Offset: 0,
4799+
EName: "int",
47874800
XMin: 0.000000,
47884801
XMax: 0.000000,
47894802
Factor: 0.000000,
47904803
}.New()},
47914804
}))
4792-
StreamerInfos.Add(NewCxxStreamerInfo("TLeafElement", 1, 0xa04f8893, []rbytes.StreamerElement{
4805+
StreamerInfos.Add(NewCxxStreamerInfo("TLeafObject", 4, 0x26ba7c4c, []rbytes.StreamerElement{
47934806
NewStreamerBase(Element{
47944807
Name: *rbase.NewNamed("TLeaf", "Leaf: description of a Branch data type"),
47954808
Type: rmeta.Base,
@@ -4804,27 +4817,14 @@ func init() {
48044817
Factor: 0.000000,
48054818
}.New(), 2),
48064819
&StreamerBasicType{StreamerElement: Element{
4807-
Name: *rbase.NewNamed("fID", "element serial number in fInfo"),
4808-
Type: rmeta.Int,
4809-
Size: 4,
4810-
ArrLen: 0,
4811-
ArrDim: 0,
4812-
MaxIdx: [5]int32{0, 0, 0, 0, 0},
4813-
Offset: 0,
4814-
EName: "int",
4815-
XMin: 0.000000,
4816-
XMax: 0.000000,
4817-
Factor: 0.000000,
4818-
}.New()},
4819-
&StreamerBasicType{StreamerElement: Element{
4820-
Name: *rbase.NewNamed("fType", "leaf type"),
4821-
Type: rmeta.Int,
4822-
Size: 4,
4820+
Name: *rbase.NewNamed("fVirtual", "Support for polymorphism, when set classname is written with object."),
4821+
Type: rmeta.Bool,
4822+
Size: 1,
48234823
ArrLen: 0,
48244824
ArrDim: 0,
48254825
MaxIdx: [5]int32{0, 0, 0, 0, 0},
48264826
Offset: 0,
4827-
EName: "int",
4827+
EName: "bool",
48284828
XMin: 0.000000,
48294829
XMax: 0.000000,
48304830
Factor: 0.000000,

‎groot/rtree/writer_example_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ func Example_createEventNtupleNoSplit() {
482482
// -- filled tree with 5 entries
483483
// -- read back ROOT file
484484
// === [../testdata/groot-event-ntuple-nosplit.root] ===
485-
// version: 62400
485+
// version: 62406
486486
// TTree mytree (entries=5)
487487
// evt "evt" TBranchElement
488488
//
@@ -627,7 +627,7 @@ func Example_createEventNtupleFullSplit() {
627627
// -- filled tree with 5 entries
628628
// -- read back ROOT file
629629
// === [../testdata/groot-event-ntuple-fullsplit.root] ===
630-
// version: 62400
630+
// version: 62406
631631
// TTree mytree (entries=5)
632632
// i32 "i32/I" TBranch
633633
// f64 "f64/D" TBranch

‎groot/rvers/versions_gen.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package rvers
88

99
// ROOT version
10-
const ROOT = 62400
10+
const ROOT = 62406
1111

1212
// ROOT classes versions
1313
const (
@@ -86,13 +86,13 @@ const (
8686
ROOT_IOFeatures = 1 // ROOT version for ROOT::TIOFeatures
8787
Basket = 3 // ROOT version for TBasket
8888
Branch = 13 // ROOT version for TBranch
89-
BranchObject = 1 // ROOT version for TBranchObject
9089
BranchElement = 10 // ROOT version for TBranchElement
90+
BranchObject = 1 // ROOT version for TBranchObject
9191
BranchRef = 1 // ROOT version for TBranchRef
9292
Chain = 5 // ROOT version for TChain
9393
Leaf = 2 // ROOT version for TLeaf
94-
LeafObject = 4 // ROOT version for TLeafObject
9594
LeafElement = 1 // ROOT version for TLeafElement
95+
LeafObject = 4 // ROOT version for TLeafObject
9696
LeafO = 1 // ROOT version for TLeafO
9797
LeafB = 1 // ROOT version for TLeafB
9898
LeafS = 1 // ROOT version for TLeafS

0 commit comments

Comments
 (0)