LArElecCalib: CLIDSvc -> AthenaKernel

Update references to headers in CLIDSvc moved to AthenaKernel.
Also remove unneeded dependency on SGTools.

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 )

LArCalorimeter/LArElecCalib/LArElecCalib/ILArAutoCorr.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
 */
 
 //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"
 

LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableAttenuation.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 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> 
 

LArCalorimeter/LArElecCalib/LArElecCalib/ILArCableLength.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 LARCONDITIONS_ILARCABLELENGTH_H
 #define LARCONDITIONS_ILARCABLELENGTH_H
 
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 

LArCalorimeter/LArElecCalib/LArElecCalib/ILArCaliPulseParams.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 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> 
 

LArCalorimeter/LArElecCalib/LArElecCalib/ILArDAC2uA.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 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"

LArCalorimeter/LArElecCalib/LArElecCalib/ILArDetCellParams.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 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 {

LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_Cphi.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 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"

LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HValpha.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 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"

LArCalorimeter/LArElecCalib/LArElecCalib/ILArEMEC_HVbeta.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 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"

LArCalorimeter/LArElecCalib/LArElecCalib/ILArFEBTimeOffset.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 ILARFEBTIMEOFFSET_H
 #define ILARFEBTIMEOFFSET_H
 
 #include "Identifier/HWIdentifier.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 class ILArFEBTimeOffset {
  public:

LArCalorimeter/LArElecCalib/LArElecCalib/ILArGlobalTimeOffset.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 ILARGLOBALTIMEOFFSET_H
 #define ILARGLOBALTIMEOFFSET_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 
 class ILArGlobalTimeOffset {
  public:

LArCalorimeter/LArElecCalib/LArElecCalib/ILArH6Oscillation.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 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"

LArCalorimeter/LArElecCalib/LArElecCalib/ILArHVScaleCorr.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 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"

LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBias.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 LARCONDITIONS_ILARMINBIAS_H
 #define LARCONDITIONS_ILARMINBIAS_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 

LArCalorimeter/LArElecCalib/LArElecCalib/ILArMinBiasAverage.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 LARCONDITIONS_ILARMINBIASAVERAGE_H
 #define LARCONDITIONS_ILARMINBIASAVERAGE_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 

LArCalorimeter/LArElecCalib/LArElecCalib/ILArMphysOverMcal.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 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"

LArCalorimeter/LArElecCalib/LArElecCalib/ILArNoise.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 LARELECCALIB_ILARNOISE_H
 #define LARELECCALIB_ILARNOISE_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/LArCalibErrorCode.h"
 class HWIdentifier;
 

LArCalorimeter/LArElecCalib/LArElecCalib/ILArOFC.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 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"
 

LArCalorimeter/LArElecCalib/LArElecCalib/ILArPedestal.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 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"