Skip to content

[tree] Prepare ROOT for a TEntryList without auto-registration #22940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hageboeck merged 2 commits into from
Jul 28, 2026
+53 −116
Merged

[tree] Prepare ROOT for a TEntryList without auto-registration #22940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85289f7
Prepare tests for disabling the auto-registration of TEntryList.
hageboeck Jul 22, 2026
631870b
[NFC] Apply clang-tidy member initializer fixes to TEntryList.
hageboeck Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions test/stressEntryList.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
// *******************Deleting the data files****************************
// **********************************************************************

#include <map>
#include <list>
#include <array>
#include <functional>
Expand All @@ -52,7 +51,6 @@
#include "TFile.h"
#include "TSystem.h"
#include "TError.h"
#include "snprintf.h"

Int_t stressEntryList(Int_t nentries = 10000, Int_t nfiles = 10);
void MakeTrees(Int_t nentries, Int_t nfiles);
Expand Down Expand Up @@ -219,8 +217,10 @@ Bool_t Test2()
TCut cut1("cut1", "x>0");
TCut cut2("cut2", "y<0.1 && y>-0.1");
TEntryList *elist1 = new TEntryList("elist1", "elist1");
chain->Draw(">>elist1", cut1, "entrylist");
TEntryList *elist2 = new TEntryList("elist2", "elist2");
elist1->SetDirectory(gDirectory);
elist2->SetDirectory(gDirectory);
chain->Draw(">>elist1", cut1, "entrylist");
chain->Draw(">>elist2", cut2, "entrylist");

//add those 2 lists (1+2)
Expand All @@ -229,6 +229,7 @@ Bool_t Test2()
elistsum->Add(elist2);

TEntryList *elistcheck = new TEntryList("elistcheck", "elistcheck");
elistcheck->SetDirectory(gDirectory);
chain->Draw(">>elistcheck", cut1 || cut2, "entrylist");

Int_t n=elistcheck->GetN();
Expand Down Expand Up @@ -264,6 +265,7 @@ Bool_t Test2()

//add by using "+" in TTree::Draw
TEntryList *elistsum3 = new TEntryList("elistsum3", "elistsum3");
elistsum3->SetDirectory(gDirectory);
chain->Draw(">>elistsum3", cut1, "entrylist");
chain->Draw(">>+elistsum3", cut2, "entrylist");
wrongentries3 = 0;
Expand All @@ -282,6 +284,7 @@ Bool_t Test2()
elistsum->Subtract(elist2);
n = elistsum->GetN();
TEntryList *elistcheck2 = new TEntryList("elistcheck2","elistcheck2");
elistcheck2->SetDirectory(gDirectory);
chain->Draw(">>elistcheck2", cut1 && !cut2, "entrylist");

wrongentries4 = 0;
Expand Down
42 changes: 21 additions & 21 deletions tree/tree/inc/TEntryList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,27 @@ class TEntryList: public TNamed
TEntryList& operator=(const TEntryList&); // Not implemented

protected:
TList *fLists; ///< a list of underlying entry lists for each tree of a chain
TEntryList *fCurrent; ///<! currently filled entry list

Int_t fNBlocks; ///< number of TEntryListBlocks
TObjArray *fBlocks; ///< blocks with indices of passing events (TEntryListBlocks)
Long64_t fN; ///< number of entries in the list
Long64_t fEntriesToProcess; ///< used on proof to set the number of entries to process in a packet
TString fTreeName; ///< name of the tree
TString fFileName; ///< name of the file, where the tree is
ULong_t fStringHash; ///<! Hash value of a string of treename and filename
Int_t fTreeNumber; ///<! the index of the tree in the chain (used when the entry
///< list is used as input (TTree::SetEntryList())

Long64_t fLastIndexQueried; ///<! used to optimize GetEntry() function from a loop
Long64_t fLastIndexReturned; ///<! used to optimize GetEntry() function from a loop
bool fShift; ///<! true when some sub-lists don't correspond to trees
///< (when the entry list is used as input in TChain)
TDirectory *fDirectory; ///<! Pointer to directory holding this tree
bool fReapply; ///< If true, TTree::Draw will 'reapply' the original cut

void GetFileName(const char *filename, TString &fn, bool * = nullptr);
TList *fLists = nullptr; ///< a list of underlying entry lists for each tree of a chain
TEntryList *fCurrent = nullptr; ///<! currently filled entry list

Int_t fNBlocks = 0; ///< number of TEntryListBlocks
TObjArray *fBlocks = nullptr; ///< blocks with indices of passing events (TEntryListBlocks)
Long64_t fN = 0; ///< number of entries in the list
Long64_t fEntriesToProcess = 0; ///< used on proof to set the number of entries to process in a packet
TString fTreeName; ///< name of the tree
TString fFileName; ///< name of the file, where the tree is
ULong_t fStringHash = 0; ///<! Hash value of a string of treename and filename
Int_t fTreeNumber = -1; ///<! the index of the tree in the chain (used when the entry
///< list is used as input (TTree::SetEntryList())

Long64_t fLastIndexQueried = -1; ///<! used to optimize GetEntry() function from a loop
Long64_t fLastIndexReturned = 0; ///<! used to optimize GetEntry() function from a loop
bool fShift = false; ///<! true when some sub-lists don't correspond to trees
///< (when the entry list is used as input in TChain)
TDirectory *fDirectory = nullptr; ///<! Pointer to directory holding this tree
bool fReapply = false; ///< If true, TTree::Draw will 'reapply' the original cut

void GetFileName(const char *filename, TString &fn, bool * = nullptr);

public:
enum {kBlockSize = 64000}; //number of entries in each block (not the physical size).
Expand Down
117 changes: 25 additions & 92 deletions tree/tree/src/TEntryList.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,136 +165,71 @@ End_Macro
////////////////////////////////////////////////////////////////////////////////
/// default c-tor

TEntryList::TEntryList() : fEntriesToProcess(0)
{
fLists = nullptr;
fCurrent = nullptr;
fBlocks = nullptr;
fN = 0;
fNBlocks = 0;
fTreeName = "";
fFileName = "";
fStringHash = 0;
fTreeNumber = -1;
fDirectory = nullptr;
fReapply = false;
fLastIndexQueried = -1;
fLastIndexReturned = 0;
fShift = false;
}
TEntryList::TEntryList() = default;

////////////////////////////////////////////////////////////////////////////////
/// c-tor with name and title

TEntryList::TEntryList(const char *name, const char *title) :
TNamed(name, title),
fEntriesToProcess(0)
TEntryList::TEntryList(const char *name, const char *title) : TNamed(name, title)
{
fLists = nullptr;
fCurrent = nullptr;
fBlocks = nullptr;
fN = 0;
fNBlocks = 0;
fTreeName = "";
fFileName = "";
fStringHash = 0;
fTreeNumber = -1;
fReapply = false;

fDirectory = gDirectory;
if (fDirectory) fDirectory->Append(this);

fLastIndexQueried = -1;
fLastIndexReturned = 0;
fShift = false;
if (fDirectory)
fDirectory->Append(this);
}

////////////////////////////////////////////////////////////////////////////////
/// constructor with name and title, which also sets the tree

TEntryList::TEntryList(const char *name, const char *title, const TTree *tree):TNamed(name, title)
TEntryList::TEntryList(const char *name, const char *title, const TTree *tree) : TNamed(name, title)
{
fLists = nullptr;
fCurrent = nullptr;
fBlocks = nullptr;
fN = 0;
fNBlocks = 0;
fTreeNumber = -1;
TEntryList::SetTree(tree);
fReapply = false;

fDirectory = gDirectory;
if (fDirectory) fDirectory->Append(this);

fLastIndexQueried = -1;
fLastIndexReturned = 0;
fShift = false;
if (fDirectory)
fDirectory->Append(this);
}

////////////////////////////////////////////////////////////////////////////////
/// c-tor with name and title, which also sets the treename and the filename

TEntryList::TEntryList(const char *name, const char *title, const char *treename, const char *filename) : TNamed(name, title),fEntriesToProcess(0)
TEntryList::TEntryList(const char *name, const char *title, const char *treename, const char *filename)
: TNamed(name, title)
{
fLists = nullptr;
fCurrent = nullptr;
fBlocks = nullptr;
fNBlocks = 0;
fN = 0;
SetTree(treename, filename);
fTreeNumber = -1;
fReapply = false;

fDirectory = gDirectory;
if (fDirectory) fDirectory->Append(this);

fLastIndexQueried = -1;
fLastIndexReturned = 0;
fShift = false;
if (fDirectory)
fDirectory->Append(this);
}

////////////////////////////////////////////////////////////////////////////////
/// c-tor, which sets the tree

TEntryList::TEntryList(const TTree *tree) : fEntriesToProcess(0)
TEntryList::TEntryList(const TTree *tree)
{
fLists = nullptr;
fCurrent = nullptr;
fBlocks = nullptr;
fNBlocks = 0;
fN = 0;

SetTree(tree);
fTreeNumber = -1;

fReapply = false;
fDirectory = gDirectory;
if (fDirectory) fDirectory->Append(this);

fLastIndexQueried = -1;
fLastIndexReturned = 0;
fShift = false;
if (fDirectory)
fDirectory->Append(this);
}

////////////////////////////////////////////////////////////////////////////////
/// copy c-tor

TEntryList::TEntryList(const TEntryList &elist) : TNamed(elist)
TEntryList::TEntryList(const TEntryList &elist)
: TNamed(elist),
fNBlocks(elist.fNBlocks),
fN(elist.fN),
fEntriesToProcess(elist.fEntriesToProcess),
fTreeName(elist.fTreeName),
fFileName(elist.fFileName),
fStringHash(elist.fStringHash),
fTreeNumber(elist.fTreeNumber),
fShift(elist.fShift),
fReapply(elist.fReapply)
{
fNBlocks = elist.fNBlocks;
fTreeName = elist.fTreeName;
fFileName = elist.fFileName;
fStringHash = elist.fStringHash;
fTreeNumber = elist.fTreeNumber;
fLastIndexQueried = -1;
fLastIndexReturned = 0;
fN = elist.fN;
fShift = elist.fShift;
fLists = nullptr;
fBlocks = nullptr;
fReapply = elist.fReapply;
fCurrent = nullptr;
fEntriesToProcess = elist.fEntriesToProcess;
if (elist.fLists){
fLists = new TList();
TEntryList *el1 = nullptr;
Expand All @@ -320,8 +255,6 @@ TEntryList::TEntryList(const TEntryList &elist) : TNamed(elist)
}
fCurrent = this;
}
fDirectory = nullptr;

}

////////////////////////////////////////////////////////////////////////////////
Expand Down
1 change: 1 addition & 0 deletions tree/treeplayer/src/TTreeTableInterface.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ void TTreeTableInterface::SyncFormulas()
void TTreeTableInterface::InitEntries()
{
TEntryList *entrylist = new TEntryList(fTree);
entrylist->SetDirectory(fTree->GetDirectory());

UInt_t ui = 0;
Int_t i = 0;
Expand Down
Loading