diff --git a/Trigger/TrigCost/EnhancedBiasWeighter/CMakeLists.txt b/Trigger/TrigCost/EnhancedBiasWeighter/CMakeLists.txt
index 2654ace712c9a19b7f978d27050c6ea833faf92b..7d44d6b9863b504e4a881cf31c61b7f522f5dd84 100644
--- a/Trigger/TrigCost/EnhancedBiasWeighter/CMakeLists.txt
+++ b/Trigger/TrigCost/EnhancedBiasWeighter/CMakeLists.txt
@@ -1,53 +1,28 @@
-################################################################################
-# Package: EnhancedBiasWeighter
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( EnhancedBiasWeighter )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODEventInfo
- GaudiKernel
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkInterfaces
- Trigger/TrigAnalysis/TrigAnalysisInterfaces
- PRIVATE
- AtlasTest/TestTools
- Tools/PathResolver )
-
# External dependencies:
find_package( COOL COMPONENTS CoolKernel CoolApplication )
find_package( CORAL COMPONENTS CoralKernel )
find_package( ROOT COMPONENTS XMLIO XMLParser Core )
find_package( LibXml2 )
-# tag NEEDS_CORAL_BASE was not recognized in automatic conversion in cmt2cmake
-
# Component(s) in the package:
atlas_add_library( EnhancedBiasWeighterLib
Root/*.cxx
PUBLIC_HEADERS EnhancedBiasWeighter
INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} AsgTools xAODEventInfo GaudiKernel ${LIBXML2_LIBRARIES}
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} TestTools PathResolver )
+ PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${COOL_LIBRARIES} ${LIBXML2_LIBRARIES} AsgTools DerivationFrameworkInterfaces GaudiKernel TrigAnalysisInterfaces xAODEventInfo
+ PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} PathResolver )
atlas_add_component( EnhancedBiasWeighter
src/components/*.cxx
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${LIBXML2_LIBRARIES} AsgTools xAODEventInfo GaudiKernel TestTools PathResolver EnhancedBiasWeighterLib )
+ LINK_LIBRARIES EnhancedBiasWeighterLib )
atlas_add_dictionary( EnhancedBiasWeighterDict
EnhancedBiasWeighter/EnhancedBiasWeighterDict.h
EnhancedBiasWeighter/selection.xml
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${LIBXML2_LIBRARIES} AsgTools xAODEventInfo GaudiKernel TestTools PathResolver EnhancedBiasWeighterLib )
-
-# No tests at the moment
-#atlas_add_test( ut_EnhancedBiasWeighter_test
-# SOURCES
-# test/ut_EnhancedBiasWeighter_test.cxx
-# INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR}
-# LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${LIBXML2_LIBRARIES} AsgTools xAODEventInfo GaudiKernel TestTools PathResolver EnhancedBiasWeighterLib )
-
+ LINK_LIBRARIES EnhancedBiasWeighterLib )
diff --git a/Trigger/TrigCost/RatesAnalysis/CMakeLists.txt b/Trigger/TrigCost/RatesAnalysis/CMakeLists.txt
index f1953494930bf33c154c18b3f1511a6b1382b3ac..b6d2c0f8a042fe23038aa4e77fbfe29e424a59de 100644
--- a/Trigger/TrigCost/RatesAnalysis/CMakeLists.txt
+++ b/Trigger/TrigCost/RatesAnalysis/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: RatesAnalysis
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RatesAnalysis )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthAnalysisBaseComps
- GaudiKernel
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigCost/EnhancedBiasWeighter
- PRIVATE
- Event/xAOD/xAODEventInfo
- Trigger/TrigConfiguration/TrigConfL1Data )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -24,18 +12,18 @@ atlas_add_library( RatesAnalysisLib
PUBLIC_HEADERS RatesAnalysis
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthAnalysisBaseCompsLib TrigDecisionToolLib EnhancedBiasWeighterLib
- PRIVATE_LINK_LIBRARIES xAODEventInfo )
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps EventInfo TrigConfL1Data xAODEventInfo )
# Component(s) in the package:
atlas_add_component( RatesAnalysis
src/FullMenu.cxx
src/components/RatesAnalysis_entries.cxx
- LINK_LIBRARIES GaudiKernel RatesAnalysisLib TrigConfL1Data )
+ LINK_LIBRARIES RatesAnalysisLib )
atlas_add_test( RatesAnalysis_test
SOURCES test/RatesAnalysis_test.cxx
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthAnalysisBaseCompsLib RatesAnalysisLib TrigDecisionToolLib EnhancedBiasWeighterLib xAODEventInfo )
+ LINK_LIBRARIES RatesAnalysisLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( share/RatesAnalysisFullMenu.py share/RatesAnalysisPostProcessing.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( share/RatesAnalysisFullMenu.py share/RatesAnalysisPostProcessing.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigCost/RatesAnalysis/python/RatesTrigger.py b/Trigger/TrigCost/RatesAnalysis/python/RatesTrigger.py
index 398c95d003ae083bfd5437c432ed219a5c675fbf..5da4cfed0b1b37b7ea348367bd563b9ffb4d6b2e 100644
--- a/Trigger/TrigCost/RatesAnalysis/python/RatesTrigger.py
+++ b/Trigger/TrigCost/RatesAnalysis/python/RatesTrigger.py
@@ -7,8 +7,7 @@
@brief Accumulator class to buffer data for a single trigger and export this to JSON or CSV
'''
-import ROOT
-import math
+import math
from enum import Enum
class RatesBins(Enum):
diff --git a/Trigger/TrigCost/RatesAnalysis/python/Util.py b/Trigger/TrigCost/RatesAnalysis/python/Util.py
index 7353d93ebff3e9c14142e00d7e419fc4758b30bb..16cb17d700f231a38dd45f104481e6b62b4a59c9 100644
--- a/Trigger/TrigCost/RatesAnalysis/python/Util.py
+++ b/Trigger/TrigCost/RatesAnalysis/python/Util.py
@@ -37,8 +37,8 @@ def toJson(fileName, metadata, L1Triggers, HLTTriggers):
def getMetadata(inputFile):
- metatree = inputFile.Get("metadata");
- if metatree == None:
+ metatree = inputFile.Get("metadata")
+ if metatree is None:
return None
metatree.GetEntry(0)
diff --git a/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py b/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py
index 5cf3e0808795f055707e4cd79983fa055ba21aac..e976afaebe480caae3b5c0d914df10076ce076ad 100755
--- a/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py
+++ b/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisFullMenu.py
@@ -39,7 +39,6 @@ if __name__=='__main__':
# Set the Athena configuration flags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- from AthenaConfiguration.AutoConfigFlags import GetFileMD
# Set the Athena configuration flags
ConfigFlags.Input.Files = ["root://eosatlas.cern.ch//eos/atlas/atlasdatadisk/rucio/data16_13TeV/8d/de/AOD.10654269._000566.pool.root.1"]
@@ -74,7 +73,6 @@ if __name__=='__main__':
cfgsvc = CompFactory.TrigConf.xAODConfigSvc('xAODConfigSvc')
cfg.addService(cfgsvc)
- from TrigEDMConfig.TriggerEDM import EDMLibraries
tdt = CompFactory.Trig.TrigDecisionTool('TrigDecisionTool')
tdt.TrigConfigSvc = cfgsvc
tdt.NavigationFormat = "TrigComposite"
diff --git a/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisPostProcessing.py b/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisPostProcessing.py
index 80a0818f18cdb7b6b9846949fb92cebee6e70ded..3e578c4db29145f127aea500c660e4933541a68d 100755
--- a/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisPostProcessing.py
+++ b/Trigger/TrigCost/RatesAnalysis/share/RatesAnalysisPostProcessing.py
@@ -11,12 +11,10 @@
'''
import ROOT
-from RatesAnalysis.RatesTrigger import RatesTrigger
from RatesAnalysis.Util import getMetadata, populateTriggers, getGlobalGroup, toJson
from AthenaCommon.Logging import logging
def main():
- import sys
from argparse import ArgumentParser
parser = ArgumentParser()
parser.add_argument('--file', default='RatesHistograms.root',
@@ -43,7 +41,6 @@ def main():
metadata['n_evts'] = normHist.GetBinContent(2)
HLTGlobalGroup = getGlobalGroup(inputFile, 'Main')
- HLTExpressGroup = getGlobalGroup(inputFile, 'Express')
L1GlobalGroup = getGlobalGroup(inputFile, 'L1')
L1Triggers = populateTriggers(inputFile, metadata, L1GlobalGroup, 'L1_')
diff --git a/Trigger/TrigCost/TrigCostAnalysis/CMakeLists.txt b/Trigger/TrigCost/TrigCostAnalysis/CMakeLists.txt
index a160364d3b812d725112aafc58b30b3332070de1..a41f8774135aba8e21456c27efa8ecba33030817 100644
--- a/Trigger/TrigCost/TrigCostAnalysis/CMakeLists.txt
+++ b/Trigger/TrigCost/TrigCostAnalysis/CMakeLists.txt
@@ -1,27 +1,14 @@
-################################################################################
-# Package: TrigCostAnalysis
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigCostAnalysis )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthAnalysisBaseComps
- GaudiKernel
- PRIVATE
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigCost/EnhancedBiasWeighter
- Event/xAOD/xAODEventInfo
- Trigger/TrigConfiguration/TrigConfData )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-find_package( Boost )
+find_package( ROOT COMPONENTS Core Hist RIO )
# Athena algorithm to do cost analysis and produce histograms
atlas_add_component( TrigCostAnalysis
- src/*.cxx src/monitors/*.cxx src/counters/*.cxx src/components/TrigCostAnalysis_entries.cxx
+ src/*.cxx src/monitors/*.cxx src/counters/*.cxx src/components/TrigCostAnalysis_entries.cxx
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AthAnalysisBaseCompsLib TrigDecisionToolLib EnhancedBiasWeighterLib xAODEventInfo PathResolver TrigConfData )
# Small helper library used by trigCostHistToCSV
@@ -29,12 +16,11 @@ atlas_add_library( TrigCostAnalysisLib
TrigCostAnalysis/*.h Root/*.cxx TrigCostAnalysis/TableConstructors/*.h Root/TableConstructors/*.cxx
PUBLIC_HEADERS TrigCostAnalysis
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthenaBaseComps )
# Lightweight post processing of cost histograms to produce CSV output
atlas_add_executable( trigCostHistToCSV
util/trigCostHistToCSV.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel TrigCostAnalysisLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthenaBaseComps TrigCostAnalysisLib )
atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/CMakeLists.txt b/Trigger/TrigCost/TrigCostRootAnalysis/CMakeLists.txt
index 47fca7e442b518090821fb41f71bdc563be0dbdd..b21d5a9d5d84e855a1593d34a29265def92fd28a 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/CMakeLists.txt
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: TrigCostRootAnalysis
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigCostRootAnalysis )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Trigger/TrigCost/TrigCostD3PD
- PRIVATE
- Tools/PathResolver
- Trigger/TrigAnalysis/TrigRootAnalysis )
-
# External dependencies:
find_package( ROOT COMPONENTS Graf Gpad MathCore XMLIO XMLParser Core Tree
Hist RIO )
@@ -26,13 +17,11 @@ atlas_add_library( TrigCostRootAnalysisLib
atlas_add_executable( RunTrigCostD3PD
util/RunTrigCostD3PD.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigCostRootAnalysisLib )
+ LINK_LIBRARIES TrigCostRootAnalysisLib )
atlas_add_executable( TrigCostD3PD_UserSkeleton
util/TrigCostD3PD_UserSkeleton.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PathResolver TrigCostRootAnalysisLib )
+ LINK_LIBRARIES PathResolver TrigCostRootAnalysisLib )
# Install files from the package:
atlas_install_runtime( data/*.xml )
diff --git a/Trigger/TrigSteer/TrigSteering/CMakeLists.txt b/Trigger/TrigSteer/TrigSteering/CMakeLists.txt
index 068ea781f60e4efc4e6bae438043b34292b9e513..6ecf729df5d10e7f4dbe8a4e137ce15be309d3f5 100644
--- a/Trigger/TrigSteer/TrigSteering/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigSteering/CMakeLists.txt
@@ -1,92 +1,45 @@
-################################################################################
-# Package: TrigSteering
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSteering )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthenaMonitoring
- Control/AthContainers
- Control/StoreGate
- Event/EventInfo
- Event/xAOD/xAODEventInfo
- GaudiKernel
- Trigger/TrigConfiguration/TrigConfBase
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigConfiguration/TrigConfInterfaces
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigT1/L1Topo/L1TopoAlgorithms
- Trigger/TrigT1/L1Topo/L1TopoCoreSim
- Trigger/TrigT1/L1Topo/L1TopoEvent
- Trigger/TrigT1/L1Topo/L1TopoSimulation
- Trigger/TrigT1/TrigT1CaloEvent
- Trigger/TrigT1/TrigT1CaloToolInterfaces
- Trigger/TrigT1/TrigT1Result
- Trigger/TrigTools/TrigTimeAlgs
- PRIVATE
- AtlasTest/TestTools
- Event/ByteStreamCnvSvcBase
- Event/xAOD/xAODTrigger
- Trigger/TrigConfiguration/TrigConfL1Data
- Trigger/TrigDataAccess/TrigSerializeResult
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigEvent/TrigStorageDefinitions
- Trigger/TrigMonitoring/TrigMonitorBase
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigT1/L1Topo/L1TopoCommon
- Trigger/TrigT1/L1Topo/L1TopoConfig
- Trigger/TrigT1/TrigT1Interfaces )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( tdaq-common COMPONENTS CTPfragment )
-# tag NEEDS_CORAL_BASE was not recognized in automatic conversion in cmt2cmake
-
-# tag NEEDS_COOL_FACTORY was not recognized in automatic conversion in cmt2cmake
-
# Component(s) in the package:
atlas_add_library( TrigSteeringLib
src/*.cxx
PUBLIC_HEADERS TrigSteering
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthenaBaseComps AthenaKernel AthContainers EventInfo xAODEventInfo GaudiKernel TrigConfBase TrigConfHLTData TrigSteeringEvent L1TopoAlgorithms L1TopoCoreSim L1TopoEvent TrigT1CaloToolInterfaces TrigT1Result AthenaMonitoringLib StoreGateLib SGtests L1TopoSimulationLib TrigT1CaloEventLib TrigTimeAlgsLib ByteStreamCnvSvcBaseLib TrigSerializeResultLib TrigNavigationLib TrigMonitorBaseLib TrigInterfacesLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} TestTools xAODTrigger TrigConfL1Data TrigStorageDefinitions L1TopoCommon L1TopoConfig TrigT1Interfaces )
+ LINK_LIBRARIES AthContainers AthenaBaseComps AthenaKernel AthenaMonitoringLib ByteStreamCnvSvcBaseLib EventInfo GaudiKernel L1TopoAlgorithms L1TopoCoreSim L1TopoEvent L1TopoSimulationLib TrigConfBase TrigConfHLTData TrigConfInterfaces TrigNavigationLib TrigSteeringEvent TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Result TrigTimeAlgsLib xAODEventInfo TrigInterfacesLib
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaMonitoringKernelLib L1TopoCommon L1TopoConfig TrigConfL1Data TrigMonitorBaseLib TrigSerializeResultLib TrigStorageDefinitions TrigT1Interfaces xAODTrigger )
atlas_add_component( TrigSteering
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthenaMonitoringLib AthContainers StoreGateLib SGtests EventInfo xAODEventInfo GaudiKernel TrigConfBase TrigConfHLTData TrigSteeringEvent L1TopoAlgorithms L1TopoCoreSim L1TopoEvent L1TopoSimulationLib TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Result TrigTimeAlgsLib TestTools ByteStreamCnvSvcBaseLib xAODTrigger TrigConfL1Data TrigSerializeResultLib TrigNavigationLib TrigStorageDefinitions TrigMonitorBaseLib TrigInterfacesLib L1TopoCommon L1TopoConfig TrigT1Interfaces TrigSteeringLib )
+ LINK_LIBRARIES TrigSteeringLib )
atlas_add_dictionary( TrigSteeringDict
TrigSteering/TrigSteeringDict.h
TrigSteering/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthenaMonitoringLib AthContainers StoreGateLib SGtests EventInfo xAODEventInfo GaudiKernel TrigConfBase TrigConfHLTData TrigSteeringEvent L1TopoAlgorithms L1TopoCoreSim L1TopoEvent L1TopoSimulationLib TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Result TrigTimeAlgsLib TestTools ByteStreamCnvSvcBaseLib xAODTrigger TrigConfL1Data TrigSerializeResultLib TrigNavigationLib TrigStorageDefinitions TrigMonitorBaseLib TrigInterfacesLib L1TopoCommon L1TopoConfig TrigT1Interfaces TrigSteeringLib )
+ LINK_LIBRARIES TrigSteeringLib )
+# Tests in the package:
atlas_add_test( Signature_test
SOURCES
test/Signature_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthenaMonitoringLib AthContainers StoreGateLib SGtests EventInfo xAODEventInfo GaudiKernel TrigConfBase TrigConfHLTData TrigSteeringEvent L1TopoAlgorithms L1TopoCoreSim L1TopoEvent L1TopoSimulationLib TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Result TrigTimeAlgsLib TestTools ByteStreamCnvSvcBaseLib xAODTrigger TrigConfL1Data TrigSerializeResultLib TrigNavigationLib TrigStorageDefinitions TrigMonitorBaseLib TrigInterfacesLib L1TopoCommon L1TopoConfig TrigT1Interfaces TrigSteeringLib
+ LINK_LIBRARIES TestTools TrigSteeringLib
POST_EXEC_SCRIPT nopost.sh )
-
atlas_add_test( SteeringChain_test
SOURCES
test/SteeringChain_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthenaMonitoringLib AthContainers StoreGateLib SGtests EventInfo xAODEventInfo GaudiKernel TrigConfBase TrigConfHLTData TrigSteeringEvent L1TopoAlgorithms L1TopoCoreSim L1TopoEvent L1TopoSimulationLib TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Result TrigTimeAlgsLib TestTools ByteStreamCnvSvcBaseLib xAODTrigger TrigConfL1Data TrigSerializeResultLib TrigNavigationLib TrigStorageDefinitions TrigMonitorBaseLib TrigInterfacesLib L1TopoCommon L1TopoConfig TrigT1Interfaces TrigSteeringLib
+ LINK_LIBRARIES TestTools TrigSteeringLib
POST_EXEC_SCRIPT nopost.sh )
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py share/Lvl1Results.txt )
diff --git a/Trigger/TrigSteer/TrigSteeringTest/CMakeLists.txt b/Trigger/TrigSteer/TrigSteeringTest/CMakeLists.txt
index 212bda95f7af8e7e3761d67228f0a60253feac71..7a86a987b03b367b6e1efe75e04e0aff4e00e452 100644
--- a/Trigger/TrigSteer/TrigSteeringTest/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigSteeringTest/CMakeLists.txt
@@ -1,23 +1,8 @@
-################################################################################
-# Package: TrigSteeringTest
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSteeringTest )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/TrigInterfaces
- PRIVATE
- Control/AthenaKernel
- Control/AthContainers
- Event/xAOD/xAODTrigger
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigT1/TrigT1Interfaces
- Trigger/TrigTools/TrigTimeAlgs )
-
# Component(s) in the package:
atlas_add_component( TrigSteeringTest
src/*.cxx
@@ -25,6 +10,5 @@ atlas_add_component( TrigSteeringTest
LINK_LIBRARIES GaudiKernel TrigSteeringEvent TrigInterfacesLib AthenaKernel AthContainers xAODTrigger TrigNavigationLib TrigT1Interfaces TrigTimeAlgsLib )
# Install files from the package:
-atlas_install_headers( TrigSteeringTest )
atlas_install_python_modules( python/*.py )