Skip to content

TTreeReader(Value/Array) fix #2

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
Axel-Naumann merged 4 commits into from
Jul 9, 2013
Merged

TTreeReader(Value/Array) fix #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95e5522
Fixed pointer to STL vector for ROOT 6 in the Value Reader
strykejern Jul 9, 2013
c502f72
Fix to show correct warning in Array reader in ROOT 6
strykejern Jul 9, 2013
74d284d
Now able to type check all TClonesArrays in Array reader
strykejern Jul 9, 2013
471087b
Removed unused include
strykejern Jul 9, 2013
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
34 changes: 21 additions & 13 deletions tree/treeplayer/src/TTreeReaderArray.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,19 @@ void ROOT::TTreeReaderArrayBase::CreateProxy()
}
}

TString membername;

bool isTopLevel = branch->GetMother() == branch;
if (!isTopLevel) {
membername = strrchr(branch->GetName(), '.');
if (membername.IsNull()) {
membername = branch->GetName();
}
}
namedProxy = new ROOT::TNamedBranchProxy(fTreeReader->fDirector, branch, membername);
fTreeReader->GetProxies()->Add(namedProxy);
fProxy = namedProxy->GetProxy();

if (!myLeaf){
TString branchActualTypeName;
const char* nonCollTypeName = GetBranchContentDataType(branch, branchActualTypeName, branchActualType);
Expand Down Expand Up @@ -509,19 +522,6 @@ void ROOT::TTreeReaderArrayBase::CreateProxy()
} else if (branch->IsA() == TBranchRef::Class()) {
printf("TBranchRef\n"); // TODO: Remove (necessary because of gdb bug)
}

TString membername;

bool isTopLevel = branch->GetMother() == branch;
if (!isTopLevel) {
membername = strrchr(branch->GetName(), '.');
if (membername.IsNull()) {
membername = branch->GetName();
}
}
namedProxy = new ROOT::TNamedBranchProxy(fTreeReader->fDirector, branch, membername);
fTreeReader->GetProxies()->Add(namedProxy);
fProxy = namedProxy->GetProxy();
}

//______________________________________________________________________________
Expand Down Expand Up @@ -641,6 +641,14 @@ const char* ROOT::TTreeReaderArrayBase::GetBranchContentDataType(TBranch* branch
contentTypeName = dict->GetName();
return 0;
}
else if (element->IsA() == TStreamerObject::Class() && !strcmp(element->GetTypeName(), "TClonesArray")){
fProxy->Setup();
fProxy->Read();
TClonesArray *myArray = (TClonesArray*)fProxy->GetWhere();
dict = myArray->GetClass();
contentTypeName = dict->GetName();
return 0;
}
else {
dict = brElement->GetCurrentClass();
contentTypeName = brElement->GetTypeName();
Expand Down
16 changes: 16 additions & 0 deletions tree/treeplayer/src/TTreeReaderValue.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "TTreeProxyGenerator.h"
#include "TTreeReaderValue.h"
#include "TRegexp.h"
#include "TStreamerInfo.h"
#include "TStreamerElement.h"

////////////////////////////////////////////////////////////////////////////////
// //
Expand Down Expand Up @@ -207,6 +209,19 @@ const char* ROOT::TTreeReaderValueBase::GetBranchDataType(TBranch* branch,
if (brElement->GetType() == TBranchElement::kSTLNode ||
brElement->GetType() == TBranchElement::kLeafNode ||
brElement->GetType() == TBranchElement::kObjectNode) {

TStreamerInfo *streamerInfo = brElement->GetInfo();
Int_t id = brElement->GetID();

if (id >= 0){
TStreamerElement *element = (TStreamerElement*)streamerInfo->GetElements()->At(id);
if (element->IsA() == TStreamerSTL::Class()){
TStreamerSTL *myStl = (TStreamerSTL*)element;
dict = myStl->GetClass();
return 0;
}
}

if (brElement->GetTypeName()) dict = TDictionary::GetDictionary(brElement->GetTypeName());
if (dict && dict->IsA() == TDataType::Class()){
dict = TDictionary::GetDictionary(((TDataType*)dict)->GetTypeName());
Expand All @@ -220,6 +235,7 @@ const char* ROOT::TTreeReaderValueBase::GetBranchDataType(TBranch* branch,
else if (!dict) {
dict = brElement->GetCurrentClass();
}

return brElement->GetTypeName();
} else if (brElement->GetType() == TBranchElement::kClonesNode) {
dict = TClonesArray::Class();
Expand Down