From 1034948dfe39fedaf1ca3cc1b76c55ec7cab9b2c Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 19 Jun 2020 16:15:07 +0200
Subject: [PATCH] TrigT1CaloMappingToolInterfaces: Merge with
TrigT1CaloToolInterfaces
This package only contained a single header file
(`IL1CaloMappingTool.h`). Move the file to TrigT1CaloToolInterfaces and
delete the package.
---
.../ZdcByteStream/ZdcByteStreamReadV1V2Tool.h | 1 -
Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt | 2 +-
.../TrigT1CaloByteStream/src/CpByteStreamTool.cxx | 2 +-
.../src/CpByteStreamV1Tool.cxx | 2 +-
.../src/CpByteStreamV2Tool.cxx | 2 +-
.../TrigT1CaloByteStream/src/JepByteStreamTool.cxx | 2 +-
.../src/JepByteStreamV1Tool.cxx | 2 +-
.../src/JepByteStreamV2Tool.cxx | 2 +-
.../src/PpmByteStreamV1Tool.cxx | 2 +-
.../src/TriggerTowerSelectionTool.cxx | 2 +-
.../src/xaod/PpmByteStreamReadV1V2Tool.h | 2 +-
.../TrigT1CaloByteStream/test/PpmMappingTester.cxx | 2 +-
.../TrigT1CaloMappingToolInterfaces/CMakeLists.txt | 14 --------------
.../TrigT1/TrigT1CaloMappingTools/CMakeLists.txt | 2 +-
.../TrigT1CaloMappingTools/src/CpmMappingTool.h | 2 +-
.../TrigT1CaloMappingTools/src/JemMappingTool.h | 2 +-
.../src/PpmCoolMappingTool.h | 2 +-
.../src/PpmCoolOrBuiltinMappingTool.h | 2 +-
.../TrigT1CaloMappingTools/src/PpmMappingTool.h | 2 +-
Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt | 2 +-
.../TrigT1CaloSim/ReprocessTriggerTowers.h | 2 +-
.../TrigT1CaloSim/TriggerTowerMaker.h | 2 +-
.../src/OverlayRun2TriggerTowerMaker.cxx | 2 +-
.../TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx | 2 +-
.../TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx | 1 -
.../TrigT1CaloToolInterfaces}/IL1CaloMappingTool.h | 0
Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt | 2 +-
.../TrigT1CaloTools/src/L1TriggerTowerTool.cxx | 2 +-
28 files changed, 24 insertions(+), 40 deletions(-)
delete mode 100644 Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt
rename Trigger/TrigT1/{TrigT1CaloMappingToolInterfaces/TrigT1CaloMappingToolInterfaces => TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces}/IL1CaloMappingTool.h (100%)
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h
index bad5dee644d..865e5545bb2 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h
@@ -20,7 +20,6 @@
#include "GaudiKernel/ServiceHandle.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-//#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
#include "xAODTrigL1Calo/TriggerTower.h"
#include "xAODTrigL1Calo/TriggerTowerContainer.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt
index 66680ad01c3..09334343f42 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt
@@ -21,7 +21,7 @@ atlas_depends_on_subdirs( PUBLIC
Event/EventInfo
ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream
Trigger/TrigT1/TrigT1CaloEvent
- Trigger/TrigT1/TrigT1CaloMappingToolInterfaces
+ Trigger/TrigT1/TrigT1CaloToolInterfaces
Trigger/TrigT1/TrigT1CaloUtils
Trigger/TrigT1/TrigT1Interfaces )
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
index 206890ac88d..b14ec65ac48 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
@@ -19,7 +19,7 @@
#include "TrigT1CaloEvent/CPBSCollection.h"
#include "TrigT1CaloUtils/DataError.h"
#include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "CmmCpSubBlock.h"
#include "CmmSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
index f0e5e785826..30e11fd588e 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
@@ -19,7 +19,7 @@
#include "TrigT1CaloEvent/CPBSCollectionV1.h"
#include "TrigT1CaloUtils/DataError.h"
#include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "CmmCpSubBlock.h"
#include "CmmSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
index 7a4330c21e9..9dca2a78374 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
@@ -19,7 +19,7 @@
#include "TrigT1CaloEvent/CPBSCollectionV2.h"
#include "TrigT1CaloUtils/DataError.h"
#include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "CmxCpSubBlock.h"
#include "CmxSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
index 87a9bd94b0d..90c9f859ed0 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
@@ -21,7 +21,7 @@
#include "TrigT1CaloEvent/JetElement.h"
#include "TrigT1CaloUtils/DataError.h"
#include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "CmmEnergySubBlock.h"
#include "CmmJetSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
index 3c01bc8b1cf..50c664bb845 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
@@ -21,7 +21,7 @@
#include "TrigT1CaloEvent/JetElement.h"
#include "TrigT1CaloUtils/DataError.h"
#include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "CmmEnergySubBlock.h"
#include "CmmJetSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
index 421ba532a0b..8fc573e0a89 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
@@ -21,7 +21,7 @@
#include "TrigT1CaloEvent/JetElement.h"
#include "TrigT1CaloUtils/DataError.h"
#include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "CmxEnergySubBlock.h"
#include "CmxJetSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
index e2563bd1372..5296aa3a451 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
@@ -17,7 +17,7 @@
#include "TrigT1CaloEvent/TriggerTower.h"
#include "TrigT1CaloUtils/DataError.h"
#include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "CmmSubBlock.h"
#include "L1CaloErrorByteStreamTool.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
index 4ef8fb505b4..b0d442f9c55 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
@@ -11,7 +11,7 @@
#include "GaudiKernel/StatusCode.h"
#include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "L1CaloSrcIdMap.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
index 7d970234555..456fc4dcd0f 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
@@ -23,7 +23,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "xAODTrigL1Calo/TriggerTower.h"
#include "xAODTrigL1Calo/TriggerTowerContainer.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
index 83c0f6a1719..af298a66d55 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
@@ -8,7 +8,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/StatusCode.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "PpmMappingTester.h"
diff --git a/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt
deleted file mode 100644
index b5a9d38e10d..00000000000
--- a/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-# Package: TrigT1CaloMappingToolInterfaces
-################################################################################
-
-# Declare the package name:
-atlas_subdir( TrigT1CaloMappingToolInterfaces )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel )
-
-# Install files from the package:
-atlas_install_headers( TrigT1CaloMappingToolInterfaces )
-
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt
index ab5492693d9..b93a3aaa750 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_depends_on_subdirs( PRIVATE
Control/StoreGate
DetectorDescription/Identifier
GaudiKernel
- Trigger/TrigT1/TrigT1CaloMappingToolInterfaces )
+ Trigger/TrigT1/TrigT1CaloToolInterfaces )
# Component(s) in the package:
atlas_add_component( TrigT1CaloMappingTools
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h
index a34894878bd..d6fc878ffc5 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h
@@ -11,7 +11,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
class IInterface;
class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h
index c438dfe954f..b6466a239c1 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h
@@ -11,7 +11,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
class IInterface;
class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h
index ce47e7a6f0d..6afbbfe036d 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h
@@ -12,7 +12,7 @@
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/ToolHandle.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
class CaloLVL1_ID;
class CaloTriggerTowerService;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h
index ed7bb2d95c2..fc8cb0ba1e2 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h
@@ -10,7 +10,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
class IInterface;
class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h
index 12b099065ac..0321ec2e05e 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h
@@ -14,7 +14,7 @@
#include "ChannelCoordinate.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
class IInterface;
class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
index 930c647a27c..79960a5cedc 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
@@ -27,7 +27,7 @@ atlas_depends_on_subdirs(
Trigger/TrigT1/TrigT1CaloCalibConditions
Trigger/TrigT1/TrigT1CaloCalibToolInterfaces
Trigger/TrigT1/TrigT1CaloEvent
- Trigger/TrigT1/TrigT1CaloMappingToolInterfaces
+ Trigger/TrigT1/TrigT1CaloToolInterfaces
Trigger/TrigT1/TrigT1CaloToolInterfaces
Trigger/TrigT1/TrigT1CaloUtils
Trigger/TrigT1/TrigT1Interfaces
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
index 1308f46f2ca..5b40ac012fb 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
@@ -32,7 +32,7 @@
#include "TrigT1CaloEvent/TriggerTowerCollection.h"
// #include "TrigT1CaloCalibTools/L1CaloTTIdTools.h"
#include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
index 0becb50408d..951b7bac211 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
@@ -67,7 +67,7 @@
#include "TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h"
#include "TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h"
#include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
// Include for the configuration service:
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
index 2db59a212b0..f29d72bed4b 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
@@ -14,7 +14,7 @@
#include "TrigT1CaloCalibConditions/L1CaloDisabledTowersContainer.h"
#include "TrigT1CaloCalibConditions/L1CaloPpmDeadChannelsContainer.h"
#include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "TrigConfL1Data/ThresholdConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
index eb0a9f5d4a2..46622cfc4d2 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
@@ -15,7 +15,7 @@
#include "TrigT1CaloCalibConditions/L1CaloDisabledTowersContainer.h"
#include "TrigT1CaloCalibConditions/L1CaloPpmDeadChannelsContainer.h"
#include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
#include "TrigConfL1Data/ThresholdConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
index 0020eaa3358..0f1ea96ee8e 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
@@ -24,7 +24,6 @@
#include <CLHEP/Random/Randomize.h>
#include "TrigConfL1Data/ThresholdConfig.h"
-//#include "TrigT1CaloByteStream/IL1CaloMappingTool.h"
#include "TrigT1CaloUtils/InternalTriggerTower_ClassDEF.h"
#include "TrigT1CaloCalibConditions/L1CaloModuleType.h"
#include "AthContainers/ConstDataVector.h"
diff --git a/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CaloMappingTool.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h
rename to Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CaloMappingTool.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
index 4aad8cec169..d0dab4f8469 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
@@ -28,7 +28,7 @@ atlas_depends_on_subdirs( PUBLIC
Trigger/TrigT1/TrigT1CaloCalibConditions
Trigger/TrigT1/TrigT1CaloCalibToolInterfaces
Trigger/TrigT1/TrigT1CaloCondSvc
- Trigger/TrigT1/TrigT1CaloMappingToolInterfaces )
+ Trigger/TrigT1/TrigT1CaloToolInterfaces )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
index 2f1744d6485..b1808efba1c 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
@@ -42,7 +42,7 @@
#include "TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h"
#include "TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
#include "TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h"
#include "StoreGate/ReadHandle.h"
--
GitLab