Merge branch 'sgtools.TBEventAthenaPool-20190525' into 'master'

TBEventAthenaPool: SGTools->AthenaKernel

See merge request atlas/athena!23712

TestBeam/TBEventAthenaPool/CMakeLists.txt

@@ -9,7 +9,7 @@ atlas_subdir( TBEventAthenaPool )
 atlas_depends_on_subdirs( PUBLIC
                           Database/AthenaPOOL/AthenaPoolUtilities
                           PRIVATE
-                          Control/SGTools
+                          Control/AthenaKernel
                           Database/AthenaPOOL/AthenaPoolCnvSvc
                           GaudiKernel
                           TestBeam/TBEvent
@@ -19,5 +19,5 @@ atlas_depends_on_subdirs( PUBLIC
 atlas_add_poolcnv_library( TBEventAthenaPoolPoolCnv
                            src/*.cxx
                            FILES TBEvent/TBADCRawCont.h TBEvent/TBBPCCont.h TBEvent/TBBPCRawCont.h TBEvent/TBEventInfo.h TBEvent/TBHitCont.h TBEvent/TBHitPlaneCont.h TBEvent/TBIdentifiedParticle.h TBEvent/TBLArCalibDigitContainer.h TBEvent/TBLArDigitContainer.h TBEvent/TBMWPCCont.h TBEvent/TBMWPCRawCont.h TBEvent/TBPhase.h TBEvent/TBScintillatorCont.h TBEvent/TBScintillatorRawCont.h TBEvent/TBTDC.h TBEvent/TBTDCRawCont.h TBEvent/TBTailCatcher.h TBEvent/TBTailCatcherRaw.h TBEvent/TBTrack.h TBEvent/TBTriggerPatternUnit.h TBEvent/TBTrackInfo.h
-                           LINK_LIBRARIES AthenaPoolUtilities SGTools AthenaPoolCnvSvcLib GaudiKernel TBEvent TBTPCnv )
+                           LINK_LIBRARIES AthenaPoolUtilities AthenaKernel AthenaPoolCnvSvcLib GaudiKernel TBEvent TBTPCnv )
 

TestBeam/TBEventAthenaPool/src/TBBPCRawContCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBBPCRawContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes

TestBeam/TBEventAthenaPool/src/TBHitContCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBHitContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes

TestBeam/TBEventAthenaPool/src/TBHitPlaneContCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBHitPlaneContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes

TestBeam/TBEventAthenaPool/src/TBIdentifiedParticleCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBIdentifiedParticleCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes

TestBeam/TBEventAthenaPool/src/TBLArCalibDigitContainerCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBLArCalibDigitContainerCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes

TestBeam/TBEventAthenaPool/src/TBMWPCRawContCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBMWPCRawContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes

TestBeam/TBEventAthenaPool/src/TBScintillatorRawContCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBScintillatorRawContCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes

TestBeam/TBEventAthenaPool/src/TBTailCatcherRawCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TBTailCatcherRawCnv.h"
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 
 // Athena
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 
 
 // Constructor - call base constructor and initialize local attributes