From 9a772faf9fd02a896630ee401774d71047a31e5e Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sat, 20 Oct 2018 17:18:36 +0200
Subject: [PATCH] LArElecCalib: CLIDSvc -> AthenaKernel

Update references to headers in CLIDSvc moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
 LArCalorimeter/LArElecCalib/CMakeLists.txt                    | 4 +---
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.h       | 4 ++--
 .../LArElecCalib/LArElecCalib/ILArCableAttenuation.h          | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.h    | 4 ++--
 .../LArElecCalib/LArElecCalib/ILArCaliPulseParams.h           | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.h         | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.h  | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.h      | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.h   | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.h    | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.h  | 4 ++--
 .../LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.h          | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.h  | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.h    | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.h        | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.h | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.h  | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.h          | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.h            | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.h       | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArPhysCaliTdiff.h  | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArRamp.h           | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArRinj.h           | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArShape.h          | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArTdrift.h         | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArTshaper.h        | 4 ++--
 .../LArElecCalib/LArElecCalib/ILArWaveDerivedQuantities.h     | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILArfSampl.h         | 4 ++--
 LArCalorimeter/LArElecCalib/LArElecCalib/ILAruA2MeV.h         | 4 ++--
 29 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/LArCalorimeter/LArElecCalib/CMakeLists.txt b/LArCalorimeter/LArElecCalib/CMakeLists.txt
index b4fb1ced7342..18646e099f03 100644
--- a/LArCalorimeter/LArElecCalib/CMakeLists.txt
+++ b/LArCalorimeter/LArElecCalib/CMakeLists.txt
@@ -9,8 +9,6 @@ atlas_subdir( LArElecCalib )
 atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloIdentifier
                           Control/AthenaKernel
-                          Control/CLIDSvc
-                          Control/SGTools
                           DetectorDescription/Identifier
                           GaudiKernel
                           LArCalorimeter/LArIdentifier )
@@ -24,7 +22,7 @@ atlas_add_dictionary( LArElecCalibDict
                       LArElecCalib/LArElecCalibDict.h
                       LArElecCalib/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloIdentifier AthenaKernel SGTools Identifier GaudiKernel LArIdentifier )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloIdentifier AthenaKernel Identifier GaudiKernel LArIdentifier )
 
 # Install files from the package:
 atlas_install_headers( LArElecCalib )
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.h
index 66dae9af4458..e7ba923a99f4 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //Dear emacs, this is -*-c++-*-
 #ifndef LARELECCALIB_ILARAUTOCORR_H
 #define LARELECCALIB_ILARAUTOCORR_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArVectorProxy.h"
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableAttenuation.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableAttenuation.h
index 51be574a5482..b0b48fb88d3f 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableAttenuation.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableAttenuation.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARCABLEATTENUATION_H
@@ -7,7 +7,7 @@
 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 #include <vector> 
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.h
index 7c5e1f1fde5d..15af1c95c5be 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.h
@@ -1,12 +1,12 @@
 /*
-  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 LARCONDITIONS_ILARCABLELENGTH_H
 #define LARCONDITIONS_ILARCABLELENGTH_H
 
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCaliPulseParams.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCaliPulseParams.h
index 61a3137623c7..3822a878a7f5 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCaliPulseParams.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArCaliPulseParams.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARCALIPULSEPARAMS_H
@@ -7,7 +7,7 @@
 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 #include <vector> 
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.h
index 7b3078d3d01a..5414715e7367 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARDAC2UA_H
 #define LARCONDITIONS_ILARDAC2UA_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.h
index 157f4b6e7fa0..e6bdefd19ac4 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARDETCELLPARAMS_H
@@ -7,7 +7,7 @@
 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 
 class ILArDetCellParams {
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.h
index a38b9a7c5545..4cf43c45c051 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILAREMEC_CPHI_H
 #define LARCONDITIONS_ILAREMEC_CPHI_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.h
index 3aeca4f3e537..e29aa7740631 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILAREMEC_HVALPHA_H
 #define LARCONDITIONS_ILAREMEC_HVALPHA_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.h
index 2520080f87ad..45dd6c1e6db4 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILAREMEC_HVBETA_H
 #define LARCONDITIONS_ILAREMEC_HVBETA_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.h
index 8bcb2e994410..5826a64690b5 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.h
@@ -1,12 +1,12 @@
 /*
-  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 ILARFEBTIMEOFFSET_H
 #define ILARFEBTIMEOFFSET_H
 
 #include "Identifier/HWIdentifier.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 class ILArFEBTimeOffset {
  public:
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.h
index b871c5786542..1abbc3542c8e 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.h
@@ -1,11 +1,11 @@
 /*
-  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 ILARGLOBALTIMEOFFSET_H
 #define ILARGLOBALTIMEOFFSET_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 class ILArGlobalTimeOffset {
  public:
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.h
index d33a5966ff1b..696e2a1b466e 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.h
@@ -1,11 +1,11 @@
 /*
-  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 LARELECCALIB_ILARH6OSCILLATION_H
 #define LARELECCALIB_ILARH6OSCILLATION_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.h
index 5dc2ba4a8d9e..c24e83ada543 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARHVSCALRCORR_H
 #define LARCONDITIONS_ILARHVSCALRCORR_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.h
index 9981a6add6b3..429f26d9ca47 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARMINBIAS_H
 #define LARCONDITIONS_ILARMINBIAS_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.h
index d4a25ee173d6..de3af2a52b5a 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARMINBIASAVERAGE_H
 #define LARCONDITIONS_ILARMINBIASAVERAGE_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.h
index 8a8179e6ca5f..d00e1cd2530d 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARMPHYSOVERMCAL_H
 #define LARCONDITIONS_ILARMPHYSOVERMCAL_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.h
index 315736c43d91..acc894823485 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.h
@@ -1,11 +1,11 @@
 /*
-  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 LARELECCALIB_ILARNOISE_H
 #define LARELECCALIB_ILARNOISE_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.h
index 1dcfb447315e..b495fd625e3e 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.h
@@ -1,11 +1,11 @@
 /*
-  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 LARELECCALIB_ILAROFC_H
 #define LARELECCALIB_ILAROFC_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArVectorProxy.h"
 #include "Identifier/HWIdentifier.h"
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.h
index bd42e4f6db61..6ef1cd620d64 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.h
@@ -1,11 +1,11 @@
 /*
-  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 LARELECCALIB_ILARPEDESTAL_H
 #define LARELECCALIB_ILARPEDESTAL_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPhysCaliTdiff.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPhysCaliTdiff.h
index f8187936e483..604885dfe400 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPhysCaliTdiff.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArPhysCaliTdiff.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARPHYSCALITDIFF_H
 #define LARCONDITIONS_ILARPHYSCALITDIFF_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 
 class Identifier;
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRamp.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRamp.h
index 1c35751c63df..586c92692e7e 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRamp.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRamp.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARRAMP_H
 #define LARCONDITIONS_ILARRAMP_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArVectorProxy.h"
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRinj.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRinj.h
index f65875aeb3be..9ef649800579 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRinj.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArRinj.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARRINJ_H
 #define LARCONDITIONS_ILARRINJ_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArShape.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArShape.h
index 45946c8073a6..dbd9b39368f7 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArShape.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArShape.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARSHAPE_H
 #define LARCONDITIONS_ILARSHAPE_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArVectorProxy.h"
 class HWIdentifier;
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTdrift.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTdrift.h
index 6f535e8573c8..352ac2bd507e 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTdrift.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTdrift.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARTDRIFT_H
@@ -7,7 +7,7 @@
 
 class HWIdentifier;
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 class ILArTdrift {
 /** This class defines the interface for accessing Tdrift
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTshaper.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTshaper.h
index cdec3701fe0d..adbbbd856c23 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTshaper.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArTshaper.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARTSHAPER_H
 #define LARCONDITIONS_ILARTSHAPER_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class Identifier;
 class HWIdentifier;
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArWaveDerivedQuantities.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArWaveDerivedQuantities.h
index 93e476e9f5ad..01408d91ded3 100755
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArWaveDerivedQuantities.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArWaveDerivedQuantities.h
@@ -1,5 +1,5 @@
 /*
-  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 LARCONDITIONS_ILARWAVEDERIVEDQUANTITIES_H
@@ -7,7 +7,7 @@
 
 #include "Identifier/HWIdentifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 #include <vector> 
 
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArfSampl.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArfSampl.h
index b1353025b6bb..60c6b7eedbf3 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILArfSampl.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILArfSampl.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARFSAMPL_H
 #define LARCONDITIONS_ILARFSAMPL_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
diff --git a/LArCalorimeter/LArElecCalib/LArElecCalib/ILAruA2MeV.h b/LArCalorimeter/LArElecCalib/LArElecCalib/ILAruA2MeV.h
index b4046e099278..d78b4ea7426f 100644
--- a/LArCalorimeter/LArElecCalib/LArElecCalib/ILAruA2MeV.h
+++ b/LArCalorimeter/LArElecCalib/LArElecCalib/ILAruA2MeV.h
@@ -1,11 +1,11 @@
 /*
-  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 LARCONDITIONS_ILARUA2MEV_H
 #define LARCONDITIONS_ILARUA2MEV_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include "Identifier/Identifier.h"
 #include "LArElecCalib/LArCalibErrorCode.h"
-- 
GitLab