From a691aeedacdea0c8be195eeba6811b945249a024 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 15 Dec 2017 15:21:58 +0100
Subject: [PATCH] TrigCaloEventTPCnv: DataModel -> AthLinks

Remove references to obsolete package DataModel.
---
 .../TrigCaloEventTPCnv/CMakeLists.txt         | 50 +++++++++----------
 .../TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h  |  2 +-
 .../TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h  |  2 +-
 .../TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h  |  2 +-
 .../TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h  |  2 +-
 .../TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h  |  2 +-
 .../src/TrigEMClusterCnv_p2.cxx               |  2 +-
 .../src/TrigEMClusterCnv_p3.cxx               |  2 +-
 .../src/TrigEMClusterCnv_p4.cxx               |  2 +-
 .../src/TrigRNNOutputCnv_p1.cxx               |  2 +-
 .../src/TrigRNNOutputCnv_p2.cxx               |  2 +-
 11 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt
index 3c9b52ae63c2..23bfc361fe94 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( TrigCaloEventTPCnv )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/DataModel
+                          Control/AthLinks
                           Control/DataModelAthenaPool
                           Database/AthenaPOOL/AthenaPoolCnvSvc
                           Database/AthenaPOOL/AthenaPoolUtilities
@@ -29,143 +29,143 @@ atlas_add_tpcnv_library( TrigCaloEventTPCnv
                          PUBLIC_HEADERS TrigCaloEventTPCnv
                          PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
                          PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel )
+                         LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel )
 
 atlas_add_dictionary( TrigCaloEventTPCnvDict
                       TrigCaloEventTPCnv/TrigCaloEventTPCnvDict.h
                       TrigCaloEventTPCnv/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigCaloClusterCnv_p1_test
                 SOURCES
                 test/TrigCaloClusterCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigCaloClusterCnv_p2_test
                 SOURCES
                 test/TrigCaloClusterCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigCaloClusterCnv_p3_test
                 SOURCES
                 test/TrigCaloClusterCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( RingerRingsCnv_p1_test
                 SOURCES
                 test/RingerRingsCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( RingerRingsCnv_p2_test
                 SOURCES
                 test/RingerRingsCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigEMClusterCnv_p2_test
                 SOURCES
                 test/TrigEMClusterCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigEMClusterCnv_p3_test
                 SOURCES
                 test/TrigEMClusterCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigEMClusterCnv_p4_test
                 SOURCES
                 test/TrigEMClusterCnv_p4_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigRNNOutputCnv_p1_test
                 SOURCES
                 test/TrigRNNOutputCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigRNNOutputCnv_p2_test
                 SOURCES
                 test/TrigRNNOutputCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2JetCnv_p2_test
                 SOURCES
                 test/TrigT2JetCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2JetCnv_p3_test
                 SOURCES
                 test/TrigT2JetCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2MbtsBitsCnv_p1_test
                 SOURCES
                 test/TrigT2MbtsBitsCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2MbtsBitsCnv_p2_test
                 SOURCES
                 test/TrigT2MbtsBitsCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2MbtsBitsCnv_p3_test
                 SOURCES
                 test/TrigT2MbtsBitsCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigT2ZdcSignalsCnv_p1_test
                 SOURCES
                 test/TrigT2ZdcSignalsCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterCnv_p2_test
                 SOURCES
                 test/TrigTauClusterCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterCnv_p3_test
                 SOURCES
                 test/TrigTauClusterCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterCnv_p4_test
                 SOURCES
                 test/TrigTauClusterCnv_p4_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterCnv_p5_test
                 SOURCES
                 test/TrigTauClusterCnv_p5_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterDetailsCnv_p1_test
                 SOURCES
                 test/TrigTauClusterDetailsCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
 atlas_add_test( TrigTauClusterDetailsCnv_p2_test
                 SOURCES
                 test/TrigTauClusterDetailsCnv_p2_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
+                LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCaloEvent TestTools AthenaKernel CxxUtils SGTools GaudiKernel TrigCaloEventTPCnv )
 
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h
index 45a1a7658604..1e242d65d94c 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h
@@ -24,7 +24,7 @@
 #include "TrigCaloEventTPCnv/TrigEMCluster_p2.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p1.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 
 #include "TrigCaloEventTPCnv/TrigEMClusterConverterBase.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h
index f2a6c2d2a882..8c611a7f86b6 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h
@@ -24,7 +24,7 @@
 #include "TrigCaloEventTPCnv/TrigEMCluster_p3.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p2.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 
 //#include "TrigCaloEventTPCnv/TrigEMClusterConverterBase.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h
index 60fa35b03e44..649a88b645b6 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h
@@ -24,7 +24,7 @@
 #include "TrigCaloEventTPCnv/TrigEMCluster_p4.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p2.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 
 //#include "TrigCaloEventTPCnv/TrigEMClusterConverterBase.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h
index 877f7b2e0045..ddf3476512d8 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h
@@ -24,7 +24,7 @@
 
 #include "TrigCaloEventTPCnv/TrigRNNOutputConverterBase.h"
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 #include "TrigCaloEvent/TrigEMCluster.h"
 #include "TrigCaloEvent/TrigEMClusterContainer.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h
index b3ee09965c1b..22d5ea11150d 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h
@@ -22,7 +22,7 @@
 #include "TrigCaloEvent/TrigRNNOutput.h"
 #include "TrigCaloEventTPCnv/TrigRNNOutput_p2.h"
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 #include "TrigCaloEvent/TrigEMCluster.h"
 #include "TrigCaloEvent/TrigEMClusterContainer.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p2.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p2.cxx
index d101f2db30db..cbe420272021 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p2.cxx
@@ -6,7 +6,7 @@
 
 #include "TrigCaloEventTPCnv/TrigEMCluster_p2.h"
 #include "TrigCaloEventTPCnv/TrigEMClusterCnv_p2.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p3.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p3.cxx
index a4825e66bc6c..e138607c87fe 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p3.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p3.cxx
@@ -6,7 +6,7 @@
 
 #include "TrigCaloEventTPCnv/TrigEMCluster_p3.h"
 #include "TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p2.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p4.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p4.cxx
index 76ef04e9be2a..9867229d9f30 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p4.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigEMClusterCnv_p4.cxx
@@ -5,7 +5,7 @@
 #include "TrigCaloEvent/TrigEMCluster.h"
 #include "TrigCaloEventTPCnv/TrigEMCluster_p4.h"
 #include "TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "TrigCaloEvent/RingerRingsContainer.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 #include "TrigCaloEventTPCnv/TrigCaloClusterCnv_p2.h"
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p1.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p1.cxx
index 88387a473ff9..295cbee6c5a5 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p1.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p1.cxx
@@ -8,7 +8,7 @@
 #include "TrigCaloEventTPCnv/TrigRNNOutput_p1.h"
 #include "TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h"
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
 
 void TrigRNNOutputCnv_p1::transToPers(const TrigRNNOutput *trans, 
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p2.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p2.cxx
index 05039b2cf80c..2faa68cb2967 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/src/TrigRNNOutputCnv_p2.cxx
@@ -9,7 +9,7 @@
 #include "TrigCaloEventTPCnv/TrigRNNOutput_p2.h"
 #include "TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h"
 
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
 
 void TrigRNNOutputCnv_p2::transToPers(const TrigRNNOutput *trans, 
-- 
GitLab