LArRawConditions: Use CONDCONT_DEF.

Use CONDCONT_DEF to declare conditions containers instead of REGISTER_CC.

LArCalorimeter/LArRawConditions/CMakeLists.txt

@@ -9,8 +9,7 @@ atlas_subdir( LArRawConditions )
 atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloIdentifier
                           Control/AthenaKernel
-                          Control/CLIDSvc
-                          Control/DataModel
+                          Control/AthContainers
                           Control/SGTools
                           Control/StoreGate
                           Database/AthenaPOOL/AthenaPoolUtilities
@@ -30,20 +29,20 @@ atlas_add_library( LArRawConditions
                    src/*.cxx
                    PUBLIC_HEADERS LArRawConditions
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES CaloIdentifier AthenaKernel DataModel SGTools AthenaPoolUtilities Identifier GaudiKernel LArIdentifier StoreGateLib SGtests LArToolsLib LArCablingLib
+                   LINK_LIBRARIES CaloIdentifier AthenaKernel AthContainers SGTools AthenaPoolUtilities Identifier GaudiKernel LArIdentifier StoreGateLib SGtests LArToolsLib LArCablingLib
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( LArRawConditions1Dict
                       LArRawConditions/LArRawConditionsDict1.h
                       LArRawConditions/selection1.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel DataModel SGTools StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel LArIdentifier LArToolsLib LArCablingLib LArRawConditions )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel AthContainers SGTools StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel LArIdentifier LArToolsLib LArCablingLib LArRawConditions )
 
 atlas_add_dictionary( LArRawConditions2Dict
                       LArRawConditions/LArRawConditionsDict2.h
                       LArRawConditions/selection2.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel DataModel SGTools StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel LArIdentifier LArToolsLib LArCablingLib LArRawConditions )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel AthContainers SGTools StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel LArIdentifier LArToolsLib LArCablingLib LArRawConditions )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

LArCalorimeter/LArRawConditions/LArRawConditions/LArADC2MeV.h

@@ -39,10 +39,10 @@ class LArADC2MeV {
   const size_t m_nGains;
 };
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LArADC2MeV, 87645297, 1)
 #include "AthenaKernel/CondCont.h"
-CLASS_DEF( CondCont<LArADC2MeV>, 155872295, 0)
+CONDCONT_DEF (LArADC2MeV, 155872295);
 
 #endif
 

LArCalorimeter/LArRawConditions/LArRawConditions/LArAutoCorrComplete.h

@@ -56,6 +56,8 @@ class LArAutoCorrComplete: public ILArAutoCorr,
   
 };
 
-
+#include "AthenaKernel/CondCont.h"
 CLASS_DEF( LArAutoCorrComplete, 255786016,1)
+CONDCONT_DEF( LArAutoCorrComplete, 122986158, ILArAutoCorr );
+
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArCaliWaveContainer.h

@@ -16,7 +16,7 @@
 #define LARCALIWAVECONTAINER_H
 
 #include "LArRawConditions/LArConditionsContainer.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "LArRawConditions/LArCaliWave.h"
 
 #include <map>

LArCalorimeter/LArRawConditions/LArRawConditions/LArCalibParams.h

@@ -71,10 +71,8 @@ class LArCalibParams {
 
 };
 
-#ifndef __CINT__ 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LArCalibParams, 228761010,1 )
-#endif
 
 
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArCellTimeOffset.h

@@ -5,7 +5,7 @@
 #ifndef LARCELLTIMEOFFSET_H
 #define LARCELLTIMEOFFSET_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include <map>
 

LArCalorimeter/LArRawConditions/LArRawConditions/LArDAC2uAComplete.h

@@ -50,7 +50,6 @@ class LArDAC2uAComplete: public ILArDAC2uA ,
 
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArDAC2uAComplete,ILArDAC2uA);
 CLASS_DEF( LArDAC2uAComplete, 95178965,1)
-CLASS_DEF( CondCont<LArDAC2uAComplete> , 148060277 , 1 )
+CONDCONT_DEF( LArDAC2uAComplete, 148060277, ILArDAC2uA );
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArDAC2uAMC.h

@@ -51,7 +51,6 @@ class LArDAC2uAMC: public LArDAC2uAComplete {
 
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArDAC2uAMC,ILArDAC2uA);
 CLASS_DEF( LArDAC2uAMC, 48944014,1)
-CLASS_DEF( CondCont<LArDAC2uAMC> , 218623664 , 1 )
+CONDCONT_DEF( LArDAC2uAMC, 218623664, ILArDAC2uA );
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArDAC2uASym.h

@@ -32,9 +32,8 @@ class LArDAC2uASym: virtual public ILArDAC2uA {
 
 };
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArDAC2uASym, ILArDAC2uA);
 CLASS_DEF( LArDAC2uASym,235307622,1)
-CLASS_DEF( CondCont<LArDAC2uASym> ,22175210 , 1 )
+CONDCONT_DEF( LArDAC2uASym, 22175210, ILArDAC2uA );
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArFEBTimeOffset.h

@@ -6,7 +6,7 @@
 #define LARFEBTIMEOFFSET_H
 
 #include "LArElecCalib/ILArFEBTimeOffset.h"
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "Identifier/HWIdentifier.h"
 #include <map>
 

LArCalorimeter/LArRawConditions/LArRawConditions/LArGlobalTimeOffset.h

@@ -5,7 +5,7 @@
 #ifndef LARGLOBALTIMEOFFSET_H
 #define LARGLOBALTIMEOFFSET_H
 
-#include "CLIDSvc/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h" 
 #include "LArElecCalib/ILArGlobalTimeOffset.h"
 
 class LArGlobalTimeOffset: public ILArGlobalTimeOffset {

LArCalorimeter/LArRawConditions/LArRawConditions/LArHVScaleCorrComplete.h

@@ -35,9 +35,7 @@ class LArHVScaleCorrComplete: public ILArHVScaleCorr ,
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArHVScaleCorrComplete,ILArHVScaleCorr);
 CLASS_DEF( LArHVScaleCorrComplete, 220593802,1)
-CLASS_DEF( CondCont<LArHVScaleCorrComplete> , 84955454 , 1 )
-REGISTER_CC( LArHVScaleCorrComplete );
+CONDCONT_DEF(LArHVScaleCorrComplete, 84955454, ILArHVScaleCorr);
 
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArMCSym.h

@@ -53,9 +53,9 @@ class LArMCSym {
 
 };
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF( LArMCSym , 33771274 , 1 )
 #include "AthenaKernel/CondCont.h"
-CLASS_DEF(  CondCont<LArMCSym> ,159334782 , 1 )
+CONDCONT_DEF( LArMCSym, 159334782 );
 
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasMC.h

@@ -46,7 +46,6 @@ class LArMinBiasMC: public LArMinBiasComplete {
 
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArMinBiasMC,ILArMinBias);
 CLASS_DEF( LArMinBiasMC, 85803560 ,1)
-CLASS_DEF( CondCont<LArMinBiasMC> , 133518152 , 1 )
+CONDCONT_DEF( LArMinBiasMC, 133518152, ILArMinBias );
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArMinBiasSym.h

@@ -32,9 +32,8 @@ class LArMinBiasSym: virtual public ILArMinBias {
 
 };
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArMinBiasSym, ILArMinBias);
 CLASS_DEF( LArMinBiasSym,211635936,1)
-CLASS_DEF( CondCont<LArMinBiasSym> ,185039882, 1 )
+CONDCONT_DEF( LArMinBiasSym ,185039882, ILArMinBias );
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArMphysOverMcalComplete.h

@@ -47,7 +47,6 @@ class LArMphysOverMcalComplete: public ILArMphysOverMcal,
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArMphysOverMcalComplete,ILArMphysOverMcal);
 CLASS_DEF( LArMphysOverMcalComplete,84212362,1)
-CLASS_DEF( CondCont<LArMphysOverMcalComplete> , 216720142 , 1 )
+CONDCONT_DEF( LArMphysOverMcalComplete, 216720142, ILArMphysOverMcal );
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseMC.h

@@ -44,7 +44,6 @@ class LArNoiseMC: public LArNoiseComplete {
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArNoiseMC,ILArNoise);
 CLASS_DEF( LArNoiseMC, 264452083, 1)
-CLASS_DEF( CondCont<LArNoiseMC> , 181236653 , 1 )
+CONDCONT_DEF( LArNoiseMC, 181236653, ILArNoise );
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArNoiseSym.h

@@ -32,9 +32,8 @@ class LArNoiseSym: virtual public ILArNoise {
 
 };
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArNoiseSym, ILArNoise);
 CLASS_DEF( LArNoiseSym,235778925,1)
-CLASS_DEF( CondCont<LArNoiseSym> , 233925277, 1 )
+CONDCONT_DEF( LArNoiseSym, 233925277, ILArNoise );
 #endif 

LArCalorimeter/LArRawConditions/LArRawConditions/LArOFCComplete.h

@@ -101,9 +101,8 @@ class LArOFCComplete: public ILArOFC,
  };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArOFCComplete,ILArOFC);
 CLASS_DEF( LArOFCComplete, 101879462, 1) 
-CLASS_DEF( CondCont<LArOFCComplete> , 144694594 , 1 )
+CONDCONT_DEF( LArOFCComplete , 144694594 , ILArOFC );
 
 inline
 LArOFCComplete::CONTAINER::ConstReference

LArCalorimeter/LArRawConditions/LArRawConditions/LArPedestalComplete.h

@@ -55,7 +55,6 @@ class LArPedestalComplete: public ILArPedestal,
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArPedestalComplete,ILArPedestal);
 CLASS_DEF( LArPedestalComplete, 134294113,1)
-CLASS_DEF( CondCont<LArPedestalComplete> , 43865217 , 1 )
+CONDCONT_DEF( LArPedestalComplete, 43865217, ILArPedestal );
 #endif