Skip to content

Refactoring interface for incrementing the entry pointer #19

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

Closed
strykejern wants to merge 1 commit into from
Closed

Refactoring interface for incrementing the entry pointer #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tree/treeplayer/inc/TTreeReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class TTreeReader: public TObject {

Bool_t IsChain() const { return TestBit(kBitIsChain); }

Bool_t SetNextEntry() { return SetEntry(GetCurrentEntry() + 1) == kEntryValid; }
Bool_t Next() { return SetEntry(GetCurrentEntry() + 1) == kEntryValid; }
EEntryStatus SetEntry(Long64_t entry) { return SetEntryBase(entry, kFALSE); }
EEntryStatus SetLocalEntry(Long64_t entry) { return SetEntryBase(entry, kTRUE); }

Expand Down
44 changes: 22 additions & 22 deletions tree/treeplayer/test/hardTreeReaderTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void readNum(const char* branchName = "A99.", Bool_t printOut = true, Bool_t tes
// Bool_t success = !myNum.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (testValues && *myNum != NUM_CONSTANT) success = false;
if (printOut) printf("Num: %i\n", *myNum);
Expand All @@ -198,7 +198,7 @@ void readBObject(const char* branchName = "A99.", Bool_t printOut = true, Bool_t
// Bool_t success = !myBObject.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (testValues && myBObject->dummy != i * MULTIPLIER_B_OBJECT) success = false;
if (printOut) printf("Dummy: %i\n", myBObject->dummy);
Expand All @@ -218,7 +218,7 @@ void readBObjectBranch(const char* branchName = "A99.", Bool_t printOut = true,
// Bool_t success = !myBObject.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (testValues && myBObject->dummy != i * MULTIPLIER_B_OBJECT) success = false;
if (printOut) printf("Dummy: %i\n", myBObject->dummy);
Expand All @@ -238,7 +238,7 @@ void readBObjectDummy(const char* branchName = "A99.", Bool_t printOut = true, B
// Bool_t success = !myDummy.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (testValues && *myDummy != i * MULTIPLIER_B_OBJECT) success = false;
if (printOut) printf("Dummy: %i\n", *myDummy);
Expand All @@ -258,7 +258,7 @@ void readBStar(const char* branchName = "A99.", Bool_t printOut = true, Bool_t t
// Bool_t success = !myBStar.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (testValues && myBStar->dummy != i * MULTIPLIER_B_STAR) success = false;
if (printOut) printf("Dummy: %i\n", myBStar->dummy);
Expand All @@ -278,7 +278,7 @@ void readVectorBValue(const char* branchName = "A99.", Bool_t printOut = true, B
// Bool_t success = !myVectorB.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("vectorB dummies:");

Expand All @@ -304,7 +304,7 @@ void readVectorStarBValue(const char* branchName = "A99.", Bool_t printOut = tru
// Bool_t success = !myVectorStarB.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("vectorB dummies(%lu):", myVectorStarB->size());

Expand All @@ -330,7 +330,7 @@ void readVectorStarBArray(const char* branchName = "A99.", Bool_t printOut = tru
// Bool_t success = !myVectorStarB.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("vectorB dummies(%lu):", myVectorStarB.GetSize());

Expand All @@ -356,7 +356,7 @@ void readVectorBArray(const char* branchName = "A99.", Bool_t printOut = true, B
// Bool_t success = !myVectorB.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("vectorB dummies(%lu):", myVectorB.GetSize());

Expand All @@ -382,7 +382,7 @@ void readBArray(const char* branchName = "A99.", Bool_t printOut = true, Bool_t
// Bool_t success = !myBArray.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("BArray dummies(%lu):", myBArray.GetSize());

Expand All @@ -408,7 +408,7 @@ void readBStarArray(const char* branchName = "A99.", Bool_t printOut = true, Boo
// Bool_t success = !myBStarArray.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("BStarArray dummies(%lu):", myBStarArray.GetSize());

Expand All @@ -434,7 +434,7 @@ void readVectorBStarValue(const char* branchName = "A99.", Bool_t printOut = tru
// Bool_t success = !myVectorBStar.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("vectorBStar dummies(%lu):", myVectorBStar->size());

Expand All @@ -460,7 +460,7 @@ void readVectorBStarArray(const char* branchName = "A99.", Bool_t printOut = tru
// Bool_t success = !myVectorBStar.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("vectorBStar dummies(%lu):", myVectorBStar.GetSize());

Expand All @@ -486,7 +486,7 @@ void readBClonesArrayValue(const char* branchName = "A99.", Bool_t printOut = tr
// Bool_t success = !myBClonesArray.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("BClonesArray dummies(%i):", myBClonesArray->GetEntries());

Expand All @@ -512,7 +512,7 @@ void readBClonesArrayArray(const char* branchName = "A99.", Bool_t printOut = tr
// Bool_t success = !myBClonesArray.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("BClonesArray dummies(%lu):", myBClonesArray.GetSize());

Expand All @@ -538,7 +538,7 @@ void readVectorBDummyArray(const char* branchName = "A99.", Bool_t printOut = tr
// Bool_t success = !myVectorBDummyArray.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("vectorB.dummies(%lu):", myVectorBDummyArray.GetSize());

Expand All @@ -564,7 +564,7 @@ void readBClonesArrayDummyArray(const char* branchName = "A99.", Bool_t printOut
// Bool_t success = !myBClonesArrayDummy.GetSetupStatus();
Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("BClonesArray.dummies(%lu):", myBClonesArrayDummy.GetSize());

Expand All @@ -588,7 +588,7 @@ void readLeafFloatX(Bool_t printOut = true, Bool_t testValues = false, const cha

Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (testValues && *myFloat - (Float_t)i > 0.0001f) success = false;
if (printOut) printf("MyLeafList.x: %f\n", *myFloat);
Expand All @@ -607,7 +607,7 @@ void readLeafFloatY(Bool_t printOut = true, Bool_t testValues = false, const cha

Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (testValues && *myFloat - ((Float_t)i / 10.0f) > 0.0001f) success = false;
if (printOut) printf("MyLeafList.y: %f\n", *myFloat);
Expand All @@ -626,7 +626,7 @@ void readLeafIntN(Bool_t printOut = true, Bool_t testValues = false, const char*

Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (testValues && *myInt != MYDOUBLEARRAY_SIZE) success = false;
if (printOut) printf("MyLeafList.n: %i\n", *myInt);
Expand All @@ -645,7 +645,7 @@ void readLeafDoubleAArray(Bool_t printOut = true, Bool_t testValues = false, con

Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("MyLeafList.a(%lu):", myDoubles.GetSize());

Expand All @@ -670,7 +670,7 @@ void readLeafBoolBArray(Bool_t printOut = true, Bool_t testValues = false, const

Bool_t success = true;
Bool_t read = false;
for (int i = 1; myTreeReader.SetNextEntry(); ++i){
for (int i = 1; myTreeReader.Next(); ++i){
read = true;
if (printOut) printf("MyLeafList.b(%lu):", myBools.GetSize());

Expand Down
4 changes: 2 additions & 2 deletions tree/treeplayer/test/tread.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void tread_obj() {
TFile* f = TFile::Open("tr.root");
TTreeReader tr("T");
TTreeReaderValue< MyParticle > p(tr, "p");
while (tr.SetNextEntry()) {
while (tr.Next()) {
printf("Particle momentum: %g\n", *p->P());
}
delete f;
Expand All @@ -29,7 +29,7 @@ void tread_makeclass() {
TFile* f = TFile::Open("tr.root");
TTreeReader tr("T");
TTreeReaderArray<double> e(tr, "v.fPos.fY");
while (tr.SetNextEntry()) {
while (tr.Next()) {
if (!e.IsEmpty())
printf("lead muon energy: %g\n", e.At(0));
}
Expand Down
2 changes: 1 addition & 1 deletion tutorials/tree/TreeReaderSimple.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ void TreeReaderSimple() {
TTreeReaderValue<Float_t> myPx(myHSimpleReader, "px");
TTreeReaderValue<Float_t> myPy(myHSimpleReader, "py");

while (myHSimpleReader.SetNextEntry()){
while (myHSimpleReader.Next()){
myHistogram->Fill(*myPx + *myPy);
}

Expand Down