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

LArDigitization: CLIDSvc -> AthenaKernel

See merge request atlas/athena!16625

Former-commit-id: 9ba53171

LArCalorimeter/LArDigitization/CMakeLists.txt

@@ -11,9 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloIdentifier
                           Control/AthenaBaseComps
                           Control/AthenaKernel
-                          Control/CLIDSvc
                           Control/PileUpTools
-                          Control/SGTools
                           Control/StoreGate
                           DetectorDescription/Identifier
                           Event/xAOD/xAODEventInfo
@@ -39,7 +37,7 @@ atlas_add_library( LArDigitizationLib
                    PUBLIC_HEADERS LArDigitization
                    PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES CaloIdentifier AthenaBaseComps AthenaKernel SGTools Identifier xAODEventInfo GaudiKernel LArIdentifier LArRawEvent LArSimEvent LArRecConditions LArRawConditions CaloDetDescrLib PileUpToolsLib StoreGateLib SGtests LArCablingLib
+                   LINK_LIBRARIES CaloIdentifier AthenaBaseComps AthenaKernel Identifier xAODEventInfo GaudiKernel LArIdentifier LArRawEvent LArSimEvent LArRecConditions LArRawConditions CaloDetDescrLib PileUpToolsLib StoreGateLib SGtests LArCablingLib
                    PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GeneratorObjects )
 
 atlas_add_component( LArDigitization

LArCalorimeter/LArDigitization/LArDigitization/LArHitEMap.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 LARDIGITIZATION_LARHITEMAP_H
@@ -17,7 +17,7 @@
 #include "CaloIdentifier/LArFCAL_ID.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "LArRawEvent/LArDigit.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 class ISvcLocator;
 class LArCablingService;