correct two rebasing errors

Dan Riley · Dan Riley · commit d3793447b120 · 2025-10-29T11:56:48.000-04:00
diff --git a/IOPool/Input/src/RootTree.h b/IOPool/Input/src/RootTree.h
@@ -99,7 +99,7 @@ namespace edm {
       bool promptReading = false;
 
       Options usingDefaultNonEventOptions() const {
-        return {roottree::defaultNonEventCacheSize, treeMaxVirtualSize, enablePrefetching, true};
+        return {roottree::defaultNonEventCacheSize, treeMaxVirtualSize, enablePrefetching, false};
       }
     };
 
diff --git a/IOPool/Input/src/RootTreeCacheManager.cc b/IOPool/Input/src/RootTreeCacheManager.cc
@@ -198,7 +198,6 @@ namespace edm {
             learningEntries_(learningEntries),
             enablePrefetching_(enablePrefetching),
             enableTriggerCache_(branchType_ == InEvent) {}
-      ~SparseReadCache() override { reset(); }
       void createPrimaryCache(unsigned int cacheSize) override;
       void resetTraining(bool promptRead) override;
       void reset() override;

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ namespace edm {`
`99`	`99`	`bool promptReading = false;`
`100`	`100`
`101`	`101`	`Options usingDefaultNonEventOptions() const {`
`102`		`- return {roottree::defaultNonEventCacheSize, treeMaxVirtualSize, enablePrefetching, true};`
	`102`	`+ return {roottree::defaultNonEventCacheSize, treeMaxVirtualSize, enablePrefetching, false};`
`103`	`103`	`}`
`104`	`104`	`};`
`105`	`105`