From bb56c14269d7a8a2d455d774bfea3d42c029cb9b Mon Sep 17 00:00:00 2001
From: Simon Spies <simon.spies@sisesp.de>
Date: Fri, 1 Mar 2019 11:15:34 +0100
Subject: [PATCH] Changed Name of fStreamingInfo to fElement - Recommended by
pcanal
---
tree/tree/inc/TLeafD32.h | 10 +++++-----
tree/tree/inc/TLeafF16.h | 10 +++++-----
tree/tree/src/TBranch.cxx | 2 +-
tree/tree/src/TLeafD32.cxx | 22 +++++++++++-----------
tree/tree/src/TLeafF16.cxx | 24 ++++++++++++------------
5 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/tree/tree/inc/TLeafD32.h b/tree/tree/inc/TLeafD32.h
index 2bd0d6192df..48d0196d22b 100644
--- a/tree/tree/inc/TLeafD32.h
+++ b/tree/tree/inc/TLeafD32.h
@@ -26,11 +26,11 @@
class TLeafD32 : public TLeaf {
protected:
- Double32_t fMinimum; ///< Minimum value if leaf range is specified
- Double32_t fMaximum; ///< Maximum value if leaf range is specified
- Double32_t *fValue; ///<! Pointer to data buffer
- Double32_t **fPointer; ///<! Address of pointer to data buffer
- TStreamerElement *fStreamingInfo; ///<! StreamerElement used for TBuffer read / write
+ Double32_t fMinimum; ///< Minimum value if leaf range is specified
+ Double32_t fMaximum; ///< Maximum value if leaf range is specified
+ Double32_t *fValue; ///<! Pointer to data buffer
+ Double32_t **fPointer; ///<! Address of pointer to data buffer
+ TStreamerElement *fElement; ///<! StreamerElement used for TBuffer read / write
public:
TLeafD32();
diff --git a/tree/tree/inc/TLeafF16.h b/tree/tree/inc/TLeafF16.h
index 3cc6daba509..8a9137df194 100644
--- a/tree/tree/inc/TLeafF16.h
+++ b/tree/tree/inc/TLeafF16.h
@@ -26,11 +26,11 @@
class TLeafF16 : public TLeaf {
protected:
- Float16_t fMinimum; ///< Minimum value if leaf range is specified
- Float16_t fMaximum; ///< Maximum value if leaf range is specified
- Float16_t *fValue; ///<! Pointer to data buffer
- Float16_t **fPointer; ///<! Address of pointer to data buffer!
- TStreamerElement *fStreamingInfo; ///<! StreamerElement used for TBuffer read / write
+ Float16_t fMinimum; ///< Minimum value if leaf range is specified
+ Float16_t fMaximum; ///< Maximum value if leaf range is specified
+ Float16_t *fValue; ///<! Pointer to data buffer
+ Float16_t **fPointer; ///<! Address of pointer to data buffer!
+ TStreamerElement *fElement; ///<! StreamerElement used for TBuffer read / write
public:
TLeafF16();
diff --git a/tree/tree/src/TBranch.cxx b/tree/tree/src/TBranch.cxx
index 49e2a2b71fd..a2a5b5a039a 100644
--- a/tree/tree/src/TBranch.cxx
+++ b/tree/tree/src/TBranch.cxx
@@ -342,7 +342,7 @@ void TBranch::Init(const char* name, const char* leaflist, Int_t compress)
}
TLeaf* leaf = 0;
if (leaftype[1] == '[' && !strchr(leaftype, ',')) {
- Warning("TBranch", "Array size or range for branch '%s' must be specified after leaf name, not after the type name!", name);
+ Warning("TBranch", "Array size for branch '%s' must be specified after leaf name, not after the type name!", name);
// and continue for backward compatibility?
} else if (leaftype[1] && !strchr(leaftype, ',')) {
Warning("TBranch", "Extra characters after type tag '%s' for branch '%s'; must be one character.", leaftype, name);
diff --git a/tree/tree/src/TLeafD32.cxx b/tree/tree/src/TLeafD32.cxx
index de64478b53a..7cff811964c 100644
--- a/tree/tree/src/TLeafD32.cxx
+++ b/tree/tree/src/TLeafD32.cxx
@@ -33,7 +33,7 @@ TLeafD32::TLeafD32() : TLeaf()
fMaximum = 0;
fValue = nullptr;
fPointer = nullptr;
- fStreamingInfo = nullptr;
+ fElement = nullptr;
}
////////////////////////////////////////////////////////////////////////////////
@@ -46,11 +46,11 @@ TLeafD32::TLeafD32(TBranch *parent, const char *name, const char *type) : TLeaf(
fMaximum = 0;
fValue = nullptr;
fPointer = nullptr;
- fStreamingInfo = nullptr;
+ fElement = nullptr;
fTitle = type;
if (strchr(type, '['))
- fStreamingInfo = new TStreamerElement(Form("%s_StreamingInfo", name), type, 0, 0, "Double32_t");
+ fElement = new TStreamerElement(Form("%s_Element", name), type, 0, 0, "Double32_t");
}
////////////////////////////////////////////////////////////////////////////////
@@ -61,8 +61,8 @@ TLeafD32::~TLeafD32()
if (ResetAddress(nullptr, kTRUE))
delete[] fValue;
- if (fStreamingInfo)
- delete fStreamingInfo;
+ if (fElement)
+ delete fElement;
}
////////////////////////////////////////////////////////////////////////////////
@@ -85,7 +85,7 @@ void TLeafD32::FillBasket(TBuffer &b)
Int_t len = GetLen();
if (fPointer)
fValue = *fPointer;
- b.WriteFastArrayDouble32(fValue, len, fStreamingInfo);
+ b.WriteFastArrayDouble32(fValue, len, fElement);
}
////////////////////////////////////////////////////////////////////////////////
@@ -120,7 +120,7 @@ void TLeafD32::PrintValue(Int_t l) const
void TLeafD32::ReadBasket(TBuffer &b)
{
if (!fLeafCount && fNdata == 1) {
- b.ReadDouble32(fValue, fStreamingInfo);
+ b.ReadDouble32(fValue, fElement);
} else {
if (fLeafCount) {
Long64_t entry = fBranch->GetReadEntry();
@@ -133,9 +133,9 @@ void TLeafD32::ReadBasket(TBuffer &b)
len = fLeafCount->GetMaximum();
}
fNdata = len * fLen;
- b.ReadFastArrayDouble32(fValue, len * fLen, fStreamingInfo);
+ b.ReadFastArrayDouble32(fValue, len * fLen, fElement);
} else {
- b.ReadFastArrayDouble32(fValue, fLen, fStreamingInfo);
+ b.ReadFastArrayDouble32(fValue, fLen, fElement);
}
}
}
@@ -146,7 +146,7 @@ void TLeafD32::ReadBasket(TBuffer &b)
void TLeafD32::ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n)
{
- b.ReadFastArrayDouble32(fValue, n * fLen, fStreamingInfo);
+ b.ReadFastArrayDouble32(fValue, n * fLen, fElement);
Int_t j = 0;
for (Int_t i = 0; i < n; i++) {
@@ -205,7 +205,7 @@ void TLeafD32::Streamer(TBuffer &R__b)
R__b.ReadClassBuffer(TLeafD32::Class(), this);
if (fTitle.Contains("["))
- fStreamingInfo = new TStreamerElement(Form("%s_StreamingInfo", fName.Data()), fTitle.Data(), 0, 0, "Double32_t");
+ fElement = new TStreamerElement(Form("%s_Element", fName.Data()), fTitle.Data(), 0, 0, "Double32_t");
} else {
R__b.WriteClassBuffer(TLeafD32::Class(), this);
}
diff --git a/tree/tree/src/TLeafF16.cxx b/tree/tree/src/TLeafF16.cxx
index 06c95f548a6..922cae97c4d 100644
--- a/tree/tree/src/TLeafF16.cxx
+++ b/tree/tree/src/TLeafF16.cxx
@@ -33,7 +33,7 @@ TLeafF16::TLeafF16() : TLeaf()
fMaximum = 0;
fValue = nullptr;
fPointer = nullptr;
- fStreamingInfo = nullptr;
+ fElement = nullptr;
}
////////////////////////////////////////////////////////////////////////////////
@@ -46,11 +46,11 @@ TLeafF16::TLeafF16(TBranch *parent, const char *name, const char *type) : TLeaf(
fMaximum = 0;
fValue = nullptr;
fPointer = nullptr;
- fStreamingInfo = nullptr;
+ fElement = nullptr;
fTitle = type;
if (strchr(type, '['))
- fStreamingInfo = new TStreamerElement(Form("%s_StreamingInfo", name), type, 0, 0, "Float16_t");
+ fElement = new TStreamerElement(Form("%s_Element", name), type, 0, 0, "Float16_t");
}
////////////////////////////////////////////////////////////////////////////////
@@ -61,8 +61,8 @@ TLeafF16::~TLeafF16()
if (ResetAddress(nullptr, kTRUE))
delete[] fValue;
- if (fStreamingInfo)
- delete fStreamingInfo;
+ if (fElement)
+ delete fElement;
}
////////////////////////////////////////////////////////////////////////////////
@@ -89,7 +89,7 @@ void TLeafF16::FillBasket(TBuffer &b)
Int_t len = GetLen();
if (fPointer)
fValue = *fPointer;
- b.WriteFastArrayFloat16(fValue, len, fStreamingInfo);
+ b.WriteFastArrayFloat16(fValue, len, fElement);
}
////////////////////////////////////////////////////////////////////////////////
@@ -124,7 +124,7 @@ void TLeafF16::PrintValue(Int_t l) const
void TLeafF16::ReadBasket(TBuffer &b)
{
if (!fLeafCount && fNdata == 1) {
- b.ReadFloat16(fValue, fStreamingInfo);
+ b.ReadFloat16(fValue, fElement);
} else {
if (fLeafCount) {
Long64_t entry = fBranch->GetReadEntry();
@@ -137,9 +137,9 @@ void TLeafF16::ReadBasket(TBuffer &b)
len = fLeafCount->GetMaximum();
}
fNdata = len * fLen;
- b.ReadFastArrayFloat16(fValue, len * fLen, fStreamingInfo);
+ b.ReadFastArrayFloat16(fValue, len * fLen, fElement);
} else {
- b.ReadFastArrayFloat16(fValue, fLen, fStreamingInfo);
+ b.ReadFastArrayFloat16(fValue, fLen, fElement);
}
}
}
@@ -151,9 +151,9 @@ void TLeafF16::ReadBasket(TBuffer &b)
void TLeafF16::ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n)
{
if (n * fLen == 1) {
- b.ReadFloat16(fValue, fStreamingInfo);
+ b.ReadFloat16(fValue, fElement);
} else {
- b.ReadFastArrayFloat16(fValue, n * fLen, fStreamingInfo);
+ b.ReadFastArrayFloat16(fValue, n * fLen, fElement);
}
Float16_t *value = fValue;
@@ -218,7 +218,7 @@ void TLeafF16::Streamer(TBuffer &R__b)
R__b.ReadClassBuffer(TLeafF16::Class(), this);
if (fTitle.Contains("["))
- fStreamingInfo = new TStreamerElement(Form("%s_StreamingInfo", fName.Data()), fTitle.Data(), 0, 0, "Float16_t");
+ fElement = new TStreamerElement(Form("%s_Element", fName.Data()), fTitle.Data(), 0, 0, "Float16_t");
} else {
R__b.WriteClassBuffer(TLeafF16::Class(), this);
}
--
GitLab