Merge branch 'clidsvc.ZDC_SimEvent-20181210' into 'master'

ZDC_SimEvent: CLIDSvc -> AthenaKernel

See merge request atlas/athena!16622

ForwardDetectors/ZDC/ZDC_SimEvent/CMakeLists.txt

@@ -7,8 +7,7 @@ atlas_subdir( ZDC_SimEvent )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           Simulation/HitManagement )
 
 # External dependencies:
@@ -19,12 +18,12 @@ atlas_add_library( ZDC_SimEvent
                    src/*.cxx
                    PUBLIC_HEADERS ZDC_SimEvent
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES SGTools HitManagement
+                   LINK_LIBRARIES AthenaKernel HitManagement
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( ZDC_SimEventDict
                       ZDC_SimEvent/ZDC_SimEventDict.h
                       ZDC_SimEvent/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools HitManagement ZDC_SimEvent )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel HitManagement ZDC_SimEvent )
 

ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimPixelHit_Collection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ZDC_SIMPIXELHIT_COLLECTION
@@ -7,11 +7,7 @@
 
 #include "ZDC_SimPixelHit.h"
 #include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
 #include <string>
 
 typedef AtlasHitsVector<ZDC_SimPixelHit> ZDC_SimPixelHit_Collection1;

ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimStripHit_Collection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ZDC_SIMSTRIPHIT_COLLECTION
@@ -7,11 +7,7 @@
 
 #include "ZDC_SimStripHit.h"
 #include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
-  #include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
 #include <string>
 
 typedef AtlasHitsVector<ZDC_SimStripHit> ZDC_SimStripHit_Collection1;