Moved APRDefaults.h from POOLCore to RootUtils

Moved APRDefaults.h from POOLCore to RootUtils

Makes the defaults accessible also in AnalysisBase

Control/AthenaIPCTools/CMakeLists.txt

@@ -14,5 +14,5 @@ atlas_add_component( AthenaIPCTools
 		     src/components/*.cxx
 		     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${YAMPL_INCLUDE_DIRS} ${HDF5_CXX_INCLUDE_DIRS}
 		     LINK_LIBRARIES ${YAMPL_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_CXX_LIBRARIES}
-			    AthenaBaseComps AthenaKernel GaudiKernel POOLCore StorageSvc )
+			    AthenaBaseComps AthenaKernel GaudiKernel RootUtils StorageSvc )
 

Control/AthenaIPCTools/src/AthenaHDFStreamTool.cxx

@@ -11,7 +11,7 @@
 #include "GaudiKernel/FileIncident.h"
 
 #include "StorageSvc/DbReflex.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
 #include "CxxUtils/starts_with.h"
 
 #include "H5Cpp.h"

Control/RootUtils/RootUtils/RootUtilsDict.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: RootUtilsDict.h,v 1.11 2008-01-15 05:02:52 ssnyder Exp $
-
 /**
  * @file  RootUtils/RootUtilsDict.h
  * @author scott snyder
@@ -27,3 +25,8 @@ struct TreeTest
 #include "RootUtils/InitHist.h"
 #include "RootUtils/ILogger.h"
 #include "RootUtils/ScatterH2.h"
+
+// Default names of ROOT file storage elements used by APR
+#include "RootUtils/APRDefaults.h"
+
+

Control/RootUtils/RootUtils/selection.xml

@@ -14,5 +14,8 @@
     <class name="RootUtils::ScatterH2::Pair" />
     <class name="std::vector<RootUtils::ScatterH2::Pair>" />
 
+    <class name="APRDefaults::TTreeNames" />
+    <class name="APRDefaults::RNTupleNames" />
+
     <class name="RootUtilsTest::TreeTest" />
 </lcgdict>

Database/APR/RootCollection/CMakeLists.txt

@@ -23,7 +23,7 @@ atlas_add_library( RootCollection
                    PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
                    LINK_LIBRARIES ${ROOT_LIBRARIES}
                    PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaKernel CollectionBase
-                   FileCatalog GaudiKernel POOLCore PersistencySvc PersistentDataModel )
+                   FileCatalog GaudiKernel POOLCore PersistencySvc PersistentDataModel RootUtils )
 
 atlas_add_library( RootCollectionComponents
                    src/components/*.cpp

Database/APR/RootCollection/src/RNTCollection.cpp

@@ -9,7 +9,7 @@
 
 #include "PersistentDataModel/Token.h"
 #include "POOLCore/Exception.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
 
 #include "CollectionBase/ICollectionColumn.h"
 #include "CollectionBase/CollectionBaseNames.h"

Database/APR/RootCollection/src/RNTCollectionSchemaEditor.cpp

@@ -8,7 +8,7 @@
 #include "RNTCollectionSchemaEditor.h"
 
 #include "POOLCore/Exception.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
 
 #include "CoralBase/Attribute.h"
 #include "CoralBase/AttributeList.h"
@@ -18,10 +18,8 @@
 #include "TROOT.h"
 #if ROOT_VERSION_CODE >= ROOT_VERSION( 6, 31, 0 )
 #include "ROOT/RNTupleReader.hxx"
-#else
-#include "ROOT/RNTuple.hxx"
 #endif
-#include "ROOT/RField.hxx"
+#include "ROOT/RNTuple.hxx"
 
 
 pool::RootCollection::RNTCollectionSchemaEditor::

Database/APR/RootCollection/src/RootCollection.cpp

@@ -8,7 +8,7 @@
 
 #include "PersistentDataModel/Token.h"
 #include "POOLCore/Exception.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
 
 #include "CollectionBase/ICollectionColumn.h"
 #include "CollectionBase/CollectionBaseNames.h"

Database/APR/RootStorageSvc/src/RootDatabase.cpp

@@ -16,7 +16,7 @@
 #include "StorageSvc/DbOption.h"
 #include "StorageSvc/DbDomain.h"
 #include "POOLCore/DbPrint.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
 #include "RootAuxDynIO/RootAuxDynIO.h"
 
 #include "GaudiKernel/Bootstrap.h"

Database/APR/StorageSvc/StorageSvc/dict.h

@@ -2,9 +2,6 @@
   Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
-// Package pool/POOLCore - some Athena default settings
-#include "POOLCore/APRDefaults.h"
-
 // Package pool/StorageSvc - interfaces
 #include "StorageSvc/IStorageSvc.h"
 #include "StorageSvc/IOODatabase.h"

Database/APR/StorageSvc/StorageSvc/dict.xml

@@ -4,8 +4,6 @@
   <class pattern="pool::DbHandleBase*"   rootmap="false"/>
   <class pattern="pool::IDb*"            rootmap="false"/>
   <class pattern="pool::IStorage*"       rootmap="false"/>
-  <class name="APRDefaults::TTreeNames" />
-  <class name="APRDefaults::RNTupleNames" />
 
   <!-- package: StorageSvc                   -->
   <class name="std::pair<long long,long long>"       rootmap="false"/>

Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx

@@ -17,7 +17,7 @@
 #include "PersistentDataModel/Token.h"
 #include "PersistentDataModel/TokenAddress.h"
 #include "StorageSvc/DbType.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
 
 //__________________________________________________________________________
 AthenaPoolConverter::~AthenaPoolConverter() {

Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef EVENTSELECTORATHENAPOOL_H
@@ -16,7 +16,7 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "PersistentDataModel/Guid.h"
-#include "POOLCore/APRDefaults.h"
+#include "RootUtils/APRDefaults.h"
 
 #include "AthenaKernel/IAthenaIPCTool.h"
 #include "AthenaKernel/IAthenaSelectorTool.h"