diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
index 6c63c612d25876c06e60256a0fca71d93960ef06..f5bb2bb6a63e58f9eba4d1de92b7f66e6d3e0752 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
@@ -1,29 +1,8 @@
-################################################################################
-# Package: AnalysisTriggerAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AnalysisTriggerAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Event/EventInfo
- Event/xAOD/xAODTrigL1Calo
- Event/xAOD/xAODTrigger
- Event/xAOD/xAODTriggerCnv
- GaudiKernel
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
- Trigger/TrigConfiguration/TrigConfInterfaces
- Trigger/TrigConfiguration/TrigConfL1Data
- Trigger/TrigT1/TrigT1CaloEvent
- Trigger/TrigT1/TrigT1CaloToolInterfaces
- Trigger/TrigT1/TrigT1Interfaces
- Trigger/TrigT1/TrigT1Result )
-
# External dependencies:
find_package( CLHEP )
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/AnalysisTrigger_jobOptions.py b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/AnalysisTrigger_jobOptions.py
deleted file mode 100644
index 91d3785e8067b7ff26b7b8290009f1f3fc001cbb..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/AnalysisTrigger_jobOptions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from AnalysisTriggerAlgs.AnalysisTriggerAlgsConfig import RoIBResultToAOD
-topSequence += RoIBResultToAOD("RoIBResultToAOD")
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/Data09MuCTPIFix_jobOfragment.py b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/Data09MuCTPIFix_jobOfragment.py
deleted file mode 100644
index d0ef7dd2376a911faaed0fde10af26da4b0c3473..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/Data09MuCTPIFix_jobOfragment.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: Data09MuCTPIFix_jobOfragment.py 275499 2010-01-27 18:25:00Z krasznaa $
-#
-# JobOptions fragment fixing the LVL1_ROI object in the ESD files for the
-# problem in the MuCTPI. (Present for all 2009 collision data.)
-#
-
-# Create a new logger, saving the old one if it already exists with this name:
-if "logger" in dir(): orig_logger = logger
-from AthenaCommon.Logging import logging
-logger = logging.getLogger( "Data09MuCTPIFix" )
-
-# Set up the trigger configuration:
-from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
-TriggerConfigGetter( "ReadPool" )
-logger.info( "Set up the trigger configuration service" )
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-#
-# Fix the RoIBResult object based on the MuCTPI_RDO:
-#
-from AnalysisTriggerAlgs.AnalysisTriggerAlgsConf import MuCTPI_RDOToRoIBResult
-theJob += MuCTPI_RDOToRoIBResult()
-theJob.MuCTPI_RDOToRoIBResult.RoIBOutputKey = "CorrectRoIBResult"
-logger.info( "Added the RoIBResult object fixer algorithm" )
-
-#
-# Create the LVL1_ROI object with the correct muon content.
-# Warning: The Calo RoIs should be taken from the original LVL1_ROI object!
-#
-from AnalysisTriggerAlgs.AnalysisTriggerAlgsConfig import RoIBResultToAOD
-theJob += RoIBResultToAOD()
-theJob.RoIBResultToAOD.DoCalo = False
-theJob.RoIBResultToAOD.RoIBResultInputKey = "CorrectRoIBResult"
-theJob.RoIBResultToAOD.LVL1_ROIOutputKey = "LVL1_ROI"
-
-# Restore the original logger if necessary:
-if "orig_logger" in dir(): logger = orig_logger
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/CMakeLists.txt
index 470872ea25ea3cf65bbc4dc34d1b8a6a2ae548a6..e23fa198ca2b010489beef79d73102224f02fd8d 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent/CMakeLists.txt
@@ -1,31 +1,15 @@
-################################################################################
-# Package: AnalysisTriggerEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AnalysisTriggerEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/Navigation
- Event/EventKernel
- Event/FourMom )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( AnalysisTriggerEvent
src/*.cxx
PUBLIC_HEADERS AnalysisTriggerEvent
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES Navigation AthenaKernel EventKernel FourMom
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES Navigation AthenaKernel EventKernel FourMom )
atlas_add_dictionary( AnalysisTriggerEventDict
AnalysisTriggerEvent/AnalysisTriggerEventDict.h
AnalysisTriggerEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} Navigation AthenaKernel EventKernel FourMom AnalysisTriggerEvent )
-
+ LINK_LIBRARIES AnalysisTriggerEvent )
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/CMakeLists.txt
index 9e1b347b3e510e5564c95d2f3364a51c619ebfc5..a3056cde7e005806a8338376ae062bd868079f29 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventAthenaPool/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: AnalysisTriggerEventAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AnalysisTriggerEventAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- GaudiKernel
- PRIVATE
- Database/AthenaPOOL/AthenaPoolCnvSvc
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv )
-
# Component(s) in the package:
atlas_add_poolcnv_library( AnalysisTriggerEventAthenaPoolPoolCnv
src/*.cxx
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt
index ed78325ff00c3da4fcdc4e5a1408f877e96a4e58..e5825166ae0ee7f34985abd1ce2f9f34064f3dbd 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt
@@ -1,32 +1,21 @@
-################################################################################
-# Package: AnalysisTriggerEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AnalysisTriggerEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- GaudiKernel
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
- PRIVATE
- Control/AthenaKernel
- Trigger/TrigT1/TrigT1Interfaces )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_tpcnv_library( AnalysisTriggerEventTPCnv
src/*.cxx
PUBLIC_HEADERS AnalysisTriggerEventTPCnv
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib GaudiKernel AnalysisTriggerEvent AthenaKernel TrigT1Interfaces )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AnalysisTriggerEvent
+ PRIVATE_LINK_LIBRARIES AthenaKernel GaudiKernel TrigT1Interfaces )
atlas_add_dictionary( AnalysisTriggerEventTPCnvDict
AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnvDict.h
AnalysisTriggerEventTPCnv/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib GaudiKernel AnalysisTriggerEvent AthenaKernel TrigT1Interfaces AnalysisTriggerEventTPCnv )
-
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AnalysisTriggerEventTPCnv )