Skip to content
Snippets Groups Projects
Commit 8b0fd1bd authored by Brian Bockelman's avatar Brian Bockelman Committed by Philippe Canal
Browse files

Disable offset-generation-skipping for correct leaves.

This fixes an issue where offset-generation-skipping was incorrectly disabled
for TLeafO (which is Bool_t, not TObects!) but enabled for TLeafElement and
TLeafObject.

It is intended that more fine-grained whitelisting of objects in TLeafElement
and TLeafObject will be done in the future.
parent eb65cf22
No related branches found
No related tags found
No related merge requests found
......@@ -39,6 +39,8 @@ public:
TLeafElement(TBranch *parent, const char *name, Int_t id, Int_t type);
virtual ~TLeafElement();
virtual Bool_t CanGenerateOffsetArray() { return false; }
virtual Int_t *GenerateOffsetArrayBase(Int_t /*base*/, Int_t /*events*/) { return nullptr; }
virtual Int_t GetLen() const {return ((TBranchElement*)fBranch)->GetNdata()*fLen;}
TMethodCall *GetMethodCall(const char *name);
virtual Int_t GetMaximum() const {return ((TBranchElement*)fBranch)->GetMaximum();}
......
......@@ -36,10 +36,8 @@ public:
TLeafO(TBranch *parent, const char *name, const char *type);
virtual ~TLeafO();
virtual Bool_t CanGenerateOffsetArray() { return false; }
virtual void Export(TClonesArray *list, Int_t n);
virtual void FillBasket(TBuffer &b);
virtual Int_t *GenerateOffsetArrayBase(Int_t base, Int_t events) { return nullptr; }
virtual Int_t GetMaximum() const {return fMaximum;}
virtual Int_t GetMinimum() const {return fMinimum;}
const char *GetTypeName() const;
......
......@@ -53,7 +53,9 @@ public:
TLeafObject(TBranch *parent, const char *name, const char *type);
virtual ~TLeafObject();
virtual Bool_t CanGenerateOffsetArray() { return false; }
virtual void FillBasket(TBuffer &b);
virtual Int_t *GenerateOffsetArrayBase(Int_t /*base*/, Int_t /*events*/) { return nullptr; }
TClass *GetClass() const {return fClass;}
TMethodCall *GetMethodCall(const char *name);
TObject *GetObject() const {return (TObject*)(*fObjAddress);}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment