In TBranchElement::Print use the correct StreamerInfo in case of sche…

…ma evolution
roofit-dev · Nov 6, 2018 · 82fad76 · 82fad76
1 parent 77ff023
commit 82fad76
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/tree/tree/src/TBranchElement.cxx b/tree/tree/src/TBranchElement.cxx
@@ -3671,9 +3671,17 @@ static void PrintElements(const TStreamerInfo *info, const TStreamerInfoActions:
 {
    for(auto &cursor : ids) {
       auto id = cursor.fElemID;
-      if (id >= 0)
-         info->GetElement(id)->ls();
-      else if (cursor.fNestedIDs) {
+      if (id >= 0) {
+         auto el = info->GetElement(id);
+         if (el)
+            el->ls();
+         else {
+            Error("TBranchElement::Print", "Element for id #%d not found in StreamerInfo for %s",
+                  id, info->GetName());
+            info->ls();
+            TClass::GetClass("PFTauWith")->GetStreamerInfos()->ls();
+         }
+      } else if (cursor.fNestedIDs) {
          Printf("      Within subobject of type %s offset = %d", cursor.fNestedIDs->fInfo->GetName(), cursor.fNestedIDs->fOffset);
          PrintElements(cursor.fNestedIDs->fInfo, cursor.fNestedIDs->fIDs);
       }
@@ -3729,7 +3737,8 @@ void TBranchElement::Print(Option_t* option) const
       } else if (!fNewIDs.empty() && GetInfoImp()) {
          TStreamerInfo *localInfo = GetInfoImp();
          if (fType == 3 || fType == 4) {
-            localInfo = (TStreamerInfo *)fClonesClass->GetStreamerInfo();
+            // Search for the correct version.
+            localInfo = FindOnfileInfo(fClonesClass, fBranches);
          }
          PrintElements(localInfo, fNewIDs);
          Printf("   with read actions:");