From 2aa0412b125595356b4e0dce8dca31d568b64289 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Thu, 25 Mar 2021 10:12:11 +0100
Subject: [PATCH] TrigT1ResultByteStream: Package cleanup

- move private headers to src directory
- convert library to interface-only and update link dependencies
- delete obsolete job options
---
 .../TrigT1ResultByteStream/CMakeLists.txt     | 14 +--
 .../share/ReadLVL1BS_jobOptions.py            | 89 -------------------
 .../share/WriteLVL1BS_jobOptions.py           | 55 ------------
 .../src/CTPByteStreamCnv.cxx                  |  2 +-
 .../CTPByteStreamCnv.h                        |  4 +-
 .../src/CTPByteStreamTool.cxx                 |  2 +-
 .../CTPByteStreamTool.h                       |  2 +-
 .../src/CTPSrcIdMap.cxx                       |  2 +-
 .../CTPSrcIdMap.h                             |  0
 .../src/L1TriggerResultByteStreamCnv.cxx      |  2 +-
 .../L1TriggerResultByteStreamCnv.h            |  0
 .../src/MuCTPIByteStreamCnv.cxx               |  8 +-
 .../MuCTPIByteStreamCnv.h                     |  6 +-
 .../src/MuCTPIByteStreamTool.cxx              |  2 +-
 .../MuCTPIByteStreamTool.h                    |  2 +-
 .../src/MuCTPISrcIdMap.cxx                    |  2 +-
 .../MuCTPISrcIdMap.h                          |  0
 .../src/RecCTPByteStreamCnv.cxx               |  2 +-
 .../RecCTPByteStreamCnv.h                     |  4 +-
 .../src/RecCTPByteStreamTool.cxx              |  2 +-
 .../RecCTPByteStreamTool.h                    |  2 +-
 .../src/RecMuCTPIByteStreamCnv.cxx            |  2 +-
 .../RecMuCTPIByteStreamCnv.h                  |  4 +-
 .../src/RecMuCTPIByteStreamTool.cxx           |  2 +-
 .../RecMuCTPIByteStreamTool.h                 |  2 +-
 .../RecRoIBResultByteStreamCnv.h              |  6 +-
 .../RecRoIBResultByteStreamCnv.icc            |  0
 .../src/RecRoIBResultByteStreamTool.cxx       |  2 +-
 .../RecRoIBResultByteStreamTool.h             |  0
 .../RoIBResultByteStreamCnv.h                 |  6 +-
 .../RoIBResultByteStreamCnv.icc               |  0
 .../src/RoIBResultByteStreamTool.cxx          |  2 +-
 .../RoIBResultByteStreamTool.h                |  0
 .../TrigT1ResultByteStream_entries.cxx        | 30 +++----
 34 files changed, 57 insertions(+), 201 deletions(-)
 delete mode 100644 Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py
 delete mode 100644 Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/CTPByteStreamCnv.h (95%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/CTPByteStreamTool.h (97%)
 mode change 100755 => 100644
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/CTPSrcIdMap.h (100%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/L1TriggerResultByteStreamCnv.h (100%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/MuCTPIByteStreamCnv.h (94%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/MuCTPIByteStreamTool.h (96%)
 mode change 100755 => 100644
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/MuCTPISrcIdMap.h (100%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RecCTPByteStreamCnv.h (94%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RecCTPByteStreamTool.h (96%)
 mode change 100755 => 100644
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RecMuCTPIByteStreamCnv.h (94%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RecMuCTPIByteStreamTool.h (97%)
 mode change 100755 => 100644
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RecRoIBResultByteStreamCnv.h (90%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RecRoIBResultByteStreamCnv.icc (100%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RecRoIBResultByteStreamTool.h (100%)
 mode change 100755 => 100644
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RoIBResultByteStreamCnv.h (92%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RoIBResultByteStreamCnv.icc (100%)
 rename Trigger/TrigT1/TrigT1ResultByteStream/{TrigT1ResultByteStream => src}/RoIBResultByteStreamTool.h (100%)
 mode change 100755 => 100644

diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt b/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt
index 4f017ff7d677..90af52a29357 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigT1ResultByteStream )
@@ -8,16 +8,16 @@ find_package( tdaq-common COMPONENTS CTPfragment eformat )
 
 # Component(s) in the package:
 atlas_add_library( TrigT1ResultByteStreamLib
-                   src/*.cxx
+                   TrigT1ResultByteStream/*.h
+                   INTERFACE
                    PUBLIC_HEADERS TrigT1ResultByteStream
-                   INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                   LINK_LIBRARIES AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamCnvSvcLib ByteStreamData GaudiKernel L1TopoRDO TrigConfInterfaces TrigConfL1Data TrigT1Interfaces TrigT1Result xAODTrigger
-                   PRIVATE_LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} )
+                   LINK_LIBRARIES ByteStreamData GaudiKernel )
 
 atlas_add_component( TrigT1ResultByteStream
+                     src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES TrigT1ResultByteStreamLib )
+                     INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamCnvSvcLib ByteStreamData GaudiKernel L1TopoRDO StoreGateLib TrigConfInterfaces TrigConfL1Data TrigT1Interfaces TrigT1Result TrigT1ResultByteStreamLib xAODTrigger )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py b/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py
deleted file mode 100644
index d4e39d6b6fac..000000000000
--- a/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#=================================================================
-#
-# JobOption for testing the reading of the LVL1 content of a BS
-# file. The jobO is designed to be used together with
-# WriteLVL1BS_jobOption.py.
-#
-#=================================================================
-
-#
-# User configuration:
-#
-CBNTAAOutput = "LVL1BSTest.root"
-EvtMax = -1
-
-#
-# Create the necessary Python objects:
-#
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from AthenaCommon.Logging import logging
-log = logging.getLogger( "ReadLVL1BS" )
-
-from AthenaCommon.AppMgr import ServiceMgr
-
-#
-# Set up the reading of the BS file:
-#
-include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-svcMgr.EventSelector.Input = [
-  "daq.lvl1test.0000000.Single.Stream.LB0000.Athena._0001.data"
-]
-
-include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
-include( "ByteStreamCnvSvcBase/BSAddProvSvc_RIO_jobOptions.py" )
-
-log.info( "Set input BS file" )
-
-#
-# Set up writing of the AANT file:
-#
-from GaudiSvc.GaudiSvcConf import THistSvc
-histSvc = THistSvc()
-histSvc.Output = [ "AANT DATAFILE='" + CBNTAAOutput + "' OPT='RECREATE'" ]
-ServiceMgr += histSvc
-
-from AnalysisTools.AnalysisToolsConf import AANTupleStream
-ntupleStream = AANTupleStream()
-ntupleStream.OutputName = CBNTAAOutput
-ntupleStream.ExistDataHeader = False
-topSequence += ntupleStream
-
-theApp.HistogramPersistency = "ROOT"
-
-log.info( "Configured output AANT file" )
-
-#
-# Configure the LVL1 config svc.:
-#
-from TrigConfigSvc.TrigConfigSvcConfig import LVL1ConfigSvc
-ServiceMgr += LVL1ConfigSvc( "LVL1ConfigSvc" )
-ServiceMgr.LVL1ConfigSvc.XMLFile = "Rel3_Sept_12_outputLVL1config.xml"
-ServiceMgr.LVL1ConfigSvc.CreateLegacyObjects = True
-log.info( "Set up the LVL1 configuration service" )
-
-#
-# The CBNTAA algorithms:
-#
-from CBNT_Athena.CBNT_AthenaAwareCfg import CBNT_AthenaAware
-topSequence += CBNT_AthenaAware()
-
-from TrigT1CTP.TrigT1CTPConf import LVL1CTP__CBNTAA_CTP_RDO
-topSequence.CBNT_AthenaAware += LVL1CTP__CBNTAA_CTP_RDO( "CBNTAA_CTP_RDO" )
-
-from TrigT1Muctpi.TrigT1MuctpiConf import CBNTAA_ReadMuCTPI_RDO
-topSequence.CBNT_AthenaAware += CBNTAA_ReadMuCTPI_RDO()
-
-from TrigT1RoIB.TrigT1RoIBConf import CBNTAA_ReadRoIBResult
-topSequence.CBNT_AthenaAware += CBNTAA_ReadRoIBResult()
-
-log.info( "Added all CBNTAA algorithms" )
-
-#
-# Additional configuration:
-#
-theApp.EvtMax = EvtMax
-ServiceMgr.MessageSvc.OutputLevel = 3
-ServiceMgr.MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M"
-#ToolSvc.OutputLevel = 2
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py b/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py
deleted file mode 100644
index b3cfb610d20d..000000000000
--- a/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#=================================================================
-#
-# JobOption for writing out a BS file with all the LVL1
-# information. This is just intended as an example and for usage
-# while developing/modifying the converters.
-#
-#=================================================================
-
-#
-# User configuration:
-#
-RDOInput = [ "/scratch/krasznaa/top_rdo/RDO.017303._00028.pool.root.1",
-             "/scratch/krasznaa/top_rdo/RDO.017303._00037.pool.root.1" ]
-EvtMax = 100
-
-#
-# Create the necessary Python objects:
-#
-from AthenaCommon.Logging import logging
-log = logging.getLogger( "WriteLVL1BS" )
-
-from AthenaCommon.AppMgr import ServiceMgr
-from AthenaCommon.AppMgr import ToolSvc
-
-#
-# Set up reading of the POOL RDO file(s):
-#
-include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" )
-ServiceMgr.EventSelector.InputCollections = RDOInput
-log.info( "Set input POOL file" )
-
-#
-# Load the dinctionaries and converters for the LVL1 objects:
-#
-include( "TrigT1Result/TrigT1ResultDict_joboptions.py" )
-include( "TrigT1EventAthenaPool/TrigT1EventAthenaPool_joboptions.py" )
-
-#
-# Configure the output BS file:
-#
-include( "ByteStreamCnvSvc/WriteByteStream_EventStorage_jobOptions.py" )
-ServiceMgr.ByteStreamEventStorageOutputSvc.FileTag = "lvl1test"
-
-oStream.ItemList += [ "ROIB::RoIBResult#*" ]
-oStream.ItemList += [ "CTP_RDO#*" ]
-oStream.ItemList += [ "MuCTPI_RDO#*" ]
-log.info( "Configured output BS file" )
-
-#
-# Additional configuration:
-#
-theApp.EvtMax = EvtMax
-ServiceMgr.MessageSvc.OutputLevel = 3
-ServiceMgr.MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M"
-#ToolSvc.OutputLevel = 2
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
index 5741d57ef071..da2b2544acbf 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
@@ -15,7 +15,7 @@
 #include "TrigT1Result/CTP_RDO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPByteStreamCnv.h"
+#include "CTPByteStreamCnv.h"
 
 /**
  * The constructor sets up all the ToolHandle and ServiceHandle objects and initialises the
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.h
similarity index 95%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.h
index c5b6cf2589a4..d85f59b37d39 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.h
@@ -16,8 +16,8 @@
 #include "ByteStreamCnvSvcBase/IByteStreamEventAccess.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPByteStreamTool.h"
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "CTPByteStreamTool.h"
+#include "CTPSrcIdMap.h"
 
 
 /**
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx
index 067ce650adc8..f03c9481addd 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx
@@ -11,7 +11,7 @@
 #include "TrigT1Result/CTP_RDO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPByteStreamTool.h"
+#include "CTPByteStreamTool.h"
 
 /// Unique interface ID of the tool that identifies it to the framweork
 static const InterfaceID IID_ICTPByteStreamTool( "CTPByteStreamTool", 1, 0 );
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.h
old mode 100755
new mode 100644
similarity index 97%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.h
index 3d2f221d0d41..c5ccf7c164f5
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.h
@@ -14,7 +14,7 @@
 #include "ByteStreamCnvSvcBase/FullEventAssembler.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "CTPSrcIdMap.h"
 
 // Forward declaration(s):
 class CTP_RDO;
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx
index 831e9171bbfa..e12d72b94031 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx
@@ -5,7 +5,7 @@
 
 #include "eformat/SourceIdentifier.h"
 
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "CTPSrcIdMap.h"
 
 using eformat::helper::SourceIdentifier;
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPSrcIdMap.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPSrcIdMap.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.cxx
index 4e86aa7744b3..a67daa759029 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.cxx
@@ -3,7 +3,7 @@
 */
 
 // Trigger includes
-#include "TrigT1ResultByteStream/L1TriggerResultByteStreamCnv.h"
+#include "L1TriggerResultByteStreamCnv.h"
 #include "xAODTrigger/TrigCompositeContainer.h"
 
 // Athena includes
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/L1TriggerResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/L1TriggerResultByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
index 0438a9478e6e..7d1b335d6a5f 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
@@ -14,14 +14,14 @@
 #include "TrigT1Result/MuCTPI_RDO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/MuCTPIByteStreamCnv.h"
-#include "TrigT1ResultByteStream/MuCTPIByteStreamTool.h"
+#include "MuCTPIByteStreamCnv.h"
+#include "MuCTPIByteStreamTool.h"
 
 // Hack for early data, where CTP and MuCTPI were plugged into the
 // same ROS PC
 #ifdef CTP_MUCTPI_HAVE_SAME_ROS
-#  include "TrigT1ResultByteStream/CTPByteStreamTool.h"
-#  include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
+#  include "CTPByteStreamTool.h"
+#  include "RecCTPByteStreamTool.h"
 #  include "TrigT1Result/CTP_RDO.h"
 #  include "TrigT1Result/CTP_RIO.h"
 #endif
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.h
similarity index 94%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.h
index 1dc1933930de..5235d8c06b9f 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.h
@@ -22,11 +22,11 @@
 #include "ByteStreamCnvSvcBase/IByteStreamEventAccess.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/MuCTPIByteStreamTool.h"
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "MuCTPIByteStreamTool.h"
+#include "MuCTPISrcIdMap.h"
 #ifdef CTP_MUCTPI_HAVE_SAME_ROS
 #  include "TrigT1ResultByteStream/CTPByteStreamTool.h"
-#  include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
+#  include "RecCTPByteStreamTool.h"
 #endif
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx
index 67e18ae5bb9f..edb71fd60216 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TrigT1ResultByteStream/MuCTPIByteStreamTool.h"
+#include "MuCTPIByteStreamTool.h"
 #include "TrigT1Result/MuCTPI_RDO.h"
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.h
old mode 100755
new mode 100644
similarity index 96%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.h
index 311fc95613fe..17e7a6d96a55
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.h
@@ -13,7 +13,7 @@
 #include "ByteStreamCnvSvcBase/FullEventAssembler.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "MuCTPISrcIdMap.h"
 
 // Forward declaration(s):
 class MuCTPI_RDO;
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx
index a6bee524657b..985f724ba521 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx
@@ -4,7 +4,7 @@
 
 #include "eformat/SourceIdentifier.h"
 
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "MuCTPISrcIdMap.h"
 
 using eformat::helper::SourceIdentifier;
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPISrcIdMap.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPISrcIdMap.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
index a4c7fbc0279a..a9a295fe4df9 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
@@ -15,7 +15,7 @@
 #include "TrigT1Result/CTP_RIO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecCTPByteStreamCnv.h"
+#include "RecCTPByteStreamCnv.h"
 
 /**
  * The constructor sets up all the ToolHandle and ServiceHandle objects and initialises the
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.h
similarity index 94%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.h
index 436698f78ef4..ec2ac6bf3b4b 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.h
@@ -16,8 +16,8 @@
 #include "ByteStreamCnvSvcBase/IByteStreamEventAccess.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "RecCTPByteStreamTool.h"
+#include "CTPSrcIdMap.h"
 
 
 /**
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx
index 415d731e8e7f..2f69053de072 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx
@@ -6,7 +6,7 @@
 #include "TrigT1Result/CTP_RIO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
+#include "RecCTPByteStreamTool.h"
 
 /// Unique interface ID of the tool that identifies it to the framweork
 static const InterfaceID IID_IRecCTPByteStreamTool( "RecCTPByteStreamTool", 1, 0 );
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.h
old mode 100755
new mode 100644
similarity index 96%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.h
index 08a66425a344..1fab6672cd09
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.h
@@ -14,7 +14,7 @@
 #include "ByteStreamCnvSvcBase/FullEventAssembler.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "CTPSrcIdMap.h"
 
 // Forward declaration(s):
 class CTP_RIO;
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
index 50d72b0bf3f7..592b7504b777 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
@@ -14,7 +14,7 @@
 #include "TrigT1Result/MuCTPI_RIO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h"
+#include "RecMuCTPIByteStreamCnv.h"
 
 /**
  * The constructor sets up all the ToolHandle and ServiceHandle objects and initialises the
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.h
similarity index 94%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.h
index f9536e6a3847..244577bc860f 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.h
@@ -16,8 +16,8 @@
 #include "ByteStreamCnvSvcBase/IByteStreamEventAccess.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h"
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "RecMuCTPIByteStreamTool.h"
+#include "MuCTPISrcIdMap.h"
 
 
 /**
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx
index 9075125d67a8..80288da57f62 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx
@@ -14,7 +14,7 @@
 #include "TrigConfL1Data/TriggerItem.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h"
+#include "RecMuCTPIByteStreamTool.h"
 
 /// Unique interface ID of the tool that identifies it to the framweork
 static const InterfaceID IID_IRecMuCTPIByteStreamTool( "RecMuCTPIByteStreamTool", 1, 1 );
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.h
old mode 100755
new mode 100644
similarity index 97%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.h
index 36c6d797d5c9..0b89900ef35e
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.h
@@ -16,7 +16,7 @@
 #include "TrigConfInterfaces/ILVL1ConfigSvc.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "MuCTPISrcIdMap.h"
 
 // Forward declaration(s):
 class MuCTPI_RIO;
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h
similarity index 90%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h
index 1bd47c960566..360d2846f8c4 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
 #define TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
 
 // Local includes
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h"
+#include "RecRoIBResultByteStreamTool.h"
 
 // Athena includes
 #include "AthenaBaseComps/AthMessaging.h"
@@ -59,6 +59,6 @@ private:
 }; // class RecRoIBResultByteStreamCnv
 
 // Include the implementation:
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc"
+#include "RecRoIBResultByteStreamCnv.icc"
 
 #endif // TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.icc
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.icc
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
index 05a180ef87f5..059cd2887f38 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
@@ -3,7 +3,7 @@
 */
 
 // Local includes:
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h"
+#include "RecRoIBResultByteStreamTool.h"
 
 // Trigger includes:
 #include "TrigConfL1Data/CTPConfig.h"
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.h
similarity index 92%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.h
index 8c8528f6965b..7b11b39dcc5a 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMCNV_H
 #define TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMCNV_H
 
 // Local includes
-#include "TrigT1ResultByteStream/RoIBResultByteStreamTool.h"
+#include "RoIBResultByteStreamTool.h"
 
 // Athena includes
 #include "AthenaBaseComps/AthMessaging.h"
@@ -66,6 +66,6 @@ private:
 }; // class RoIBResultByteStreamCnv
 
 // Include the implementation:
-#include "TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc"
+#include "RoIBResultByteStreamCnv.icc"
 
 #endif // TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.icc
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.icc
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx
index 74583d635877..e301f5167c41 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx
@@ -3,7 +3,7 @@
 */
 
 // Local includes:
-#include "TrigT1ResultByteStream/RoIBResultByteStreamTool.h"
+#include "RoIBResultByteStreamTool.h"
 
 // Trigger includes:
 #include "CTPfragment/CTPdataformat.h"
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
index da58962a2114..0bc86fd1e98d 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
@@ -1,18 +1,18 @@
-#include "TrigT1ResultByteStream/L1TriggerResultByteStreamCnv.h"
-#include "TrigT1ResultByteStream/RoIBResultByteStreamCnv.h"
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h"
-
-#include "TrigT1ResultByteStream/MuCTPIByteStreamCnv.h"
-#include "TrigT1ResultByteStream/CTPByteStreamCnv.h"
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h"
-#include "TrigT1ResultByteStream/RecCTPByteStreamCnv.h"
-
-#include "TrigT1ResultByteStream/CTPByteStreamTool.h"
-#include "TrigT1ResultByteStream/MuCTPIByteStreamTool.h"
-#include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h"
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h"
-#include "TrigT1ResultByteStream/RoIBResultByteStreamTool.h"
+#include "../L1TriggerResultByteStreamCnv.h"
+#include "../RoIBResultByteStreamCnv.h"
+#include "../RecRoIBResultByteStreamCnv.h"
+
+#include "../MuCTPIByteStreamCnv.h"
+#include "../CTPByteStreamCnv.h"
+#include "../RecMuCTPIByteStreamCnv.h"
+#include "../RecCTPByteStreamCnv.h"
+
+#include "../CTPByteStreamTool.h"
+#include "../MuCTPIByteStreamTool.h"
+#include "../RecCTPByteStreamTool.h"
+#include "../RecMuCTPIByteStreamTool.h"
+#include "../RecRoIBResultByteStreamTool.h"
+#include "../RoIBResultByteStreamTool.h"
 
 #include "../L1TriggerByteStreamDecoderAlg.h"
 #include "../ExampleL1TriggerByteStreamTool.h"
-- 
GitLab