Merge branch 'condcontDef.LArCOOLConditions-20171026' into 'master'

LArCOOLConditions: Use CONDCONT_DEF to declare conditions containers.

See merge request !5821

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArAutoCorrSC.h

@@ -30,9 +30,8 @@ class LArAutoCorrSC:
   
 };
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArAutoCorrSC,ILArAutoCorr);
 CLASS_DEF( LArAutoCorrSC , 219258685, 1 )
-CLASS_DEF( CondCont<LArAutoCorrSC> , 169266589 , 1 )
+CONDCONT_DEF( LArAutoCorrSC, 169266589, ILArAutoCorr );
 
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArDAC2uAFlat.h

@@ -33,8 +33,6 @@ public:
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArDAC2uAFlat,ILArDAC2uA);
 CLASS_DEF( LArDAC2uAFlat , 54280245 , 1 )
-//ConditionsContainer clid for athenaMT
-CLASS_DEF( CondCont<LArDAC2uAFlat> , 251448397 , 1 )
+CONDCONT_DEF( LArDAC2uAFlat, 251448397, ILArDAC2uA );
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArDAC2uASC.h

@@ -37,8 +37,7 @@ private:
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArDAC2uASC,ILArDAC2uA);
 CLASS_DEF( LArDAC2uASC ,74944220 , 1 )
-CLASS_DEF( CondCont<LArDAC2uASC> , 122040978 , 1 )
+CONDCONT_DEF( LArDAC2uASC, 122040978, ILArDAC2uA );
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArDSPThresholdsFlat.h

@@ -53,7 +53,6 @@ private:
 };
 
 CLASS_DEF( LArDSPThresholdsFlat, 194681315 ,1  )
-//ConditionsContainer clid for athenaMT
 #include "AthenaKernel/CondCont.h"
-CLASS_DEF( CondCont<LArDSPThresholdsFlat> , 148006985 , 1 )
+CONDCONT_DEF( LArDSPThresholdsFlat, 148006985 );
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArHVScaleCorrFlat.h

@@ -33,7 +33,6 @@ public:
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArHVScaleCorrFlat,ILArHVScaleCorr);
 CLASS_DEF( LArHVScaleCorrFlat , 245481026 , 1 )
-CLASS_DEF( CondCont< LArHVScaleCorrFlat> , 11793039 , 1 )
+CONDCONT_DEF( LArHVScaleCorrFlat, 11793039, ILArHVScaleCorr );
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArHVScaleCorrSC.h

@@ -36,8 +36,7 @@ private:
 
 };
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArHVScaleCorrSC,ILArHVScaleCorr);
 CLASS_DEF( LArHVScaleCorrSC ,9991567 , 1 )
-CLASS_DEF( CondCont<LArHVScaleCorrSC> , 123730893 , 1 )
+CONDCONT_DEF( LArHVScaleCorrSC, 123730893, ILArHVScaleCorr );
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArMinBiasSC.h

@@ -36,8 +36,7 @@ private:
 
 };
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArMinBiasSC,ILArMinBias);
 CLASS_DEF( LArMinBiasSC ,156198230 , 1 )
-CLASS_DEF( CondCont<LArMinBiasSC> , 98956242 , 1 )
+CONDCONT_DEF( LArMinBiasSC, 98956242, ILArMinBias );
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArMphysOverMcalFlat.h

@@ -34,7 +34,6 @@ public:
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArMphysOverMcalFlat,ILArMphysOverMcal);
 CLASS_DEF( LArMphysOverMcalFlat , 219931062 , 1 )
-CLASS_DEF( CondCont<LArMphysOverMcalFlat> , 261355674 , 1 )
+CONDCONT_DEF( LArMphysOverMcalFlat, 261355674, ILArMphysOverMcal );
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArMphysOverMcalSC.h

@@ -36,8 +36,7 @@ private:
 
 };
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArMphysOverMcalSC,ILArMphysOverMcal);
 CLASS_DEF( LArMphysOverMcalSC ,125003343 , 1 )
-CLASS_DEF( CondCont<LArMphysOverMcalSC> , 3164993 , 1 )
+CONDCONT_DEF( LArMphysOverMcalSC, 3164993, ILArMphysOverMcal );
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArNoiseSC.h

@@ -36,8 +36,7 @@ private:
 
 };
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArNoiseSC,ILArNoise);
 CLASS_DEF( LArNoiseSC ,234451881 , 1 )
-CLASS_DEF( CondCont<LArNoiseSC> , 89903463 , 1 )
+CONDCONT_DEF( LArNoiseSC, 89903463, ILArNoise );
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArOFCFlat.h

@@ -93,9 +93,8 @@ class LArOFCFlat: public ILArOFC, public LArCondFlatBase {
 };  
   
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArOFCFlat,ILArOFC);
 CLASS_DEF( LArOFCFlat, 20294702, 1) 
-CLASS_DEF( CondCont<LArOFCFlat> , 117247562 , 1 )
+CONDCONT_DEF( LArOFCFlat, 117247562, ILArOFC );
  
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArPedestalFlat.h

@@ -44,8 +44,6 @@ public:
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArPedestalFlat,ILArPedestal);
 CLASS_DEF( LArPedestalFlat,69859981,1  )
-//ConditionsContainer clid for athenaMT
-CLASS_DEF( CondCont<LArPedestalFlat> , 151238349 , 1 )
+CONDCONT_DEF( LArPedestalFlat, 151238349, ILArPedestal );
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArPedestalSC.h

@@ -44,7 +44,6 @@ public:
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArPedestalSC,ILArPedestal);
 CLASS_DEF( LArPedestalSC,17770864,1  )
-CLASS_DEF( CondCont<LArPedestalSC> , 219458938 , 1 )
+CONDCONT_DEF( LArPedestalSC, 219458938, ILArPedestal );
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArRampFlat.h

@@ -33,10 +33,8 @@ class LArRampFlat:
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArRampFlat,ILArRamp);
 CLASS_DEF( LArRampFlat , 228930547 , 1 )
-//ConditionsContainer clid for athenaMT
-CLASS_DEF( CondCont<LArRampFlat> , 218808135 , 1 )
+CONDCONT_DEF( LArRampFlat, 218808135, ILArRamp );
 
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArRampSC.h

@@ -30,9 +30,8 @@ class LArRampSC:
   
 };
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArRampSC,ILArRamp);
 CLASS_DEF( LArRampSC , 43028438, 1 )
-CLASS_DEF( CondCont<LArRampSC> , 147380444 , 1 )
+CONDCONT_DEF( LArRampSC, 147380444, ILArRamp );
 
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArShapeFlat.h

@@ -69,8 +69,7 @@ class LArShapeFlat: public ILArShape,
 
 };  
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArShapeFlat,ILArShape);
 CLASS_DEF( LArShapeFlat , 192810633 , 1 )
-CLASS_DEF( CondCont<LArShapeFlat> , 264124099 , 1 )
+CONDCONT_DEF( LArShapeFlat, 264124099, ILArShape );
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArShapeSC.h

@@ -70,8 +70,6 @@ class LArShapeSC: public ILArShape,
 };  
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArShapeSC,ILArShape); 
 CLASS_DEF( LArShapeSC , 125125776 , 1 )
-//ConditionsContainer clid for athenaMT
-CLASS_DEF( CondCont<LArShapeSC> , 70096552 , 1 )
+CONDCONT_DEF( LArShapeSC, 70096552, ILArShape );
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LArfSamplSC.h

@@ -37,9 +37,7 @@ private:
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LArfSamplSC,ILArfSampl);
 CLASS_DEF( LArfSamplSC , 174984919, 1 )
-//ConditionsContainer clid for athenaMT
-CLASS_DEF( CondCont<LArfSamplSC> , 188510651 , 1 )
+CONDCONT_DEF( LArfSamplSC, 188510651, ILArfSampl );
 
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LAruA2MeVFlat.h

@@ -33,8 +33,6 @@ public:
 };
 
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LAruA2MeVFlat,ILAruA2MeV);
 CLASS_DEF( LAruA2MeVFlat , 92824273 , 1 )
-//ConditionsContainer clid for athenaMT
-CLASS_DEF( CondCont<LAruA2MeVFlat> , 84245593 , 1 )
+CONDCONT_DEF( LAruA2MeVFlat, 84245593, ILAruA2MeV );
 #endif 

LArCalorimeter/LArCOOLConditions/LArCOOLConditions/LAruA2MeVSC.h

@@ -36,7 +36,6 @@ private:
   
 };
 #include "AthenaKernel/CondCont.h"
-CONDCONT_BASE(LAruA2MeVSC,ILAruA2MeV);
 CLASS_DEF( LAruA2MeVSC ,142345128  , 1 )
-CLASS_DEF( CondCont<LAruA2MeVSC> , 155224118 , 1 )
+CONDCONT_DEF( LAruA2MeVSC, 155224118, ILAruA2MeV );
 #endif