Skip to content

Commit 2f0f392

Browse files
committed
Move TTreePlugin read error handling to separate PR
1 parent d369614 commit 2f0f392

1 file changed

Lines changed: 0 additions & 14 deletions

File tree

Framework/AnalysisSupport/src/TTreePlugin.cxx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,6 @@ auto readBoolValues = [](uint8_t* target, ReadOps& op, TBufferFile& rootBuffer)
211211
while (readEntries < op.rootBranchEntries) {
212212
auto beginValue = readEntries;
213213
readLast = op.branch->GetBulkRead().GetBulkEntries(readEntries, rootBuffer);
214-
if (readLast < 0) {
215-
throw runtime_error_f("Error while reading branch %s starting from %d.", op.branch->GetName(), readEntries);
216-
}
217214
int size = readLast * op.listSize;
218215
readEntries += readLast;
219216
for (int i = beginValue; i < beginValue + size; ++i) {
@@ -231,18 +228,7 @@ auto readVLAValues = [](uint8_t* target, ReadOps& op, ReadOps const& offsetOp, T
231228
rootBuffer.Reset();
232229
while (readEntries < op.rootBranchEntries) {
233230
auto readLast = op.branch->GetBulkRead().GetEntriesSerialized(readEntries, rootBuffer);
234-
if (readLast < 0) {
235-
throw runtime_error_f("Error while reading branch %s starting from %d.", op.branch->GetName(), readEntries);
236-
}
237-
if (readEntries + readLast > op.rootBranchEntries) {
238-
throw runtime_error_f("Invalid read range for branch %s: starting from %d, read %d entries, total entries %lld.",
239-
op.branch->GetName(), readEntries, readLast, static_cast<long long>(op.rootBranchEntries));
240-
}
241231
int size = offsets[readEntries + readLast] - offsets[readEntries];
242-
if (size < 0) {
243-
throw runtime_error_f("Invalid offset range for branch %s: offsets[%d]=%d, offsets[%d]=%d.",
244-
op.branch->GetName(), readEntries, offsets[readEntries], readEntries + readLast, offsets[readEntries + readLast]);
245-
}
246232
readEntries += readLast;
247233
bigEndianCopy(target, rootBuffer.GetCurrent(), size, op.typeSize);
248234
target += (ptrdiff_t)(size * op.typeSize);

0 commit comments

Comments
 (0)