From 50f90e37f6f8c4b4f638ed0b6c06a6575c7df062 Mon Sep 17 00:00:00 2001
From: Peter Van Gemmeren <peter.van.gemmeren@cern.ch>
Date: Sat, 25 May 2019 20:48:10 +0000
Subject: [PATCH] Switch writing default to use new ROOT Tree Index technology
---
Database/APR/RootStorageSvc/src/RootOODb.cpp | 2 +-
Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx | 2 +-
.../src/AthenaPoolAddressProviderSvc.cxx | 2 +-
Tools/PyUtils/python/scripts/diff_root_files.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Database/APR/RootStorageSvc/src/RootOODb.cpp b/Database/APR/RootStorageSvc/src/RootOODb.cpp
index e92a7419811..7c459eb5e2e 100755
--- a/Database/APR/RootStorageSvc/src/RootOODb.cpp
+++ b/Database/APR/RootStorageSvc/src/RootOODb.cpp
@@ -64,7 +64,7 @@ IDbContainer* RootOODb::createContainer(const DbType& typ) {
return new RootTreeIndexContainer();
}
else if ( typ.match(ROOT_StorageType) ) {
- return new RootTreeContainer();
+ return new RootTreeIndexContainer();
}
return 0;
}
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
index fd72b97e054..e02013dd29d 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
@@ -1138,7 +1138,7 @@ AthenaPoolCnvSvc::AthenaPoolCnvSvc(const std::string& name, ISvcLocator* pSvcLoc
m_domainMaxFileSize(15000000000LL),
m_doChronoStat(true) {
declareProperty("UseDetailChronoStat", m_useDetailChronoStat = false);
- declareProperty("PoolContainerPrefix", m_containerPrefixProp = "ROOTTREE:CollectionTree");
+ declareProperty("PoolContainerPrefix", m_containerPrefixProp = "ROOTTREEINDEX:CollectionTree");
declareProperty("TopLevelContainerName", m_containerNameHintProp = "");
declareProperty("SubLevelBranchName", m_branchNameHintProp = "<type>/<key>");
declareProperty("PoolAttributes", m_poolAttr);
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.cxx
index 657501d0e32..d883afb9fb8 100755
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.cxx
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.cxx
@@ -34,7 +34,7 @@ AthenaPoolAddressProviderSvc::AthenaPoolAddressProviderSvc(const std::string& na
m_clidSvc("ClassIDSvc", name),
m_guid() {
declareProperty("DataHeaderKey", m_dataHeaderKey = "EventSelector");
- declareProperty("DataHeaderIterator", m_dataHeaderIterator = true);
+ declareProperty("DataHeaderIterator", m_dataHeaderIterator = false);
declareProperty("AttributeListKey", m_attrListKey = "");
}
//________________________________________________________________________________
diff --git a/Tools/PyUtils/python/scripts/diff_root_files.py b/Tools/PyUtils/python/scripts/diff_root_files.py
index 8ad0b91c77b..af5f22a5e7e 100644
--- a/Tools/PyUtils/python/scripts/diff_root_files.py
+++ b/Tools/PyUtils/python/scripts/diff_root_files.py
@@ -38,7 +38,7 @@ def _is_exit_early():
help='name of the TTree to compare')
@acmdlib.argument('--ignore-leaves',
nargs='*',
- default=('Token',),
+ default=('Token', 'index_ref',),
help='set of leaves names to ignore from comparison; can be a branch name or a partial leaf name (without any trailing dots)')
@acmdlib.argument('--enforce-leaves',
nargs='*',
--
GitLab