EventBookkeeperMetaData: DataModel -> AthContainers.

Remove reference to obsolete package DataModel.
Adjust references to headers moved to AthenaKernel.

Event/EventBookkeeperMetaData/CMakeLists.txt

@@ -7,9 +7,8 @@ atlas_subdir( EventBookkeeperMetaData )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/DataModel
-                          Control/SGTools
+                          Control/AthenaKernel
+                          Control/AthContainers
                           GaudiKernel )
 
 # External dependencies:
@@ -20,12 +19,12 @@ atlas_add_library( EventBookkeeperMetaData
                    src/*.cxx
                    PUBLIC_HEADERS EventBookkeeperMetaData
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES DataModel SGTools GaudiKernel
+                   LINK_LIBRARIES AthContainers GaudiKernel
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( EventBookkeeperMetaDataDict
                       EventBookkeeperMetaData/EventBookkeeperMetaDataDict.h
                       EventBookkeeperMetaData/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel SGTools GaudiKernel EventBookkeeperMetaData )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers GaudiKernel EventBookkeeperMetaData )
 

Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeper.h

@@ -9,8 +9,7 @@
 #ifndef EVENTBOOKKEEPER_H 
 #define EVENTBOOKKEEPER_H 
  
-// CLIDSvc includes (for persistency)
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <string>
 #include <iosfwd>
 #include <stdint.h>

Event/EventBookkeeperMetaData/EventBookkeeperMetaData/EventBookkeeperCollection.h

@@ -13,11 +13,9 @@
 #include <iostream>
 
 // DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "EventBookkeeperMetaData/EventBookkeeper.h"
-
-// CLIDSvc includes (for persistency)
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 class EventBookkeeperCollection: public DataVector<EventBookkeeper> 
 {

Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecision.h

@@ -9,8 +9,7 @@
 #ifndef SKIMDECISION_H 
 #define SKIMDECISION_H 
  
-// CLIDSvc includes (for persistency)
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <string>
 
 class SkimDecision

Event/EventBookkeeperMetaData/EventBookkeeperMetaData/SkimDecisionCollection.h

@@ -13,11 +13,9 @@
 #include <iostream>
 
 // DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "EventBookkeeperMetaData/SkimDecision.h"
-
-// CLIDSvc includes (for persistency)
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 class SkimDecisionCollection: public DataVector<SkimDecision> 
 {