Skip to content
Snippets Groups Projects
Commit f20a1d12 authored by Philippe Canal's avatar Philippe Canal
Browse files

From Paul Russo: 

     o (LoadTree) We no longer delete clones from the trees in
       the chain, those trees still need to be able to synchronize
       their clones' branch addresses.  We now copy the chain's
       clone list into the newly fetched tree's clone list because
       it is the tree's destructor (which is called when we switch
       to the next file in the chain) that is responsible for
       resetting the addresses of the branches of the clone trees.
       If this is not done, the branches of the clone trees will
       be pointing at memory which was deallocated when the master
       tree was destroyed at the file switch.

     o (Merge) Improve documentation.


git-svn-id: http://root.cern.ch/svn/root/trunk@15795 27541ba8-7e3a-0410-8455-c3a389f83636
parent d5bad7b4
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
tree/inc/TChain.h
+ 47
− 45
View file @ f20a1d12
// @(#)root/tree:$Name: $:$Id: TChain.h,v 1.54 2006/06/27 14:36:27 brun Exp $
// @(#)root/tree:$Name: $:$Id: TChain.h,v 1.55 2006/07/04 10:23:52 rdm Exp $
// Author: Rene Brun 03/02/97
/*************************************************************************
......@@ -36,18 +36,21 @@ class TChain : public TTree {
protected:
Int_t fTreeOffsetLen; // Current size of fTreeOffset array
Int_t fNtrees; // Number of Trees
Int_t fNtrees; // Number of trees
Int_t fTreeNumber; //! Current Tree number in fTreeOffset table
Long64_t *fTreeOffset; //[fTreeOffsetLen]Array of variables
Bool_t fCanDeleteRefs; //! if true, TProcessIDs are deleted when closing a file
TTree *fTree; //! Pointer to current tree
TFile *fFile; //! Pointer to current file
TObjArray *fFiles; //-> List of file names containing the Trees
TList *fStatus; //-> List of active/inactive branches
TChainProof *fChainProof; //! wrapper class for a TDSet if this chain is to be
// procesed by PROOF
Long64_t *fTreeOffset; //[fTreeOffsetLen] Array of variables
Bool_t fCanDeleteRefs; //! If true, TProcessIDs are deleted when closing a file
TTree *fTree; //! Pointer to current tree (Note: We do *not* own this tree.)
TFile *fFile; //! Pointer to current file (We own the file).
TObjArray *fFiles; //-> List of file names containing the trees (TChainElement, owned)
TList *fStatus; //-> List of active/inactive branches (TChainElement, owned)
TChainProof *fChainProof; //! wrapper class for a TDSet if this chain is to be processed by PROOF
protected:
TChain(const TChain&);
TChain& operator=(const TChain&);
protected:
void ReleaseChainProof();
virtual TDSet *MakeTDSetWithoutFriends() const;
......@@ -58,73 +61,72 @@ public:
kAutoDelete = BIT(16),
kBigNumber = 1234567890
};
public:
TChain();
TChain(const char *name, const char *title="");
TChain(const char* name, const char* title = "");
virtual ~TChain();
virtual Int_t Add(TChain *chain);
virtual Int_t Add(const char *name, Long64_t nentries=kBigNumber);
virtual Int_t AddFile(const char *name, Long64_t nentries=kBigNumber, const char *tname="");
virtual Int_t AddFileInfoList(TList *list, Long64_t nfiles=kBigNumber);
virtual TFriendElement *AddFriend(const char *chainname, const char *dummy="");
virtual TFriendElement *AddFriend(const char *chainname, TFile *dummy);
virtual TFriendElement *AddFriend(TTree *chain, const char *alias, Bool_t warn = kFALSE);
virtual void Browse(TBrowser *b);
virtual void CanDeleteRefs(Bool_t flag=kTRUE);
virtual Int_t Add(TChain* chain);
virtual Int_t Add(const char* name, Long64_t nentries = kBigNumber);
virtual Int_t AddFile(const char* name, Long64_t nentries = kBigNumber, const char* tname = "");
virtual Int_t AddFileInfoList(TList* list, Long64_t nfiles = kBigNumber);
virtual TFriendElement *AddFriend(const char* chainname, const char* dummy = "");
virtual TFriendElement *AddFriend(const char* chainname, TFile* dummy);
virtual TFriendElement *AddFriend(TTree* chain, const char* alias, Bool_t warn = kFALSE);
virtual void Browse(TBrowser*);
virtual void CanDeleteRefs(Bool_t flag = kTRUE);
virtual void CreatePackets();
virtual Long64_t Draw(const char *varexp, const TCut &selection, Option_t *option=""
,Long64_t nentries=kBigNumber, Long64_t firstentry=0);
virtual Long64_t Draw(const char *varexp, const char *selection, Option_t *option=""
,Long64_t nentries=kBigNumber, Long64_t firstentry=0); // *MENU*
virtual void Draw(Option_t *opt) { Draw(opt, "", "", 1000000000, 0); }
virtual Int_t Fill() {MayNotUse("Fill()"); return -1;}
virtual TBranch *FindBranch(const char *name);
virtual TLeaf *FindLeaf(const char *name);
virtual TBranch *GetBranch(const char *name);
virtual Bool_t GetBranchStatus(const char *branchname) const;
virtual Long64_t Draw(const char* varexp, const TCut& selection, Option_t* option = "", Long64_t nentries = kBigNumber, Long64_t firstentry = 0);
virtual Long64_t Draw(const char* varexp, const char* selection, Option_t* option = "", Long64_t nentries = kBigNumber, Long64_t firstentry = 0); // *MENU*
virtual void Draw(Option_t* opt) { Draw(opt, "", "", 1000000000, 0); }
virtual Int_t Fill() { MayNotUse("Fill()"); return -1; }
virtual TBranch *FindBranch(const char* name);
virtual TLeaf *FindLeaf(const char* name);
virtual TBranch *GetBranch(const char* name);
virtual Bool_t GetBranchStatus(const char* branchname) const;
virtual Long64_t GetChainEntryNumber(Long64_t entry) const;
Int_t GetNtrees() const { return fNtrees; }
virtual Long64_t GetEntries() const;
virtual Int_t GetEntry(Long64_t entry=0, Int_t getall=0);
virtual Int_t GetEntryWithIndex(Int_t major, Int_t minor=0);
TFile *GetFile() const;
TLeaf *GetLeaf(const char *name);
TObjArray *GetListOfBranches();
virtual TLeaf *GetLeaf(const char* name);
virtual TObjArray *GetListOfBranches();
TObjArray *GetListOfFiles() const {return fFiles;}
TObjArray *GetListOfLeaves();
const char *GetAlias(const char *aliasName) const;
virtual TObjArray *GetListOfLeaves();
virtual const char *GetAlias(const char *aliasName) const;
virtual Double_t GetMaximum(const char *columname);
virtual Double_t GetMinimum(const char *columname);
virtual Int_t GetNbranches();
virtual Long64_t GetReadEntry() const;
TList *GetStatus() const { return fStatus; }
TTree *GetTree() const { return fTree; }
Int_t GetTreeNumber() const { return fTreeNumber; }
virtual TTree *GetTree() const { return fTree; }
virtual Int_t GetTreeNumber() const { return fTreeNumber; }
Long64_t *GetTreeOffset() const { return fTreeOffset; }
Int_t GetTreeOffsetLen() const { return fTreeOffsetLen; }
virtual Double_t GetWeight() const;
virtual Int_t LoadBaskets(Long64_t maxmemory);
Long64_t LoadTree(Long64_t entry);
virtual Long64_t LoadTree(Long64_t entry);
void Lookup();
virtual void Loop(Option_t *option="",Long64_t nentries=kBigNumber, Long64_t firstentry=0); // *MENU*
virtual void Loop(Option_t *option="", Long64_t nentries=kBigNumber, Long64_t firstentry=0); // *MENU*
virtual void ls(Option_t *option="") const;
virtual TDSet *MakeTDSet() const;
virtual Long64_t Merge(const char *name, Option_t *option = "");
virtual Long64_t Merge(TCollection *list, Option_t *option = "");
virtual Long64_t Merge(TFile *file, Int_t basketsize, Option_t *option="");
virtual void Print(Option_t *option="") const;
virtual Long64_t Process(const char *filename,Option_t *option="", Long64_t nentries=kBigNumber, Long64_t firstentry=0); // *MENU*
virtual Long64_t Process(TSelector *selector,Option_t *option="", Long64_t nentries=kBigNumber, Long64_t firstentry=0);
virtual Long64_t Process(const char *filename, Option_t *option="", Long64_t nentries=kBigNumber, Long64_t firstentry=0); // *MENU*
virtual Long64_t Process(TSelector *selector, Option_t *option="", Long64_t nentries=kBigNumber, Long64_t firstentry=0);
virtual void Reset(Option_t *option="");
virtual void ResetBranchAddresses();
virtual Long64_t Scan(const char *varexp="", const char *selection="", Option_t *option=""
,Long64_t nentries=1000000000, Long64_t firstentry=0); // *MENU*
virtual Long64_t Scan(const char *varexp="", const char *selection="", Option_t *option="", Long64_t nentries=1000000000, Long64_t firstentry=0); // *MENU*
virtual void SetAutoDelete(Bool_t autodel=kTRUE);
virtual void SetBranchAddress(const char *bname,void *add, TBranch **ptr = 0);
virtual void SetBranchAddress(const char *bname,void *add, TBranch **ptr, TClass *realClass, EDataType datatype, Bool_t isptr);
virtual void SetBranchAddress(const char *bname,void *add, TClass *realClass, EDataType datatype, Bool_t isptr);
virtual void SetBranchStatus(const char *bname,Bool_t status=1, UInt_t *found=0);
virtual void SetBranchStatus(const char *bname, Bool_t status=1, UInt_t *found=0);
virtual void SetDirectory(TDirectory *dir);
virtual void SetMakeClass(Int_t make) { TTree::SetMakeClass(make); if (fTree) fTree->SetMakeClass(make);}
virtual void SetPacketSize(Int_t size = 100);
......@@ -136,4 +138,4 @@ public:
ClassDef(TChain,5) //A chain of TTrees
};
#endif
#endif // ROOT_TChain
tree/src/TChain.cxx
+ 1086
− 859
View file @ f20a1d12
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment