Skip to content

Commit

Permalink
groot/{rcmd,rdict,rhist,riofs,rvers}: add r/w support for TConfidence…
Browse files Browse the repository at this point in the history 
…Level and TLimit{,DataSource}
  • Loading branch information
@sbinet
sbinet committed Feb 1, 2022
1 parent ffc817e commit 129831f
Show file tree
Hide file tree
Showing 10 changed files with 745 additions and 0 deletions.
2 changes: 2 additions & 0 deletions groot/gen.rboot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@ var (

// rhist
"TAxis",
"TConfidenceLevel",
"TF1",
"TF1AbsComposition", "TF1Convolution", "TF1NormSum", "TF1Parameters",
"TFormula",
"TGraph", "TGraphErrors", "TGraphAsymmErrors",
"TH1", "TH1C", "TH1D", "TH1F", "TH1I", "TH1K", "TH1S",
"TH2", "TH2C", "TH2D", "TH2F", "TH2I", "TH2Poly", "TH2PolyBin", "TH2S",
"TLimit", "TLimitDataSource",

// riofs
"TDirectory",
Expand Down
7 changes: 7 additions & 0 deletions groot/rcmd/dump_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,13 @@ key[002]: func3;1 "func3" (TF1) => "TF1{Params: TF1Parameters{Values: [1 -0.3 0
key[003]: func4;1 "func4" (TF1) => "TF1{Params: TF1Parameters{Values: [0 0 0 0 0 0], Names: [p0 p1 p2 p3 p4 p5]}}"
key[004]: fconv;1 "" (TF1Convolution) => "TF1Convolution{Func1: TF1{Formula: TFormula{exp([Constant]+[Slope]*x)}}, Func2: TF1{Formula: TFormula{[Constant]*exp(-0.5*((x-[Mean])/[Sigma])*((x-[Mean])/[Sigma]))}}}"
key[005]: fnorm;1 "" (TF1NormSum) => "TF1Convolution{Funcs: []{TF1{Formula: TFormula{[p0]+[p1]*x}}, TF1{Params: TF1Parameters{Values: [10 20], Names: [p0 p1]}}}, Coeffs: [10 20]}"
`,
},
{
name: "../testdata/tconfidence-level.root",
want: `key[000]: clvl;1 "output for TLimit functions" (TConfidenceLevel) => ignoring key of type *rhist.ConfidenceLevel
key[001]: limit;1 "object title" (TLimit) => ignoring key of type *rhist.Limit
key[002]: dsrc;1 "input for TLimit routines" (TLimitDataSource) => ignoring key of type *rhist.LimitDataSource
`,
},
} {
Expand Down
317 changes: 317 additions & 0 deletions groot/rdict/cxx_root_streamers_gen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1716,6 +1716,203 @@ func init() {
Factor: 0.000000,
}.New()},
}))
StreamerInfos.Add(NewCxxStreamerInfo("TConfidenceLevel", 1, 0xe0b6ba08, []rbytes.StreamerElement{
NewStreamerBase(Element{
Name: *rbase.NewNamed("TObject", "Basic ROOT object"),
Type: rmeta.Base,
Size: 0,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, -1877229523, 0, 0, 0},
Offset: 0,
EName: "BASE",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New(), 1),
&StreamerBasicType{StreamerElement: Element{
Name: *rbase.NewNamed("fNNMC", ""),
Type: rmeta.Counter,
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("fDtot", ""),
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("fStot", ""),
Type: rmeta.Double,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerBasicType{StreamerElement: Element{
Name: *rbase.NewNamed("fBtot", ""),
Type: rmeta.Double,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerBasicType{StreamerElement: Element{
Name: *rbase.NewNamed("fTSD", ""),
Type: rmeta.Double,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerBasicType{StreamerElement: Element{
Name: *rbase.NewNamed("fNMC", ""),
Type: rmeta.Double,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerBasicType{StreamerElement: Element{
Name: *rbase.NewNamed("fMCL3S", ""),
Type: rmeta.Double,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerBasicType{StreamerElement: Element{
Name: *rbase.NewNamed("fMCL5S", ""),
Type: rmeta.Double,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
NewStreamerBasicPointer(Element{
Name: *rbase.NewNamed("fTSB", "[fNNMC]"),
Type: 48,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double*",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New(), 1, "fNNMC", "TConfidenceLevel"),
NewStreamerBasicPointer(Element{
Name: *rbase.NewNamed("fTSS", "[fNNMC]"),
Type: 48,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double*",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New(), 1, "fNNMC", "TConfidenceLevel"),
NewStreamerBasicPointer(Element{
Name: *rbase.NewNamed("fLRS", "[fNNMC]"),
Type: 48,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double*",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New(), 1, "fNNMC", "TConfidenceLevel"),
NewStreamerBasicPointer(Element{
Name: *rbase.NewNamed("fLRB", "[fNNMC]"),
Type: 48,
Size: 8,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "double*",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New(), 1, "fNNMC", "TConfidenceLevel"),
NewStreamerBasicPointer(Element{
Name: *rbase.NewNamed("fISS", "[fNNMC]"),
Type: 43,
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(), 1, "fNNMC", "TConfidenceLevel"),
NewStreamerBasicPointer(Element{
Name: *rbase.NewNamed("fISB", "[fNNMC]"),
Type: 43,
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(), 1, "fNNMC", "TConfidenceLevel"),
}))
StreamerInfos.Add(NewCxxStreamerInfo("TF1", 12, 0x7223ffd8, []rbytes.StreamerElement{
NewStreamerBase(Element{
Name: *rbase.NewNamed("TNamed", "The basis for a named object (name, title)"),
Expand Down Expand Up @@ -3740,6 +3937,126 @@ func init() {
Factor: 0.000000,
}.New(), 1),
}))
StreamerInfos.Add(NewCxxStreamerInfo("TLimit", 2, 0x785f, []rbytes.StreamerElement{}))
StreamerInfos.Add(NewCxxStreamerInfo("TLimitDataSource", 2, 0x20f07d45, []rbytes.StreamerElement{
NewStreamerBase(Element{
Name: *rbase.NewNamed("TObject", "Basic ROOT object"),
Type: rmeta.Base,
Size: 0,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, -1877229523, 0, 0, 0},
Offset: 0,
EName: "BASE",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New(), 1),
&StreamerObject{StreamerElement: Element{
Name: *rbase.NewNamed("fSignal", "packed input signal"),
Type: rmeta.Object,
Size: 64,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "TObjArray",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerObject{StreamerElement: Element{
Name: *rbase.NewNamed("fBackground", "packed input background"),
Type: rmeta.Object,
Size: 64,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "TObjArray",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerObject{StreamerElement: Element{
Name: *rbase.NewNamed("fCandidates", "packed input candidates (data)"),
Type: rmeta.Object,
Size: 64,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "TObjArray",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerObject{StreamerElement: Element{
Name: *rbase.NewNamed("fErrorOnSignal", "packed error sources for signal"),
Type: rmeta.Object,
Size: 64,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "TObjArray",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerObject{StreamerElement: Element{
Name: *rbase.NewNamed("fErrorOnBackground", "packed error sources for background"),
Type: rmeta.Object,
Size: 64,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "TObjArray",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerObject{StreamerElement: Element{
Name: *rbase.NewNamed("fIds", "packed IDs for the different error sources"),
Type: rmeta.Object,
Size: 64,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "TObjArray",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerObject{StreamerElement: Element{
Name: *rbase.NewNamed("fDummyTA", "array of dummy object (used for bookeeping)"),
Type: rmeta.Object,
Size: 64,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "TObjArray",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
&StreamerObject{StreamerElement: Element{
Name: *rbase.NewNamed("fDummyIds", "array of dummy object (used for bookeeping)"),
Type: rmeta.Object,
Size: 64,
ArrLen: 0,
ArrDim: 0,
MaxIdx: [5]int32{0, 0, 0, 0, 0},
Offset: 0,
EName: "TObjArray",
XMin: 0.000000,
XMax: 0.000000,
Factor: 0.000000,
}.New()},
}))
StreamerInfos.Add(NewCxxStreamerInfo("TDirectory", 5, 0x1e9b6f70, []rbytes.StreamerElement{
NewStreamerBase(Element{
Name: *rbase.NewNamed("TNamed", "The basis for a named object (name, title)"),
Expand Down
Loading

0 comments on commit 129831f

Please sign in to comment.