From 1068cbe91bab3094f3c9d712454d6f19f2353264 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Thu, 14 Dec 2017 16:53:08 +0100
Subject: [PATCH] TBEvent: DataModel -> AthLinks, AthContainers.
Remove references to obsolete package DataModel.
Former-commit-id: 9ad680a55ea6dfc3a88744979649508954da24cd
---
TestBeam/TBEvent/CMakeLists.txt | 10 +++++-----
TestBeam/TBEvent/TBEvent/TBADCRaw.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBADCRawCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBBPC.h | 2 +-
TestBeam/TBEvent/TBEvent/TBBPCCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBBPCRaw.h | 2 +-
TestBeam/TBEvent/TBEvent/TBBPCRawCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBEventInfo.h | 2 +-
TestBeam/TBEvent/TBEvent/TBHit.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBHitCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBHitPlane.h | 2 +-
TestBeam/TBEvent/TBEvent/TBHitPlaneCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBIdentifiedParticle.h | 2 +-
TestBeam/TBEvent/TBEvent/TBLArCalibDigitContainer.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBLArDigitContainer.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBMWPC.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBMWPCCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBMWPCRaw.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBMWPCRawCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBPhase.h | 2 +-
TestBeam/TBEvent/TBEvent/TBScintillator.h | 2 +-
TestBeam/TBEvent/TBEvent/TBScintillatorCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBScintillatorRaw.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBScintillatorRawCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBTDC.h | 2 +-
TestBeam/TBEvent/TBEvent/TBTDCRaw.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBTDCRawCont.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBTailCatcher.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBTailCatcherRaw.h | 4 ++--
TestBeam/TBEvent/TBEvent/TBTrack.h | 2 +-
TestBeam/TBEvent/TBEvent/TBTrackInfo.h | 2 +-
TestBeam/TBEvent/TBEvent/TBTriggerPatternUnit.h | 2 +-
TestBeam/TBEvent/src/TBBPCRaw.cxx | 2 +-
TestBeam/TBEvent/src/TBTailCatcher.cxx | 2 +-
TestBeam/TBEvent/src/TBTailCatcherRaw.cxx | 2 +-
35 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/TestBeam/TBEvent/CMakeLists.txt b/TestBeam/TBEvent/CMakeLists.txt
index ebdc3bd3a8d..bc1dff15c48 100644
--- a/TestBeam/TBEvent/CMakeLists.txt
+++ b/TestBeam/TBEvent/CMakeLists.txt
@@ -7,9 +7,9 @@ atlas_subdir( TBEvent )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
- Control/DataModel
- Control/SGTools
+ Control/AthenaKernel
+ Control/AthLinks
+ Control/AthContainers
GaudiKernel
LArCalorimeter/LArRawEvent )
@@ -24,12 +24,12 @@ atlas_add_library( TBEvent
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} DataModel SGTools GaudiKernel LArRawEvent
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthLinks AthContainers AthenaKernel GaudiKernel LArRawEvent
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_dictionary( TBEventDict
TBEvent/TBEventDict.h
TBEvent/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel SGTools GaudiKernel LArRawEvent TBEvent )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks AthContainers GaudiKernel LArRawEvent TBEvent )
diff --git a/TestBeam/TBEvent/TBEvent/TBADCRaw.h b/TestBeam/TBEvent/TBEvent/TBADCRaw.h
index 9709a07efaf..41ac3b2414a 100755
--- a/TestBeam/TBEvent/TBEvent/TBADCRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBADCRaw.h
@@ -7,8 +7,8 @@
#include "TBEvent/TBBeamDetector.h"
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include <string>
diff --git a/TestBeam/TBEvent/TBEvent/TBADCRawCont.h b/TestBeam/TBEvent/TBEvent/TBADCRawCont.h
index 3e89ae2c7d0..90a1a33bd6d 100755
--- a/TestBeam/TBEvent/TBEvent/TBADCRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBADCRawCont.h
@@ -5,8 +5,8 @@
#ifndef TBADCRAWCONT_H
#define TBADCRAWCONT_H
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBADCRaw.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBBPC.h b/TestBeam/TBEvent/TBEvent/TBBPC.h
index 22ca5c1156f..c124631826b 100755
--- a/TestBeam/TBEvent/TBEvent/TBBPC.h
+++ b/TestBeam/TBEvent/TBEvent/TBBPC.h
@@ -12,7 +12,7 @@
#include <string>
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBBeamDetector.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBBPCCont.h b/TestBeam/TBEvent/TBEvent/TBBPCCont.h
index 78d15bebde8..6baee79cf46 100755
--- a/TestBeam/TBEvent/TBEvent/TBBPCCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBBPCCont.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBBPC.h"
#ifndef TBBPCCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBBPCRaw.h b/TestBeam/TBEvent/TBEvent/TBBPCRaw.h
index c427bfffabc..2069c5f87bc 100755
--- a/TestBeam/TBEvent/TBEvent/TBBPCRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBBPCRaw.h
@@ -22,7 +22,7 @@
#include "TBEvent/TBTDCRawCont.h"
#include "TBEvent/TBADCRawCont.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include <string>
#include <vector>
diff --git a/TestBeam/TBEvent/TBEvent/TBBPCRawCont.h b/TestBeam/TBEvent/TBEvent/TBBPCRawCont.h
index 5270d7cb13c..d35a3014d3e 100755
--- a/TestBeam/TBEvent/TBEvent/TBBPCRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBBPCRawCont.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBBPCRaw.h"
#ifndef TBBPCRAWCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBEventInfo.h b/TestBeam/TBEvent/TBEvent/TBEventInfo.h
index 80fa2a6c7ac..519ce4bc970 100755
--- a/TestBeam/TBEvent/TBEvent/TBEventInfo.h
+++ b/TestBeam/TBEvent/TBEvent/TBEventInfo.h
@@ -13,7 +13,7 @@
///////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include <string>
diff --git a/TestBeam/TBEvent/TBEvent/TBHit.h b/TestBeam/TBEvent/TBEvent/TBHit.h
index d630c137290..9919ec0e20f 100755
--- a/TestBeam/TBEvent/TBEvent/TBHit.h
+++ b/TestBeam/TBEvent/TBEvent/TBHit.h
@@ -12,8 +12,8 @@
///////////////////////////////////////////////////////////////////////////////
-//#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+//#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBBeamDetector.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBHitCont.h b/TestBeam/TBEvent/TBEvent/TBHitCont.h
index de00e2be7cd..1d5752dcfdb 100755
--- a/TestBeam/TBEvent/TBEvent/TBHitCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBHitCont.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBHit.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBHitPlane.h b/TestBeam/TBEvent/TBEvent/TBHitPlane.h
index 37a0eb51842..6255b245fd4 100755
--- a/TestBeam/TBEvent/TBEvent/TBHitPlane.h
+++ b/TestBeam/TBEvent/TBEvent/TBHitPlane.h
@@ -9,7 +9,7 @@
This class is used to store hit information from BPC & MWPC for one plane. The modivation was to create a track object using both BPC data & MWPC data but given that the MWPC is plane specific (zx plane and yx plane) we have to make a linear fit on each plane with the correct hit objects.
*/
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBBeamDetector.h"
class TBHitPlane
diff --git a/TestBeam/TBEvent/TBEvent/TBHitPlaneCont.h b/TestBeam/TBEvent/TBEvent/TBHitPlaneCont.h
index c83e7c52e4e..4c8466f0278 100755
--- a/TestBeam/TBEvent/TBEvent/TBHitPlaneCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBHitPlaneCont.h
@@ -5,8 +5,8 @@
#ifndef TBHITPLANECONT_H
#define TBHITPLANECONT_H
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBHitPlane.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBIdentifiedParticle.h b/TestBeam/TBEvent/TBEvent/TBIdentifiedParticle.h
index c06d7cd8f48..ce1cea6f3de 100755
--- a/TestBeam/TBEvent/TBEvent/TBIdentifiedParticle.h
+++ b/TestBeam/TBEvent/TBEvent/TBIdentifiedParticle.h
@@ -4,7 +4,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#ifndef TBIDENTIFIEDPARTICLE
#define TBIDENTIFIEDPARTICLE
diff --git a/TestBeam/TBEvent/TBEvent/TBLArCalibDigitContainer.h b/TestBeam/TBEvent/TBEvent/TBLArCalibDigitContainer.h
index e4cc76477fc..4c69236340e 100755
--- a/TestBeam/TBEvent/TBEvent/TBLArCalibDigitContainer.h
+++ b/TestBeam/TBEvent/TBEvent/TBLArCalibDigitContainer.h
@@ -12,8 +12,8 @@
#ifndef TBLARCALIBDIGITCONTAINER_H
#define TBLARCALIBDIGITCONTAINER_H
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "LArRawEvent/LArCalibDigit.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBLArDigitContainer.h b/TestBeam/TBEvent/TBEvent/TBLArDigitContainer.h
index a934be04c47..151ced8da9e 100755
--- a/TestBeam/TBEvent/TBEvent/TBLArDigitContainer.h
+++ b/TestBeam/TBEvent/TBEvent/TBLArDigitContainer.h
@@ -19,8 +19,8 @@
#ifndef TBLARDIGITCONTAINER_H
#define TBLARDIGITCONTAINER_H
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "LArRawEvent/LArDigit.h"
/**
diff --git a/TestBeam/TBEvent/TBEvent/TBMWPC.h b/TestBeam/TBEvent/TBEvent/TBMWPC.h
index c9a11b90c9a..ab7d9470721 100755
--- a/TestBeam/TBEvent/TBEvent/TBMWPC.h
+++ b/TestBeam/TBEvent/TBEvent/TBMWPC.h
@@ -17,8 +17,8 @@
#include <vector>
#include "GaudiKernel/MsgStream.h"
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBBeamDetector.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBMWPCCont.h b/TestBeam/TBEvent/TBEvent/TBMWPCCont.h
index df4ce47b91d..c423b923329 100755
--- a/TestBeam/TBEvent/TBEvent/TBMWPCCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBMWPCCont.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBMWPC.h"
#ifndef TBMWPCCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBMWPCRaw.h b/TestBeam/TBEvent/TBEvent/TBMWPCRaw.h
index d5df1c2bbc4..0a2951a1efb 100755
--- a/TestBeam/TBEvent/TBEvent/TBMWPCRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBMWPCRaw.h
@@ -13,8 +13,8 @@
#include <string>
#include <vector>
-#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
#include "TBEvent/TBBeamDetector.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBMWPCRawCont.h b/TestBeam/TBEvent/TBEvent/TBMWPCRawCont.h
index 6436db0227b..c8a580e6fe7 100755
--- a/TestBeam/TBEvent/TBEvent/TBMWPCRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBMWPCRawCont.h
@@ -3,8 +3,8 @@
*/
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBMWPCRaw.h"
#ifndef TBMWPCRAWCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBPhase.h b/TestBeam/TBEvent/TBEvent/TBPhase.h
index 6bd3facfb9c..48173c915fe 100755
--- a/TestBeam/TBEvent/TBEvent/TBPhase.h
+++ b/TestBeam/TBEvent/TBEvent/TBPhase.h
@@ -13,7 +13,7 @@
///////////////////////////////////////////////////////////////////////////////
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include <math.h>
diff --git a/TestBeam/TBEvent/TBEvent/TBScintillator.h b/TestBeam/TBEvent/TBEvent/TBScintillator.h
index d653de31496..90927b6e126 100755
--- a/TestBeam/TBEvent/TBEvent/TBScintillator.h
+++ b/TestBeam/TBEvent/TBEvent/TBScintillator.h
@@ -17,7 +17,7 @@
#include "TBEvent/TBBeamDetector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBScintillatorCont.h b/TestBeam/TBEvent/TBEvent/TBScintillatorCont.h
index e89873299ba..2b3f6c43770 100755
--- a/TestBeam/TBEvent/TBEvent/TBScintillatorCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBScintillatorCont.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBScintillator.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBScintillatorRaw.h b/TestBeam/TBEvent/TBEvent/TBScintillatorRaw.h
index 9aecef570da..e560ffffeb8 100755
--- a/TestBeam/TBEvent/TBEvent/TBScintillatorRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBScintillatorRaw.h
@@ -18,8 +18,8 @@
#include "TBEvent/TBBeamDetector.h"
#include "TBEvent/TBTDCRawCont.h"
#include "TBEvent/TBADCRawCont.h"
-#include "DataModel/ElementLink.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthLinks/ElementLink.h"
+#include "AthenaKernel/CLASS_DEF.h"
class TBScintillatorRaw : public TBBeamDetector
diff --git a/TestBeam/TBEvent/TBEvent/TBScintillatorRawCont.h b/TestBeam/TBEvent/TBEvent/TBScintillatorRawCont.h
index ce26d13f671..bc0af31318c 100755
--- a/TestBeam/TBEvent/TBEvent/TBScintillatorRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBScintillatorRawCont.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBScintillatorRaw.h"
#ifndef TBSCINTILLATORRAWCONT_H
diff --git a/TestBeam/TBEvent/TBEvent/TBTDC.h b/TestBeam/TBEvent/TBEvent/TBTDC.h
index f1b84634f1b..f1247868f49 100755
--- a/TestBeam/TBEvent/TBEvent/TBTDC.h
+++ b/TestBeam/TBEvent/TBEvent/TBTDC.h
@@ -5,7 +5,7 @@
#ifndef TBEVENT_TBTDC_H
#define TBEVENT_TBTDC_H
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
/* Author: Walter Lampl, Remi Lafaye */
/* Contains information from the TDC
diff --git a/TestBeam/TBEvent/TBEvent/TBTDCRaw.h b/TestBeam/TBEvent/TBEvent/TBTDCRaw.h
index 6308d21f5d9..32d510649a9 100755
--- a/TestBeam/TBEvent/TBEvent/TBTDCRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBTDCRaw.h
@@ -7,8 +7,8 @@
#include "TBEvent/TBBeamDetector.h"
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include <string>
diff --git a/TestBeam/TBEvent/TBEvent/TBTDCRawCont.h b/TestBeam/TBEvent/TBEvent/TBTDCRawCont.h
index 5aebf7a415e..8001443e38d 100755
--- a/TestBeam/TBEvent/TBEvent/TBTDCRawCont.h
+++ b/TestBeam/TBEvent/TBEvent/TBTDCRawCont.h
@@ -5,8 +5,8 @@
#ifndef TBTDCRAWCONT_H
#define TBTDCRAWCONT_H
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBEvent/TBTDCRaw.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBTailCatcher.h b/TestBeam/TBEvent/TBEvent/TBTailCatcher.h
index 123478c25a4..6f5924731eb 100755
--- a/TestBeam/TBEvent/TBEvent/TBTailCatcher.h
+++ b/TestBeam/TBEvent/TBEvent/TBTailCatcher.h
@@ -10,9 +10,9 @@
// //
///////////////////////////////////////////////////////////////////////////////
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
#include "TBEvent/TBBeamDetector.h"
#include "TBEvent/TBScintillator.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBTailCatcherRaw.h b/TestBeam/TBEvent/TBEvent/TBTailCatcherRaw.h
index c0b045b1b75..c419305f2d2 100755
--- a/TestBeam/TBEvent/TBEvent/TBTailCatcherRaw.h
+++ b/TestBeam/TBEvent/TBEvent/TBTailCatcherRaw.h
@@ -10,9 +10,9 @@
// //
///////////////////////////////////////////////////////////////////////////////
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
#include "TBEvent/TBBeamDetector.h"
#include "TBEvent/TBScintillatorRaw.h"
diff --git a/TestBeam/TBEvent/TBEvent/TBTrack.h b/TestBeam/TBEvent/TBEvent/TBTrack.h
index 5e5b9c78fe6..6a1315c2c64 100755
--- a/TestBeam/TBEvent/TBEvent/TBTrack.h
+++ b/TestBeam/TBEvent/TBEvent/TBTrack.h
@@ -12,7 +12,7 @@
///////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include <vector>
diff --git a/TestBeam/TBEvent/TBEvent/TBTrackInfo.h b/TestBeam/TBEvent/TBEvent/TBTrackInfo.h
index 2a072b135ae..b936e702e8d 100755
--- a/TestBeam/TBEvent/TBEvent/TBTrackInfo.h
+++ b/TestBeam/TBEvent/TBEvent/TBTrackInfo.h
@@ -11,7 +11,7 @@
// //
///////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include <vector>
diff --git a/TestBeam/TBEvent/TBEvent/TBTriggerPatternUnit.h b/TestBeam/TBEvent/TBEvent/TBTriggerPatternUnit.h
index 06866354b8e..766d6074d1d 100755
--- a/TestBeam/TBEvent/TBEvent/TBTriggerPatternUnit.h
+++ b/TestBeam/TBEvent/TBEvent/TBTriggerPatternUnit.h
@@ -13,7 +13,7 @@
///////////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/MsgStream.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
diff --git a/TestBeam/TBEvent/src/TBBPCRaw.cxx b/TestBeam/TBEvent/src/TBBPCRaw.cxx
index 1a7f48529c3..3e847958072 100755
--- a/TestBeam/TBEvent/src/TBBPCRaw.cxx
+++ b/TestBeam/TBEvent/src/TBBPCRaw.cxx
@@ -3,7 +3,7 @@
*/
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "TBEvent/TBBeamDetector.h"
#include "TBEvent/TBADCRaw.h"
diff --git a/TestBeam/TBEvent/src/TBTailCatcher.cxx b/TestBeam/TBEvent/src/TBTailCatcher.cxx
index 919d63f0009..9bd7af633f6 100755
--- a/TestBeam/TBEvent/src/TBTailCatcher.cxx
+++ b/TestBeam/TBEvent/src/TBTailCatcher.cxx
@@ -3,7 +3,7 @@
*/
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
#include "TBEvent/TBBeamDetector.h"
#include "TBEvent/TBTailCatcher.h"
diff --git a/TestBeam/TBEvent/src/TBTailCatcherRaw.cxx b/TestBeam/TBEvent/src/TBTailCatcherRaw.cxx
index 69354712feb..36719065a74 100755
--- a/TestBeam/TBEvent/src/TBTailCatcherRaw.cxx
+++ b/TestBeam/TBEvent/src/TBTailCatcherRaw.cxx
@@ -3,7 +3,7 @@
*/
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
#include "TBEvent/TBTailCatcherRaw.h"
#include "TBEvent/TBScintillator.h"
--
GitLab