From 53f42051d8fceedd3c8c52a572113aa1e30a720c Mon Sep 17 00:00:00 2001
From: Philippe Canal <pcanal@fnal.gov>
Date: Wed, 10 Feb 2021 16:29:13 -0600
Subject: [PATCH] AddLastBasket: do not update first basket start entry
---
tree/tree/src/TBranch.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tree/tree/src/TBranch.cxx b/tree/tree/src/TBranch.cxx
index 700fe0d5a06..fa71e647bfc 100644
--- a/tree/tree/src/TBranch.cxx
+++ b/tree/tree/src/TBranch.cxx
@@ -616,8 +616,12 @@ void TBranch::AddLastBasket(Long64_t startEntry)
Fatal("AddBasket","The last basket must have the highest entry number (%s/%lld/%d).",GetName(),startEntry,fWriteBasket);
}
- fBasketEntry[where] = startEntry;
- fBaskets.AddAtAndExpand(0,fWriteBasket);
+ // The first basket (should) always start at zero. If we are asked to update
+ // it, this likely to be from merging 'empty' branches (base class node and the likes)
+ if (where) {
+ fBasketEntry[where] = startEntry;
+ fBaskets.AddAtAndExpand(0,fWriteBasket);
+ }
}
////////////////////////////////////////////////////////////////////////////////
--
GitLab