diff --git a/InnerDetector/InDetConditions/BeamSpotConditions/CMakeLists.txt b/InnerDetector/InDetConditions/BeamSpotConditions/CMakeLists.txt
index 7e52e267694aa49f31de3d41505b08b0cd036ccb..deeef4699b2f71e266e430cb8178ddb2dbc12f80 100644
--- a/InnerDetector/InDetConditions/BeamSpotConditions/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/BeamSpotConditions/CMakeLists.txt
@@ -3,12 +3,15 @@
# Declare the package name.
atlas_subdir( BeamSpotConditions )
+# External dependencies:
+find_package( CORAL COMPONENTS CoralBase )
+
# Component(s) in the package.
atlas_add_component( BeamSpotConditions
src/*.h src/*.cxx src/components/*.cxx
- LINK_LIBRARIES GaudiKernel AthenaPoolUtilities AthenaBaseComps AthenaKernel
+ INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CORAL_LIBRARIES} GaudiKernel AthenaPoolUtilities AthenaBaseComps
StoreGateLib BeamSpotConditionsData )
# Install files from the package:
-atlas_install_python_modules( python/*.py
- POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetConditions/BeamSpotConditionsData/CMakeLists.txt b/InnerDetector/InDetConditions/BeamSpotConditionsData/CMakeLists.txt
index cbcc424e0189966dc4f034ea9f89dab31785cdb7..184134a8b8e61c3bd526438f76d50315c89fcdf0 100644
--- a/InnerDetector/InDetConditions/BeamSpotConditionsData/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/BeamSpotConditionsData/CMakeLists.txt
@@ -1,29 +1,16 @@
-#################################
-# Package: BeamSpotConditionsData
-#################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# package name
+# Declare the package name:
atlas_subdir( BeamSpotConditionsData )
# possible extra dependencies
-set ( extra_dep )
set ( extra_lib )
if ( NOT SIMULATIONBASE )
- set ( extra_dep Tracking/TrkEvent/VxVertex )
set ( extra_lib VxVertex )
endif()
-# dependencies
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/GeoPrimitives
- ${extra_dep}
- )
-
-# components
+# Component(s) in the package:
atlas_add_library( BeamSpotConditionsData
- src/*.cxx
- PUBLIC_HEADERS BeamSpotConditionsData
- LINK_LIBRARIES AthenaPoolUtilities GeoPrimitives ${extra_lib}
- )
+ src/*.cxx
+ PUBLIC_HEADERS BeamSpotConditionsData
+ LINK_LIBRARIES AthenaKernel GeoPrimitives ${extra_lib} )
diff --git a/InnerDetector/InDetConditions/InDetBeamSpotService/CMakeLists.txt b/InnerDetector/InDetConditions/InDetBeamSpotService/CMakeLists.txt
index 1a35e84ad97ef58f95594496e873184e81aee4f4..1d04e8101e1f4f315194e0cf4a9946c0246e95c1 100644
--- a/InnerDetector/InDetConditions/InDetBeamSpotService/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetBeamSpotService/CMakeLists.txt
@@ -1,32 +1,14 @@
-# $Id: CMakeLists.txt 773822 2016-09-19 10:04:57Z krasznaa $
-################################################################################
-# Package: InDetBeamSpotService
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetBeamSpotService )
# Possible extra dependencies:
-set( extra_dep )
set( extra_lib )
if( NOT SIMULATIONBASE )
- set( extra_dep Tracking/TrkEvent/VxVertex )
set( extra_lib VxVertex )
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- DetectorDescription/GeoPrimitives
- GaudiKernel
- ${extra_dep}
- PRIVATE
- Control/AthenaBaseComps
- Control/CxxUtils
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/EventPrimitives )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase )
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrors/CMakeLists.txt b/InnerDetector/InDetConditions/InDetByteStreamErrors/CMakeLists.txt
index 4c252f00bcb9581d392dfd2f07204b61e5100c26..32c5bce4d005c78315fc43e74ee2d94b38a4fa8f 100644
--- a/InnerDetector/InDetConditions/InDetByteStreamErrors/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrors/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: InDetByteStreamErrors
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetByteStreamErrors )
@@ -9,10 +7,9 @@ atlas_subdir( InDetByteStreamErrors )
atlas_add_dictionary( InDetByteStreamErrorsDict
InDetByteStreamErrors/InDetByteStreamErrorsDict.h
InDetByteStreamErrors/selection.xml
- LINK_LIBRARIES AthContainers Identifier )
+ LINK_LIBRARIES AthContainers Identifier InDetByteStreamErrors )
atlas_add_library( InDetByteStreamErrors
src/*.cxx
PUBLIC_HEADERS InDetByteStreamErrors
- LINK_LIBRARIES AthenaKernel EventContainers )
-
+ LINK_LIBRARIES AthContainers AthenaKernel EventContainers Identifier )
diff --git a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/CMakeLists.txt b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/CMakeLists.txt
index 7a30a784da66fb86985f5efa2fd48bffcf810d16..e6d921e9ccc6bd087f832e6537ac9aac2f143cd7 100644
--- a/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: InDetByteStreamErrorsAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetByteStreamErrorsAthenaPool )
@@ -11,25 +9,23 @@ atlas_add_poolcnv_library( InDetByteStreamErrorsAthenaPoolPoolCnv src/*.cxx
InDetByteStreamErrors/TRT_BSIdErrContainer.h
InDetByteStreamErrors/TRT_BSErrContainer.h
InDetByteStreamErrors/IDCInDetBSErrContainer.h
- LINK_LIBRARIES AthenaPoolUtilities Identifier InDetByteStreamErrors TestTools AthAllocators
- AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES Identifier InDetByteStreamErrors AthAllocators AthenaPoolCnvSvcLib )
atlas_add_dictionary( InDetByteStreamErrorsAthenaPoolCnvDict
InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPoolCnvDict.h
InDetByteStreamErrorsAthenaPool/selection.xml
- LINK_LIBRARIES AthenaPoolUtilities Identifier TestTools AthAllocators
- AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES Identifier )
# Tests in the package:
atlas_add_test( InDetBSErrContainerCnv_p1_test
SOURCES test/InDetBSErrContainerCnv_p1_test.cxx
src/InDetBSErrContainerCnv_p1.cxx
- LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier AthAllocators InDetByteStreamErrors )
+ LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier InDetByteStreamErrors )
atlas_add_test( IDCInDetBSErrContainerCnv_p1_test
SOURCES test/IDCInDetBSErrContainerCnv_p1_test.cxx
src/IDCInDetBSErrContainerCnv_p1.cxx
- LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier AthAllocators InDetByteStreamErrors )
+ LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier InDetByteStreamErrors )
#atlas_add_test( TRT_BSErrContainerCnv_p1_test
# SOURCES test/TRT_BSErrContainerCnv_p1_test.cxx
@@ -40,6 +36,3 @@ atlas_add_test( TRT_BSIdErrContainerCnv_p1_test
SOURCES test/TRT_BSIdErrContainerCnv_p1_test.cxx
src/TRT_BSIdErrContainerCnv_p1.cxx
LINK_LIBRARIES GaudiKernel AthenaPoolCnvSvcLib Identifier AthAllocators InDetByteStreamErrors )
-
-# Install files from the package:
-atlas_install_headers( InDetByteStreamErrorsAthenaPool )
diff --git a/InnerDetector/InDetConditions/InDetCondFolders/CMakeLists.txt b/InnerDetector/InDetConditions/InDetCondFolders/CMakeLists.txt
index 66ea19c6c02bacc0ec2f34471e04ac0baf323365..e78fd7bf8749b624905c0b889a977bc9033a7424 100644
--- a/InnerDetector/InDetConditions/InDetCondFolders/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetCondFolders/CMakeLists.txt
@@ -1,10 +1,7 @@
-################################################################################
-# Package: InDetCondFolders
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetCondFolders )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetConditions/InDetCondFolders/python/InDetAlignFolders.py b/InnerDetector/InDetConditions/InDetCondFolders/python/InDetAlignFolders.py
index c6d4159067851c58c2259ee982b21ad84f119b7d..bb6952bc86337bf4915984f825416477edfe7bd8 100644
--- a/InnerDetector/InDetConditions/InDetCondFolders/python/InDetAlignFolders.py
+++ b/InnerDetector/InDetConditions/InDetCondFolders/python/InDetAlignFolders.py
@@ -1,8 +1,7 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from IOVDbSvc.CondDB import conddb
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
from AthenaCommon.DetFlags import DetFlags
from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
diff --git a/InnerDetector/InDetConditions/InDetCondTools/CMakeLists.txt b/InnerDetector/InDetConditions/InDetCondTools/CMakeLists.txt
index 958505d886485097a77b5212800b54830dd4896d..40f38a5e422f92e7095d445885ce6a188c9d4a31 100644
--- a/InnerDetector/InDetConditions/InDetCondTools/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetCondTools/CMakeLists.txt
@@ -1,22 +1,9 @@
-################################################################################
-# Package: InDetCondTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetCondTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/GeoPrimitives
- GaudiKernel )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_library( InDetCondTools
PUBLIC_HEADERS InDetCondTools
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives GaudiKernel )
-
+ LINK_LIBRARIES GeoPrimitives GaudiKernel )
diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt
index a429640dec3f5eb6f4d4e773a74a45b7dcb0a5fd..f76ac53816e4621eeac48a5e35a988b5194306bc 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: InDetConditionsAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetConditionsAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- PRIVATE
- GaudiKernel
- Database/AthenaPOOL/AthenaPoolCnvSvc
- InnerDetector/InDetConditions/TRT_ConditionsData )
-
# Component(s) in the package:
atlas_add_poolcnv_library( InDetConditionsAthenaPoolPoolCnv src/*.cxx
FILES TRT_ConditionsData/TRTStrawStatusData.h
@@ -43,6 +32,3 @@ atlas_add_dictionary( InDetConditionsAthenaPoolCnvDict
InDetConditionsAthenaPool/selection.xml
LINK_LIBRARIES AthenaPoolUtilities
AthenaPoolCnvSvcLib TRT_ConditionsData )
-
-# Install files from the package:
-atlas_install_headers( InDetConditionsAthenaPool )
diff --git a/InnerDetector/InDetConditions/InDetConditionsSummaryService/CMakeLists.txt b/InnerDetector/InDetConditions/InDetConditionsSummaryService/CMakeLists.txt
index b36c6e50bb99b319e9ac5fee30a8aa0f9705023d..e287e68ebd29e3a8469d9ccaba353d0565d077c4 100644
--- a/InnerDetector/InDetConditions/InDetConditionsSummaryService/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetConditionsSummaryService/CMakeLists.txt
@@ -1,15 +1,9 @@
-################################################################################
-# Package: InDetConditionsSummaryService
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetConditionsSummaryService )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel )
-
atlas_add_library( InDetConditionsSummaryService
INTERFACE
PUBLIC_HEADERS InDetConditionsSummaryService
- LINK_LIBRARIES GaudiKernel )
+ LINK_LIBRARIES GaudiKernel Identifier )
diff --git a/InnerDetector/InDetConditions/InDetCoolCoralClientUtils/CMakeLists.txt b/InnerDetector/InDetConditions/InDetCoolCoralClientUtils/CMakeLists.txt
index fa8895834fc1b085717e890c6c42f56dc943ef8a..89d34c17a117234b3c38ca3a16fee64a8813f3d3 100644
--- a/InnerDetector/InDetConditions/InDetCoolCoralClientUtils/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetCoolCoralClientUtils/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: InDetCoolCoralClientUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetCoolCoralClientUtils )
@@ -8,12 +6,12 @@ atlas_subdir( InDetCoolCoralClientUtils )
# External dependencies:
find_package( COOL COMPONENTS CoolKernel )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( InDetCoolCoralClientUtils
src/*.cpp
PUBLIC_HEADERS InDetCoolCoralClientUtils
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${COOL_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils )
-
+ INCLUDE_DIRS ${COOL_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
+ LINK_LIBRARIES ${COOL_LIBRARIES} CxxUtils
+ PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} )
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
index ee236f632a43cbd78faaa6ddb2005d4fe184f9f3..7ae63b0372682c10764dab18dc7241daa73d4d35 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
@@ -1,30 +1,17 @@
-################################################################################
-# Package: PixelConditionsAlgorithms
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelConditionsAlgorithms )
# External dependencies:
find_package( CLHEP )
-find_package( COOL COMPONENTS CoolKernel )
+find_package( CORAL COMPONENTS CoralBase )
# Component(s) in the package:
-atlas_add_library( PixelConditionsAlgorithmsLib
- PixelConditionsAlgorithms/*.h
- INTERFACE
- NO_PUBLIC_HEADERS
- LINK_LIBRARIES GaudiKernel AthenaKernel AthenaBaseComps PixelConditionsData DetDescrConditions
- AthenaPoolUtilities PathResolver TrkGeometry)
-
atlas_add_component( PixelConditionsAlgorithms
src/*.h src/*.cxx src/components/*.cxx
- ${COOL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${CLHEP_LIBRARIES} CommissionEvent AthenaBaseComps AthenaKernel AthenaPoolUtilities
- GaudiKernel PixelConditionsData SGTools StoreGateLib
- GeoModelUtilities Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry
- PixelCablingLib PixelConditionsAlgorithmsLib PathResolver )
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CommissionEvent DetDescrConditions GaudiKernel GeoModelUtilities GeoPrimitives Identifier InDetCondTools InDetIdentifier InDetReadoutGeometry PathResolver PixelConditionsData PixelReadoutGeometry StoreGateLib TrkGeometry TrkSurfaces )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt
index e1d3edc2ab58a954c579db84159edec267e5dea2..31096f9226da6c981f8e8d14d27ac3de7d0f1950 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: PixelConditionsData
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelConditionsData )
@@ -15,6 +13,5 @@ atlas_add_library( PixelConditionsData
PUBLIC_HEADERS PixelConditionsData
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES CxxUtils Identifier GeoPrimitives InDetByteStreamErrors
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel AthenaPoolUtilities GaudiKernel )
-
+ LINK_LIBRARIES AthenaKernel AthenaPoolUtilities GeoPrimitives Identifier InDetByteStreamErrors
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} )
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt
index bd396954966df723c10d7119462de5a57fa21ea3..b76593f2e4a158ece54aee8d4f042b04c74d14fc 100644
--- a/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/CMakeLists.txt
@@ -1,55 +1,22 @@
-################################################################################
-# Package: PixelConditionsTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelConditionsTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/GeoPrimitives
- GaudiKernel
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- PRIVATE
- Control/AthenaBaseComps
- Control/CxxUtils
- Control/SGTools
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/RegistrationServices
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/Identifier
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- InnerDetector/InDetConditions/PixelConditionsData
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelCabling
- InnerDetector/InDetDetDescr/PixelGeoModel
- InnerDetector/InDetConditions/InDetByteStreamErrors
- Tools/PathResolver )
-
-# External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
-
atlas_add_library( PixelConditionsToolsLib
PixelConditionsTools/*.h
INTERFACE
PUBLIC_HEADERS PixelConditionsTools
- LINK_LIBRARIES GaudiKernel AthenaPoolUtilities PixelConditionsData InDetConditionsSummaryService ${interface_extra_lib} )
+ LINK_LIBRARIES GaudiKernel InDetConditionsSummaryService )
# Component(s) in the package:
atlas_add_component( PixelConditionsTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} PixelConditionsToolsLib AthenaKernel GeoPrimitives GaudiKernel AthenaBaseComps
- CxxUtils SGTools AthenaPoolUtilities DetDescrConditions Identifier PixelCablingLib PixelConditionsData InDetIdentifier
- GeoModelUtilities InDetReadoutGeometry PathResolver PixelGeoModelLib InDetByteStreamErrors )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CxxUtils GaudiKernel Identifier InDetByteStreamErrors InDetConditionsSummaryService InDetIdentifier PixelCablingLib PixelConditionsData PixelConditionsToolsLib StoreGateLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_runtime( share/*.txt share/*.py )
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
index 03a58ba3920678d40adf998adb14c85c5fe2c611..ea2bc8b58e8e04b3e89b4bff131503dc6f44d2df 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
@@ -1,31 +1,8 @@
-###############################################################################
-# Package: SCT_ConditionsAlgorithms
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SCT_ConditionsAlgorithms )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/GeoPrimitives
- GaudiKernel
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetConditions/SCT_ConditionsData
- InnerDetector/InDetConditions/SCT_ConditionsTools
- InnerDetector/InDetDetDescr/SCT_Cabling
- PRIVATE
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
- Tracking/TrkDetDescr/TrkGeometry )
-
# External dependencies:
find_package( Boost )
@@ -34,7 +11,7 @@ atlas_add_component( SCT_ConditionsAlgorithms
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier DetDescrConditions GeoModelUtilities GaudiKernel SCT_ConditionsData SCT_CablingLib AthenaPoolUtilities InDetIdentifier InDetReadoutGeometry SCT_ReadoutGeometry TrkGeometry SCT_ConditionsToolsLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps StoreGateLib Identifier DetDescrConditions GeoModelUtilities GeoPrimitives GaudiKernel SCT_ConditionsData SCT_CablingLib AthenaPoolUtilities InDetConditionsSummaryService InDetIdentifier InDetReadoutGeometry SCT_ReadoutGeometry TrkGeometry TrkSurfaces SCT_ConditionsToolsLib )
atlas_add_test( TestCalibChipRead
SCRIPT athena.py --threads=5 SCT_ConditionsAlgorithms/testCalibChipRead.py
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsData/CMakeLists.txt b/InnerDetector/InDetConditions/SCT_ConditionsData/CMakeLists.txt
index 756c60bfff25d2b241d0bf3012062146397e0b6c..a66d908fb9fc9a37559ebc2c6be22d787cb056a1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsData/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SCT_ConditionsData/CMakeLists.txt
@@ -1,24 +1,16 @@
-################################################################################
-# Package: SCT_ConditionsData
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SCT_ConditionsData )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier )
-
atlas_add_dictionary( SCT_ConditionsDataDict
SCT_ConditionsData/SCT_ConditionsDataDict.h
- SCT_ConditionsData/selection.xml )
+ SCT_ConditionsData/selection.xml
+ LINK_LIBRARIES SCT_ConditionsData )
# Component(s) in the package:
atlas_add_library( SCT_ConditionsData
src/*.cxx
PUBLIC_HEADERS SCT_ConditionsData
- LINK_LIBRARIES AthenaPoolUtilities Identifier AthenaBaseComps )
-
+ LINK_LIBRARIES AthenaKernel AthenaPoolUtilities Identifier
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps )
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt b/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt
index 08e859521d2159cf0823816be953561d42994ebb..8b25777dc1558d1e6f24e45ad8c20c2f5acd4feb 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/CMakeLists.txt
@@ -1,33 +1,8 @@
-###############################################################################
-# Package: SCT_ConditionsTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SCT_ConditionsTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/Identifier
- GaudiKernel
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetConditions/SCT_ConditionsData
- InnerDetector/InDetConditions/InDetByteStreamErrors
- PRIVATE
- Control/AthenaBaseComps
- Control/StoreGate
- Event/xAOD/xAODEventInfo
- Event/EventContainers
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- InnerDetector/InDetConditions/InDetByteStreamErrors
- InnerDetector/InDetConditions/SiPropertiesTool
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/SCT_Cabling
- AtlasTest/TestTools )
-
# External dependencies:
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -35,23 +10,22 @@ find_package( GTest )
find_package( GMock )
# Component(s) in the package:
-atlas_add_component ( SCT_ConditionsTools
- src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel Identifier GeoModelUtilities GaudiKernel AthenaBaseComps StoreGateLib SGtests xAODEventInfo SCT_ConditionsData InDetByteStreamErrors InDetIdentifier InDetReadoutGeometry SCT_CablingLib SiPropertiesToolLib SCT_ConditionsToolsLib )
-
-
atlas_add_library( SCT_ConditionsToolsLib
src/*.cxx
PUBLIC_HEADERS SCT_ConditionsTools
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel Identifier GeoModelUtilities GaudiKernel AthenaBaseComps StoreGateLib SGtests xAODEventInfo SCT_ConditionsData SiPropertiesToolLib InDetByteStreamErrors InDetIdentifier InDetReadoutGeometry SCT_CablingLib EventContainers InDetConditionsSummaryService RDBAccessSvcLib )
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES GaudiKernel GeoModelInterfaces Identifier InDetByteStreamErrors InDetConditionsSummaryService InDetReadoutGeometry RDBAccessSvcLib SCT_CablingLib SCT_ConditionsData
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GeoModelUtilities InDetIdentifier SiPropertiesToolLib StoreGateLib )
+
+atlas_add_component ( SCT_ConditionsTools
+ src/components/*.cxx
+ LINK_LIBRARIES SCT_ConditionsToolsLib )
# Add unit tests
atlas_add_test( SCT_RODVetoTool_test
SOURCES test/SCT_RODVetoTool_test.cxx
- INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS}
- LINK_LIBRARIES TestTools SCT_ConditionsToolsLib ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES}
+ INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} AthenaKernel GaudiKernel InDetIdentifier SCT_ConditionsToolsLib StoreGateLib TestTools
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
atlas_add_test( SCT_ConditionsConfig_test
@@ -59,6 +33,6 @@ atlas_add_test( SCT_ConditionsConfig_test
PROPERTIES TIMEOUT 300 )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_scripts( share/*.py )
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt b/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt
index db384aa64ddcbb4ffb1330cefa31827cb5ef1a01..e915d6a1b590dd60ff415df1647db12e7e4c10f4 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt
@@ -1,42 +1,13 @@
-################################################################################
-# Package: SiLorentzAngleTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SiLorentzAngleTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- DetectorDescription/GeoPrimitives
- GaudiKernel
- InnerDetector/InDetConditions/InDetCondTools
- InnerDetector/InDetConditions/SiPropertiesTool
- InnerDetector/InDetConditions/PixelConditionsData
- InnerDetector/InDetConditions/PixelConditionsTools
- InnerDetector/InDetConditions/SCT_ConditionsData
- PRIVATE
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelReadoutGeometry
- MagneticField/MagFieldElements
- MagneticField/MagFieldConditions
- )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_component( SiLorentzAngleTool
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests GeoPrimitives GaudiKernel SiPropertiesToolLib AthenaPoolUtilities Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry MagFieldElements MagFieldConditions InDetConditionsSummaryService )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib GeoPrimitives GaudiKernel SiPropertiesToolLib AthenaPoolUtilities Identifier InDetCondTools InDetIdentifier InDetReadoutGeometry PixelConditionsData PixelReadoutGeometry MagFieldElements MagFieldConditions InDetConditionsSummaryService SCT_ConditionsData )
# Run tests:
atlas_add_test( TestSCTLorentzAngle
@@ -53,6 +24,5 @@ atlas_add_test( SiLorentzAngleConfig_test
PROPERTIES TIMEOUT 30 )
# Install files from the package:
-atlas_install_headers( SiLorentzAngleTool )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleToolSetup.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleToolSetup.py
index 2ae8b234d0b7533b92b73403f8d8c80a07fa973d..2e4863ac0e01a927bd63197981103cab26bb74b8 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleToolSetup.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleToolSetup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
class PixelLorentzAngleToolSetup:
"Class to simplify setup of PixelLorentzAngleTool"
@@ -19,7 +19,6 @@ class PixelLorentzAngleToolSetup:
if not conddb.folderRequested(tempFolder):
conddb.addFolder(dbInstance, tempFolder, className="CondAttrListCollection")
- from AthenaCommon.GlobalFlags import globalflags
from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
@@ -48,7 +47,6 @@ class PixelLorentzAngleToolSetup:
SiPropertiesTool = ToolSvc.PixelSiPropertiesTool,
UseMagFieldCache = True,
UseMagFieldDcs = (not athenaCommonFlags.isOnline()))
- pixelSiLorentzAngleCondAlg = condSeq.PixelSiLorentzAngleCondAlg
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py
index 19203820aa06e46a396f562b59748634adf55f9b..123cd9f0948a1972ac971fcd998a18216692d036 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
class SCTLorentzAngleToolSetup:
"Class to simplify setup of SCTLorentzAngleTool"
@@ -78,4 +78,6 @@ class SCTLorentzAngleToolSetup:
def forceUseGeoModel(self) :
"Force usage of GeoModel defaults"
self.SCT_SiliconConditionsTool.ForceUseGeoModel = True
+ from AthenaCommon import Logging
+ msg = Logging.logging.getLogger("SCTLorentzAngleToolSetup")
msg.warning("Please set forceUseGeoModel in constructor. Unnecessary service, algorithms, folders are configured")
diff --git a/InnerDetector/InDetConditions/SiPropertiesTool/CMakeLists.txt b/InnerDetector/InDetConditions/SiPropertiesTool/CMakeLists.txt
index f516555cc72104d0dc563a7fafff10dce2d5557e..c237a54eb3b2f695bf4853087201f5ff26b5ed3f 100644
--- a/InnerDetector/InDetConditions/SiPropertiesTool/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SiPropertiesTool/CMakeLists.txt
@@ -1,25 +1,8 @@
-################################################################################
-# Package: SiPropertiesTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SiPropertiesTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- PRIVATE
- Control/StoreGate
- DetectorDescription/Identifier
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetConditions/PixelConditionsData
- InnerDetector/InDetConditions/PixelConditionsTools
- InnerDetector/InDetConditions/SCT_ConditionsData )
-
# External dependencies:
find_package( CLHEP )
@@ -29,13 +12,12 @@ atlas_add_library( SiPropertiesToolLib
PUBLIC_HEADERS SiPropertiesTool
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel InDetReadoutGeometry PixelConditionsData SCT_ConditionsData StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} Identifier InDetIdentifier InDetConditionsSummaryService )
+ LINK_LIBRARIES AthenaKernel GaudiKernel Identifier InDetConditionsSummaryService InDetReadoutGeometry PixelConditionsData SCT_ConditionsData
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps InDetIdentifier StoreGateLib )
atlas_add_component( SiPropertiesTool
src/components/*.cxx
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel InDetReadoutGeometry PixelConditionsData SCT_ConditionsData StoreGateLib SGtests Identifier InDetIdentifier SiPropertiesToolLib InDetConditionsSummaryService )
+ LINK_LIBRARIES SiPropertiesToolLib )
# Run tests:
atlas_add_test( TestSCTProperties
@@ -52,5 +34,5 @@ atlas_add_test( SiPropertiesConfig_test
PROPERTIES TIMEOUT 300 )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetConditions/SiPropertiesTool/python/PixelSiPropertiesToolSetup.py b/InnerDetector/InDetConditions/SiPropertiesTool/python/PixelSiPropertiesToolSetup.py
index d72aca0715c3782c285371384ff95cfb88350d22..e156e23ad41935c42ec866d834d190a623d17b91 100644
--- a/InnerDetector/InDetConditions/SiPropertiesTool/python/PixelSiPropertiesToolSetup.py
+++ b/InnerDetector/InDetConditions/SiPropertiesTool/python/PixelSiPropertiesToolSetup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
class PixelSiPropertiesToolSetup:
"Class to simplify setup of PixelSiPropertiesTool and required conditions algorithm"
@@ -44,7 +44,6 @@ class PixelSiPropertiesToolSetup:
if not conddb.folderRequested(tempFolder):
conddb.addFolder(dbInstance, tempFolder, className="CondAttrListCollection")
- from AthenaCommon.GlobalFlags import globalflags
from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
@@ -56,7 +55,6 @@ class PixelSiPropertiesToolSetup:
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondTempAlg
condSeq += PixelDCSCondTempAlg(name="PixelDCSCondTempAlg", ReadKey=tempFolder)
- from AthenaCommon.AppMgr import ToolSvc
if not hasattr(condSeq, "PixelSiPropertiesCondAlg"):
from SiPropertiesTool.SiPropertiesToolConf import PixelSiPropertiesCondAlg
condSeq += PixelSiPropertiesCondAlg(name="PixelSiPropertiesCondAlg")
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/CMakeLists.txt
index 50ecadd254e2b2bd8c3a51b31212b99bfefd94b2..eba3d78c7ee82ce7f9886a00dd1800780a8e061c 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/CMakeLists.txt
@@ -1,24 +1,8 @@
-################################################################################
-# Package: TRT_ConditionsAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TRT_ConditionsAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- InnerDetector/InDetConditions/TRT_ConditionsServices
- InnerDetector/InDetConditions/TRT_ConditionsData
- PRIVATE
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/GeoModel/GeoModelUtilities )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
@@ -27,12 +11,9 @@ atlas_add_component( TRT_ConditionsAlgs
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps GaudiKernel TRT_ConditionsServicesLib TRT_ConditionsData InDetIdentifier
- InDetReadoutGeometry TRT_ReadoutGeometry AthenaPoolUtilities DetDescrConditions GeoModelUtilities )
-
+ LINK_LIBRARIES LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities DetDescrConditions GaudiKernel GeoModelUtilities GeoPrimitives InDetIdentifier StoreGateLib TRT_ConditionsData TRT_ConditionsServicesLib TRT_ReadoutGeometry )
# Install files from the package:
-atlas_install_headers( TRT_ConditionsAlgs )
atlas_install_joboptions( share/*.py )
atlas_install_runtime( share/*.txt share/*.py )
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_ConditionsData/CMakeLists.txt
index 21df872f9dc891da7653c40579cb14eefeb6459d..f6aa7939737e698916f6c3458e214994fbbe0d4d 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/CMakeLists.txt
@@ -1,36 +1,15 @@
-################################################################################
-# Package: TRT_ConditionsData
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TRT_ConditionsData )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/Identifier
- GaudiKernel
- PRIVATE
- Tracking/TrkEvent/TrkEventPrimitives)
-
-
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TRT_ConditionsData
src/*.cxx
PUBLIC_HEADERS TRT_ConditionsData
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaPoolUtilities DetDescrConditions Identifier GaudiKernel AsgTools TrkEventPrimitives
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES AthenaKernel AthenaPoolUtilities Identifier GaudiKernel TrkEventPrimitives )
atlas_add_dictionary( TRT_ConditionsDataDict
TRT_ConditionsData/TRT_ConditionsDataDict.h
TRT_ConditionsData/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolUtilities DetDescrConditions Identifier GaudiKernel AsgTools TRT_ConditionsData )
-
+ LINK_LIBRARIES TRT_ConditionsData )
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
index 7189431e704742a9798d7a81f9e04437cce06c3d..aeba1407ad483d817e15cf5a9780efbfa5d9fbc6 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
@@ -1,62 +1,28 @@
-################################################################################
-# Package: TRT_ConditionsServices
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TRT_ConditionsServices )
# Possible extra dependencies:
-set( extra_dep )
set( extra_lib )
if( NOT SIMULATIONBASE )
- set( extra_dep InnerDetector/InDetConditions/InDetByteStreamErrors )
set( extra_lib InDetByteStreamErrors )
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/StoreGate
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- GaudiKernel
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetConditions/TRT_ConditionsData
- PRIVATE
- Control/AthenaBaseComps
- Control/CxxUtils
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/RDBAccessSvc
- Database/RegistrationServices
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/Identifier
- Event/xAOD/xAODEventInfo
- InnerDetector/InDetConditions/InDetCoolCoralClientUtils
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- Tools/PathResolver
- ${extra_dep} )
-
# External dependencies:
-find_package( COOL COMPONENTS CoolKernel )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( ROOT COMPONENTS RIO Core Tree MathCore Hist pthread )
# Component(s) in the package:
atlas_add_library( TRT_ConditionsServicesLib
src/*.cxx
PUBLIC_HEADERS TRT_ConditionsServices
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData StoreGateLib SGtests InDetConditionsSummaryService
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaBaseComps CxxUtils AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier xAODEventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver RegistrationServicesLib ${extra_lib} RDBAccessSvcLib )
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES LINK_LIBRARIES AthenaKernel AthenaPoolUtilities DetDescrConditions EventPrimitives GaudiKernel GeoPrimitives InDetConditionsSummaryService InDetIdentifier TRT_ConditionsData
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils GeoModelInterfaces GeoModelUtilities Identifier xAODEventInfo InDetReadoutGeometry TRT_ReadoutGeometry PathResolver RegistrationServicesLib RDBAccessSvcLib ${extra_lib} )
atlas_add_component( TRT_ConditionsServices
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData AthenaBaseComps CxxUtils StoreGateLib SGtests AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier xAODEventInfo EventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver TRT_ConditionsServicesLib InDetConditionsSummaryService ${extra_lib} RegistrationServicesLib )
+ LINK_LIBRARIES TRT_ConditionsServicesLib )
-atlas_install_python_modules( python/*.py )
+# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/CMakeLists.txt
index e63b40e015be664a347cf4c889d74c57511b9c63..13d81215e34df8ae1cc17280fa8d415f9d95ab8f 100644
--- a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/CMakeLists.txt
@@ -1,28 +1,9 @@
-################################################################################
-# Package: TRT_RecoConditionsServices
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TRT_RecoConditionsServices )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/StoreGate
- InnerDetector/InDetConditions/TRT_ConditionsServices
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- InnerDetector/InDetRecTools/InDetRecToolInterfaces
- Tracking/TrkEvent/TrkParameters )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_component( TRT_RecoConditionsServices
src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} GaudiKernel TrkParameters AthenaBaseComps StoreGateLib SGtests InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry TRT_ConditionsServicesLib InDetRecToolInterfaces )
+ LINK_LIBRARIES GaudiKernel AthenaBaseComps StoreGateLib InDetIdentifier TRT_ReadoutGeometry TRT_ConditionsServicesLib InDetRecToolInterfaces )
diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/BCM_GeoModel/CMakeLists.txt
index e644836675f2c55c995fed8125d6436b8f55af61..853f83c2901a642cdf2cb5151f292f8d9df40294 100644
--- a/InnerDetector/InDetDetDescr/BCM_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/BCM_GeoModel/CMakeLists.txt
@@ -1,32 +1,13 @@
-################################################################################
-# Package: BCM_GeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( BCM_GeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- DetectorDescription/GeoModel/GeoModelInterfaces
- GaudiKernel
- PRIVATE
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelUtilities )
-
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( BCM_GeoModel
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelUtilities RDBAccessSvcLib )
-
-# Install files from the package:
-atlas_install_headers( BCM_GeoModel )
-
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities RDBAccessSvcLib )
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt
index d694cbdfdf2aa656c63c37cdfa6837efc768d4b2..f3dbccbdb6f283329d839c7748cf3b952645003a 100644
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/CMakeLists.txt
@@ -1,32 +1,14 @@
-################################################################################
-# Package: BLM_GeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( BLM_GeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- DetectorDescription/GeoModel/GeoModelInterfaces
- GaudiKernel
- PRIVATE
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelUtilities )
-
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( BLM_GeoModel
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelUtilities
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities
PRIVATE_LINK_LIBRARIES RDBAccessSvcLib )
-
-# Install files from the package:
-atlas_install_headers( BLM_GeoModel )
-
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/CMakeLists.txt
index e47c4885b376bdd932ebfff990a2f33c5ce32bb1..a1f3f62abf14c011879fc800e825bf2833226a7d 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/CMakeLists.txt
@@ -1,34 +1,14 @@
-################################################################################
-# Package: InDetGeoModelUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetGeoModelUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/CxxUtils
- Database/RDBAccessSvc
- GaudiKernel
- PRIVATE
- Control/StoreGate
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/GeoPrimitives
- DetectorDescription/GeometryDBSvc )
-
# External dependencies:
-find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( InDetGeoModelUtils
src/*.cxx
PUBLIC_HEADERS InDetGeoModelUtils
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel CxxUtils GaudiKernel StoreGateLib SGtests RDBAccessSvcLib GeoPrimitives
- PRIVATE_LINK_LIBRARIES GeoModelUtilities GeometryDBSvcLib )
-
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel CxxUtils GaudiKernel RDBAccessSvcLib GeoPrimitives
+ PRIVATE_LINK_LIBRARIES GeoModelInterfaces GeoModelUtilities GeometryDBSvcLib StoreGateLib )
diff --git a/InnerDetector/InDetDetDescr/InDetIdDictFiles/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetIdDictFiles/CMakeLists.txt
index 09623edec72f170da938d952fadda09ec27696fd..bf31688247d6fc9179f414f3874569cbce22a297 100644
--- a/InnerDetector/InDetDetDescr/InDetIdDictFiles/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetIdDictFiles/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: InDetIdDictFiles
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetIdDictFiles )
diff --git a/InnerDetector/InDetDetDescr/InDetIdentifier/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetIdentifier/CMakeLists.txt
index 92a7be8d07ee1423fbaa3ac2dc6c934506477b32..3ac014a971a8a31454025dfbc8aa3e3aa8ab4470 100644
--- a/InnerDetector/InDetDetDescr/InDetIdentifier/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetIdentifier/CMakeLists.txt
@@ -1,22 +1,9 @@
-################################################################################
-# Package: InDetIdentifier
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetIdentifier )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/AtlasDetDescr
- DetectorDescription/IdDict
- DetectorDescription/Identifier
- PRIVATE
- DetectorDescription/IdDictParser
- GaudiKernel )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( Boost COMPONENTS unit_test_framework )
# Component(s) in the package:
@@ -26,21 +13,20 @@ atlas_add_library( InDetIdentifier
src/TRT_ID.cxx
src/SiliconID.cxx
PUBLIC_HEADERS InDetIdentifier
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthenaKernel AtlasDetDescr IdDict Identifier
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} IdDictParser GaudiKernel )
+ PRIVATE_LINK_LIBRARIES GaudiKernel )
atlas_add_dictionary( InDetIdentifierDict
InDetIdentifier/InDetIdentifierDict.h
InDetIdentifier/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasDetDescr IdDict Identifier IdDictParser GaudiKernel InDetIdentifier )
-
+ LINK_LIBRARIES InDetIdentifier )
+
+# Tests in the package:
atlas_add_test( SCT_ID_test
SOURCES
test/SCT_ID_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AtlasDetDescr IdDict Identifier IdDictParser GaudiKernel InDetIdentifier
+ LINK_LIBRARIES ${Boost_LIBRARIES} IdDictParser InDetIdentifier
POST_EXEC_SCRIPT "nopost.sh"
)
set_target_properties( InDetIdentifier_SCT_ID_test PROPERTIES ENABLE_EXPORTS True )
diff --git a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt
index 49d45b2dd17f0e838c8416e37c295c5e76d94f3d..a3abb437c41332f6858edfc23146fee9c452f1b1 100644
--- a/InnerDetector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt
@@ -1,42 +1,17 @@
-################################################################################
-# Package: InDetReadoutGeometry
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetReadoutGeometry )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- DetectorDescription/AtlasDetDescr
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- GaudiKernel
- InnerDetector/InDetConditions/InDetCondTools
- InnerDetector/InDetDetDescr/InDetIdentifier
- Tracking/TrkDetDescr/TrkDetElementBase
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventPrimitives
- DetectorDescription/DetDescrCond/DetDescrConditions
- PRIVATE
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/IdDictDetDescr
- InnerDetector/InDetConditions/TRT_ConditionsData )
-
# External dependencies:
find_package( CLHEP )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( InDetReadoutGeometry
src/*.cxx
PUBLIC_HEADERS InDetReadoutGeometry
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel AtlasDetDescr GeoModelUtilities GeoPrimitives Identifier GaudiKernel InDetIdentifier TrkDetElementBase TrkSurfaces TrkEventPrimitives StoreGateLib SGtests AthenaBaseComps DetDescrConditions InDetCondTools
- PRIVATE_LINK_LIBRARIES AthenaPoolUtilities IdDictDetDescr TRT_ConditionsData )
-
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel AtlasDetDescr CxxUtils GeoPrimitives Identifier GaudiKernel InDetIdentifier TrkDetElementBase TrkSurfaces TrkEventPrimitives StoreGateLib DetDescrConditions InDetCondTools
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities IdDictDetDescr GeoModelUtilities )
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt
index fec15c73bdf647726524e7dffcea2a53ae817b92..be8a0efb90955cb4f019256841ed84e0fceb5134 100644
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt
@@ -1,38 +1,13 @@
-################################################################################
-# Package: InDetRegionSelector
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetRegionSelector )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/RegSelLUT
- GaudiKernel
- InnerDetector/InDetConditions/PixelConditionsData
- InnerDetector/InDetDetDescr/SCT_Cabling
- PRIVATE
- Control/AthenaKernel
- DetectorDescription/Identifier
- DetectorDescription/IRegionSelector
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_Cabling )
-
-# External dependencies:
-find_package( CLHEP )
-find_package( tdaq-common )
-
# Component(s) in the package:
atlas_add_component( InDetRegionSelector
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps RegSelLUT GaudiKernel PixelConditionsData SCT_CablingLib Identifier InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry TRT_CablingLib AthenaKernel )
+ LINK_LIBRARIES AthenaBaseComps RegSelLUT GaudiKernel PixelConditionsData SCT_CablingLib Identifier InDetIdentifier InDetReadoutGeometry IRegionSelector StoreGateLib TRT_ReadoutGeometry TRT_CablingLib )
# Install files from the package:
-atlas_install_headers( InDetRegionSelector )
atlas_install_joboptions( share/*.py )
-
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx
index 194d0655124623eb123c27acc781cfd8d405cec8..02637cdc1f5979a61f10bb97fcf4731a21826702 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx
@@ -4,9 +4,7 @@
#include "InDetRegionSelector/InDetRegionSelectorLUT.h"
-#include "CLHEP/Units/SystemOfUnits.h"
-
-#include "RegSelLUT/RegSelSiLUT.h"
+#include "RegSelLUT/RegSelSiLUT.h"
#include <vector>
#include <string>
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegSelCondAlg.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegSelCondAlg.cxx
index 9b85c6fa0826915075ee41a12ed891d19d2d44b3..60014c6353a65387a520ad06dd3871d7c3a8fc1f 100644
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegSelCondAlg.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegSelCondAlg.cxx
@@ -22,7 +22,6 @@
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "GaudiKernel/MsgStream.h"
-#include "CLHEP/Units/SystemOfUnits.h"
#include "TRT_ReadoutGeometry/TRT_BarrelElement.h"
#include "TRT_ReadoutGeometry/TRT_EndcapElement.h"
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegSelCondAlg.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegSelCondAlg.h
index c86a0f719621713b3226a574d17083c2d556b935..b78127fc7e3fea6a07460bb37a09b23f66345e1a 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegSelCondAlg.h
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegSelCondAlg.h
@@ -29,7 +29,6 @@
#include <string>
-#include "TRT_RegSelCondAlg.h"
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/CMakeLists.txt
index f8de9f5d402145029c0b46012d6371d2001c638e..ad08d99dcb43a15c172a33d7a24a707f3b0f6fd8 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/CMakeLists.txt
@@ -1,39 +1,13 @@
-################################################################################
-# Package: InDetServMatGeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetServMatGeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/CxxUtils
- Database/RDBAccessSvc
- DetectorDescription/GeoPrimitives
- DetectorDescription/GeoModel/GeoModelUtilities
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetGeoModelUtils
- PRIVATE
- Control/AthenaKernel
- Control/SGTools
- Control/StoreGate
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeometryDBSvc )
-
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( InDetServMatGeoModel
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils GeoModelUtilities GaudiKernel InDetGeoModelUtils SGTools StoreGateLib SGtests GeometryDBSvcLib )
-
-# Install files from the package:
-atlas_install_headers( InDetServMatGeoModel )
-
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils GaudiKernel GeoModelInterfaces GeoModelUtilities GeoPrimitives GeometryDBSvcLib InDetGeoModelUtils RDBAccessSvcLib SGTools StoreGateLib )
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/CMakeLists.txt b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/CMakeLists.txt
index c64e06224ffda7cd8e059c594a2b6e250bbe6981..70612b1af663aca4dbe42e0f4f2cadffd266d8cc 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/CMakeLists.txt
@@ -1,46 +1,18 @@
-################################################################################
-# Package: InDetTrackingGeometry
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetTrackingGeometry )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/CxxUtils
- DetectorDescription/GeoPrimitives
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetIdentifier
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- PRIVATE
- AtlasGeometryCommon/BeamPipeGeoModel
- AtlasGeometryCommon/SubDetectorEnvelopes
- Control/StoreGate
- DetectorDescription/Identifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelReadoutGeometry
- InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes )
-
# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( InDetTrackingGeometry
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps CxxUtils GeoPrimitives GaudiKernel InDetIdentifier TrkDetDescrInterfaces TrkDetDescrUtils TrkGeometry BeamPipeGeoModelLib StoreGateLib SGtests Identifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry TrkDetDescrGeoModelCnv TrkSurfaces TrkVolumes SubDetectorEnvelopesLib )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps CxxUtils GeoPrimitives GaudiKernel InDetIdentifier TrkDetDescrInterfaces TrkDetDescrUtils TrkGeometry BeamPipeGeoModelLib StoreGateLib Identifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry TrkDetDescrGeoModelCnv TrkSurfaces TrkVolumes SubDetectorEnvelopesLib )
# Install files from the package:
-atlas_install_headers( InDetTrackingGeometry )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelCabling/CMakeLists.txt
index 25c15aefc24e73511b4933f9e70c72b5d2aa9516..bad773367aed59c38ca4551b85af0999f466e0ab 100644
--- a/InnerDetector/InDetDetDescr/PixelCabling/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/PixelCabling/CMakeLists.txt
@@ -1,42 +1,24 @@
-################################################################################
-# Package: PixelCabling
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelCabling )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaKernel
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelReadoutGeometry
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetConditions/PixelConditionsData
- Tools/PathResolver )
-
# Component(s) in the package:
atlas_add_library( PixelCablingLib
PixelCabling/*.h
INTERFACE
PUBLIC_HEADERS PixelCabling
- LINK_LIBRARIES GaudiKernel AthenaKernel )
+ LINK_LIBRARIES GaudiKernel Identifier InDetIdentifier )
atlas_add_component( PixelCabling
src/*.h src/*.cxx src/components/*.cxx
- LINK_LIBRARIES GaudiKernel AthenaBaseComps SGTools StoreGateLib
- AthenaPoolUtilities Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry PixelConditionsData PathResolver PixelCablingLib )
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetReadoutGeometry PixelCablingLib PixelReadoutGeometry StoreGateLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py )
+# Test(s) in the package:
atlas_add_test( PixelCablingConfigNew_test
SCRIPT test/PixelCablingConfigNew_test.py
PROPERTIES TIMEOUT 300 )
-
-# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
index a502cacda3952b0441a261644854f5ee24f9e6e1..21ab313db3c7823481fc3482a6e7bbb6699cf4ea 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/CMakeLists.txt
@@ -1,56 +1,28 @@
-################################################################################
-# Package: PixelGeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelGeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/CxxUtils
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/Identifier
- DetectorDescription/GeoPrimitives
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetGeoModelUtils
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelReadoutGeometry
- PRIVATE
- Control/SGTools
- Control/StoreGate
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/GeometryDBSvc
- InnerDetector/InDetDetDescr/InDetIdentifier )
-
# External dependencies:
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( PixelGeoModelLib
PixelGeoModel/*.h src/*.cxx
PUBLIC_HEADERS PixelGeoModel
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils
- GeoModelUtilities Identifier GaudiKernel InDetGeoModelUtils
- InDetReadoutGeometry PixelReadoutGeometry
- PRIVATE_LINK_LIBRARIES SGTools StoreGateLib DetDescrConditions
- InDetIdentifier GeometryDBSvcLib
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel GeoModelUtilities GeometryDBSvcLib InDetGeoModelUtils
+ PRIVATE_LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel CxxUtils DetDescrConditions GeoModelInterfaces GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry RDBAccessSvcLib SGTools StoreGateLib
PRIVATE_DEFINITIONS "-DGEOTORUS=1" )
atlas_add_component( PixelGeoModel
src/components/*.cxx
- LINK_LIBRARIES GaudiKernel PixelGeoModelLib GeometryDBSvcLib )
+ LINK_LIBRARIES PixelGeoModelLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( test/*.py )
+# Test(s) in the package:
atlas_add_test( PixelGMConfig_test
SCRIPT test/PixelGMConfig_test.py
PROPERTIES TIMEOUT 300 )
-
-# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( test/*.py )
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/python/PixelGeoModelOldConfig.py b/InnerDetector/InDetDetDescr/PixelGeoModel/python/PixelGeoModelOldConfig.py
index b1bd5da0ab1e30b2a844992742c0a060ffea32c7..be9854178a83ff448227c1c470b28e4906f4f3bb 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/python/PixelGeoModelOldConfig.py
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/python/PixelGeoModelOldConfig.py
@@ -3,7 +3,6 @@
from AthenaCommon import CfgMgr
def getPixelDetectorTool(name="PixelDetectorTool", **kwargs):
- from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
kwargs.setdefault("ServiceBuilderTool", "")
return CfgMgr.PixelDetectorTool(name, **kwargs)
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/CMakeLists.txt b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/CMakeLists.txt
index 88c461cdd223133fd5a42c7a891136a20645cec2..d592ead53dce5367110356ff553956cfc9a8c0a9 100644
--- a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/CMakeLists.txt
@@ -1,43 +1,14 @@
-################################################################################
-# Package: InDetReadoutGeometry
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelReadoutGeometry )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- DetectorDescription/AtlasDetDescr
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- GaudiKernel
- InnerDetector/InDetConditions/InDetCondTools
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- Tracking/TrkDetDescr/TrkDetElementBase
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventPrimitives
- DetectorDescription/DetDescrCond/DetDescrConditions
- PRIVATE
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/IdDictDetDescr)
-
# External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
-
atlas_add_library( PixelReadoutGeometry
- src/*.c*
+ src/*.cxx
PUBLIC_HEADERS PixelReadoutGeometry
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} InDetReadoutGeometry AthenaKernel SGTools AtlasDetDescr GeoPrimitives Identifier GaudiKernel InDetIdentifier TrkDetElementBase TrkSurfaces TrkEventPrimitives StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES AthenaPoolUtilities DetDescrConditions IdDictDetDescr)
-
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel CxxUtils GeoPrimitives InDetIdentifier InDetReadoutGeometry TrkDetElementBase TrkSurfaces
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities DetDescrConditions Identifier StoreGateLib TrkEventPrimitives )
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt b/InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt
index 4b6efce09c2093277d35201f8e558b657c3afb58..7aa1cf2cde2ba68abd7bbb4c2039e9b29a1ab25e 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt
@@ -1,45 +1,25 @@
-################################################################################
-# Package: SCT_Cabling
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SCT_Cabling )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/Identifier
- GaudiKernel
- PRIVATE
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/CoraCool
- InnerDetector/InDetDetDescr/InDetIdentifier
- Tools/PathResolver )
-
-# External dependencies:
-find_package( COOL COMPONENTS CoolKernel CoolApplication )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( SCT_CablingLib
src/*.cxx
PUBLIC_HEADERS SCT_Cabling
- PRIVATE_INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps Identifier GaudiKernel StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaPoolUtilities CoraCool InDetIdentifier PathResolver )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel AthenaPoolUtilities GaudiKernel Identifier
+ PRIVATE_LINK_LIBRARIES InDetIdentifier PathResolver StoreGateLib )
atlas_add_component( SCT_Cabling
src/components/*.cxx
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps Identifier GaudiKernel StoreGateLib SGtests AthenaPoolUtilities CoraCool InDetIdentifier PathResolver SCT_CablingLib )
+ LINK_LIBRARIES SCT_CablingLib )
+
+# Install files from the package:
+atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# Test(s) in the package:
atlas_add_test( TestSCT_CablingCfg
SCRIPT python -m SCT_Cabling.TestSCT_CablingCfg
PROPERTIES TIMEOUT 600
ENVIRONMENT THREADS=1 )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/SCT_GeoModel/CMakeLists.txt
index b52eaaf9cfc9a0b349df50d99cc94d4840805b31..86efac1d352d6126906487c47ecd8ac9190f8bb0 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/CMakeLists.txt
@@ -1,46 +1,22 @@
-################################################################################
-# Package: SCT_GeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SCT_GeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/GeoPrimitives
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetGeoModelUtils
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
- PRIVATE
- Control/SGTools
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeometryDBSvc
- DetectorDescription/Identifier
- InnerDetector/InDetDetDescr/InDetIdentifier )
-
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( SCT_GeoModel
- src/*.cxx
+ src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel InDetGeoModelUtils InDetReadoutGeometry SCT_ReadoutGeometry SGTools StoreGateLib SGtests AthenaPoolUtilities DetDescrConditions Identifier InDetIdentifier GeometryDBSvcLib )
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel CxxUtils GeoModelInterfaces GeoModelUtilities GeoPrimitives GaudiKernel InDetGeoModelUtils InDetReadoutGeometry SCT_ReadoutGeometry SGTools StoreGateLib AthenaPoolUtilities DetDescrConditions Identifier InDetIdentifier GeometryDBSvcLib RDBAccessSvcLib )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( test/*.py )
+# Test(s) in the package:
atlas_add_test( SCT_GMConfig_test
SCRIPT test/SCT_GMConfig_test.py
PROPERTIES TIMEOUT 300 )
-
-# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( test/*.py )
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfigDb.py b/InnerDetector/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfigDb.py
index fbf6bfea30727a8c93f9b6ee657e41eef1e50f2d..324c8f058dde31f65aafe2af539916bfdc256cf3 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfigDb.py
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfigDb.py
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from AthenaCommon.CfgGetter import addAlgorithm,addTool
+from AthenaCommon.CfgGetter import addTool
# add tools and algorithms to the ConfiguredFactory, see:
# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/ConfiguredFactory
addTool("SCT_GeoModel.SCT_GeoModelOldConfig.getSCT_DetectorTool","SCT_DetectorTool")
diff --git a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/CMakeLists.txt b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/CMakeLists.txt
index 017a2b1f54aba5e645156e78cd7c7191e73ac9ec..8b00587effa485577dfb42a86286afcbd736587b 100644
--- a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/CMakeLists.txt
@@ -1,29 +1,10 @@
-################################################################################
-# Package: SCT_ModuleDistortions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SCT_ModuleDistortions )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParameters
- PRIVATE
- Control/AthenaBaseComps
- Control/StoreGate
- InnerDetector/InDetDetDescr/InDetIdentifier
- Tools/PathResolver )
-
# External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core Hist )
atlas_add_library( SCT_ModuleDistortionsLib
SCT_ModuleDistortions/*.h
@@ -31,19 +12,19 @@ atlas_add_library( SCT_ModuleDistortionsLib
PUBLIC_HEADERS SCT_ModuleDistortions
LINK_LIBRARIES GaudiKernel GeoPrimitives TrkParameters Identifier AthenaKernel )
-
# Component(s) in the package:
atlas_add_component( SCT_ModuleDistortions
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} SCT_ModuleDistortionsLib InDetReadoutGeometry TrkEventPrimitives AthenaBaseComps StoreGateLib SGtests InDetIdentifier PathResolver )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry PathResolver SCT_ModuleDistortionsLib TrkEventPrimitives TrkParameters )
+
+# Install files from the package:
+atlas_install_joboptions( share/*.py )
+atlas_install_runtime( share/*.txt )
+# Test(s) in the package:
atlas_add_test( TestSCT_DistortionsTool
SCRIPT athena.py --threads=5 SCT_ModuleDistortions/TestSCT_DistortionsTool.py
PROPERTIES TIMEOUT 600
ENVIRONMENT THREADS=5 )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-atlas_install_runtime( share/*.txt )
diff --git a/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/CMakeLists.txt b/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/CMakeLists.txt
index ddd658b51c2079db08000fd24a6db0532578a1cf..8134efbe197fdf9286704eb209c94918d795e690 100644
--- a/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/CMakeLists.txt
@@ -1,42 +1,17 @@
-################################################################################
-# Package: SCT_ReadoutGeometry
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SCT_ReadoutGeometry )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/SGTools
- Control/StoreGate
- DetectorDescription/AtlasDetDescr
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- GaudiKernel
- InnerDetector/InDetConditions/InDetCondTools
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- Tracking/TrkDetDescr/TrkDetElementBase
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventPrimitives
- PRIVATE
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/IdDictDetDescr)
-
# External dependencies:
find_package( CLHEP )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
-
atlas_add_library(SCT_ReadoutGeometry
- src/*.c*
+ src/*.cxx
PUBLIC_HEADERS SCT_ReadoutGeometry
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} InDetReadoutGeometry AthenaKernel SGTools AtlasDetDescr GeoPrimitives Identifier GaudiKernel InDetIdentifier TrkDetElementBase TrkSurfaces TrkEventPrimitives StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES AthenaPoolUtilities DetDescrConditions IdDictDetDescr)
-
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoPrimitives InDetIdentifier InDetReadoutGeometry TrkSurfaces
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities Identifier StoreGateLib )
diff --git a/InnerDetector/InDetDetDescr/StripGeoModelXml/CMakeLists.txt b/InnerDetector/InDetDetDescr/StripGeoModelXml/CMakeLists.txt
index 1178d2a8b08857a3d830097560ec3436c0a1fc9a..3ff8dd6377378a066620d5e00fc003a4555fb6d5 100644
--- a/InnerDetector/InDetDetDescr/StripGeoModelXml/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/StripGeoModelXml/CMakeLists.txt
@@ -1,50 +1,18 @@
-################################################################################
-# Package: StripGeoModelXml
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( StripGeoModelXml )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Database/AthenaPOOL/RDBAccessSvc
- DetectorDescription/GeoModelXml
- DetectorDescription/GeoModel/GeoModelUtilities
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetGeoModelUtils
- InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
- InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetSimEvent
- PRIVATE
- Control/CLIDSvc
- Control/SGTools
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeometryDBSvc
- DetectorDescription/Identifier
- InnerDetector/InDetDetDescr/InDetIdentifier
- Tools/PathResolver )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-
# Component(s) in the package:
atlas_add_library( StripGeoModelXmlLib
src/*.cxx
PUBLIC_HEADERS StripGeoModelXml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel GeoModelXml GeoModelUtilities GaudiKernel InDetGeoModelUtils InDetReadoutGeometry SCT_ReadoutGeometry SCT_ReadoutGeometry StoreGateLib InDetSimEvent
- PRIVATE_LINK_LIBRARIES SGTools AthenaPoolUtilities DetDescrConditions Identifier InDetIdentifier PathResolver)
+ LINK_LIBRARIES GaudiKernel GeoModelUtilities GeoModelXml InDetGeoModelUtils SCT_ReadoutGeometry
+ PRIVATE_LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaPoolUtilities DetDescrConditions GeoModelInterfaces GeometryDBSvcLib InDetReadoutGeometry InDetSimEvent PathResolver RDBAccessSvcLib SGTools StoreGateLib )
atlas_add_component( StripGeoModelXml
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel GeoModelXml GeoModelUtilities GaudiKernel InDetGeoModelUtils InDetReadoutGeometry SCT_ReadoutGeometry SCT_ReadoutGeometry SGTools StoreGateLib SGtests AthenaPoolUtilities DetDescrConditions Identifier InDetIdentifier StripGeoModelXmlLib )
+ LINK_LIBRARIES StripGeoModelXmlLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/CMakeLists.txt b/InnerDetector/InDetDetDescr/TRT_Cabling/CMakeLists.txt
index d40a987d849b3635d72850d7fe5ed99b8eaf0fde..6ae8073af80181c342ec174d2998661c791cca15 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/CMakeLists.txt
@@ -1,22 +1,8 @@
-################################################################################
-# Package: TRT_Cabling
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TRT_Cabling )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/CxxUtils
- DetectorDescription/Identifier
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- Tools/PathResolver )
-
# External dependencies:
find_package( tdaq-common )
@@ -32,7 +18,7 @@ atlas_add_component( TRT_Cabling
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} GaudiKernel AthenaBaseComps CxxUtils Identifier InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver TRT_CablingLib )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} GaudiKernel AthenaBaseComps CxxUtils Identifier InDetIdentifier TRT_ReadoutGeometry PathResolver TRT_CablingLib )
# Install files from the package:
atlas_install_runtime( share/*.dat )
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/CMakeLists.txt b/InnerDetector/InDetDetDescr/TRT_GeoModel/CMakeLists.txt
index 35003c58ac518178e7802573f2c394ce05f90093..7d9342d5b1016c2f949f8fb5c7fa7da445b79053 100644
--- a/InnerDetector/InDetDetDescr/TRT_GeoModel/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/CMakeLists.txt
@@ -1,50 +1,22 @@
-################################################################################
-# Package: TRT_GeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TRT_GeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelUtilities
- GaudiKernel
- InnerDetector/InDetConditions/TRT_ConditionsServices
- InnerDetector/InDetDetDescr/InDetGeoModelUtils
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- PRIVATE
- Control/CxxUtils
- Control/SGTools
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoPrimitives
- DetectorDescription/GeometryDBSvc
- DetectorDescription/IdDictDetDescr
- InnerDetector/InDetConditions/TRT_ConditionsData
- InnerDetector/InDetDetDescr/InDetIdentifier )
-
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( TRT_GeoModel
- src/*.cxx
+ src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel TRT_ConditionsServicesLib InDetGeoModelUtils InDetReadoutGeometry TRT_ReadoutGeometry CxxUtils SGTools StoreGateLib SGtests AthenaPoolUtilities DetDescrConditions IdDictDetDescr TRT_ConditionsData InDetIdentifier GeometryDBSvcLib )
-
-atlas_add_test( TRT_GMConfig_test
- SCRIPT test/TRT_GMConfig_test.py
- PROPERTIES TIMEOUT 600 )
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelInterfaces GeoModelUtilities GeoPrimitives GaudiKernel TRT_ConditionsServicesLib InDetGeoModelUtils InDetReadoutGeometry TRT_ReadoutGeometry CxxUtils SGTools StoreGateLib AthenaPoolUtilities DetDescrConditions IdDictDetDescr TRT_ConditionsData InDetIdentifier GeometryDBSvcLib RDBAccessSvcLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_scripts( test/*.py )
+# Test(s) in the package:
+atlas_add_test( TRT_GMConfig_test
+ SCRIPT test/TRT_GMConfig_test.py
+ PROPERTIES TIMEOUT 600 )
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/CMakeLists.txt b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/CMakeLists.txt
index 4c878c7efe7bdb41f7f09de19e64cd882d56663e..17b92b402c590c8a8d32ce3c804c7167ddf9a06c 100644
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/CMakeLists.txt
@@ -1,41 +1,16 @@
-################################################################################
-# Package: TRT_ReadoutGeometry
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TRT_ReadoutGeometry )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/SGTools
- Control/StoreGate
- DetectorDescription/AtlasDetDescr
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- Tracking/TrkDetDescr/TrkDetElementBase
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventPrimitives
- DetectorDescription/DetDescrCond/DetDescrConditions
- PRIVATE
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/IdDictDetDescr
- InnerDetector/InDetConditions/TRT_ConditionsData )
-
# External dependencies:
find_package( CLHEP )
-find_package( Eigen )
# Component(s) in the package:
-
atlas_add_library( TRT_ReadoutGeometry
- src/*.c*
+ src/*.cxx
PUBLIC_HEADERS TRT_ReadoutGeometry
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} InDetReadoutGeometry AthenaKernel SGTools AtlasDetDescr GeoPrimitives Identifier GaudiKernel InDetIdentifier TrkDetElementBase TrkSurfaces TrkEventPrimitives StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES AthenaPoolUtilities DetDescrConditions IdDictDetDescr TRT_ConditionsData )
-
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry TrkDetElementBase
+ PRIVATE_LINK_LIBRARIES DetDescrConditions GaudiKernel GeoModelUtilities StoreGateLib TRT_ConditionsData TrkSurfaces )
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt b/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
index 144bde1394009de03ea607cb506e22472cdc50ef..c52696659bc40d28b6f49e3a3beb8f6ac156f2d2 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
@@ -1,22 +1,14 @@
-################################################################################
-# Package: PixelMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelMonitoring )
-# External dependencies:
-find_package( ROOT COMPONENTS Core MathCore Hist )
-
# Component(s) in the package:
atlas_add_component( PixelMonitoring
src/*.h src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib AtlasDetDescr
- GaudiKernel InDetRawData InDetPrepRawData TrkTrack
- AthenaPoolUtilities GeoPrimitives xAODEventInfo EventPrimitives InDetIdentifier
- InDetReadoutGeometry InDetRIO_OnTrack LWHists TrkParameters TrkSpacePoint
- TrkTrackSummary TrkToolInterfaces PixelCablingLib PixelGeoModelLib PathResolver
- InDetTrackSelectionToolLib InDetConditionsSummaryService PixelConditionsToolsLib )
+ LINK_LIBRARIES AthenaMonitoringKernelLib AthenaMonitoringLib AtlasDetDescr EventPrimitives
+ InDetConditionsSummaryService InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetRawData
+ InDetReadoutGeometry InDetTrackSelectionToolLib PixelCablingLib PixelConditionsData
+ TrkMeasurementBase TrkRIO_OnTrack TrkToolInterfaces TrkTrack TrkTrackSummary )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py
index c778ba94a673068cff94204fa37727284d31015e..a3a2d5505c409c2a48a42ee57fad4924fe196567 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py
@@ -7,11 +7,10 @@
@brief Configuration of Pixel Error Monitoring Histograms for Run 3
'''
from PixelMonitoring.PixelAthMonitoringBase import define2DProfHist
-from PixelMonitoring.PixelAthMonitoringBase import define1DLayers, defineMapVsLumiLayers
+from PixelMonitoring.PixelAthMonitoringBase import defineMapVsLumiLayers
from PixelMonitoring.PixelAthMonitoringBase import define1DProfLumiLayers
-from PixelMonitoring.PixelAthMonitoringBase import layers, totcuts, xbinsem, xminsem, lumibinsx
-from PixelMonitoring.PixelAthMonitoringBase import addOnTrackTxt, fullDressTitle
-from PixelMonitoring.PixelAthMonitoringBase import runtext
+from PixelMonitoring.PixelAthMonitoringBase import layers
+from PixelMonitoring.PixelAthMonitoringBase import fullDressTitle
from PixelMonitoring.PixelAthMonitoringBase import errbbinsy, errbminsy, errbbsizy, errtbinsy
from PixelMonitoring.PixelAthMonitoringBase import ErrBitLabels, ErrCatRODModLabels, ErrCatLabels, ErrCatRODModLabelsNorm, ErrCatLabelsNorm
from PixelMonitoring.PixelAthMonitoringBase import ErrStateLabelsFEI3, ErrStateLabelsFEI4
@@ -23,12 +22,8 @@ def PixelAthErrorMonAlgCfg(helper, alg, **kwargs):
alg -- algorithm Configurable object returned from addAlgorithm
kwargs -- jo agruments
'''
- doOnline = kwargs.get('doOnline', False)
- doLumiBlock = kwargs.get('doLumiBlock', False)
-
path = '/Pixel/Errors/'
pathExpert = '/Pixel/ErrorsExpert/'
- pathLowStat = '/Pixel/LumiBlock/'
errorGroup = helper.addGroup(alg, 'Error')
@@ -107,12 +102,11 @@ def PixelAthErrorMonAlgCfg(helper, alg, **kwargs):
title = fullDressTitle('IBL ServiceRecord Unweighted', False, ';SR',';# errors/event')
varName += ';ServiceRecord_Unweighted_IBL'
errorGroup.defineHistogram(varName,
- type='TH1F', path=pathExpert, title=title,
- xbins=40, xmin=-0.5, xmax=39.5)
+ type='TH1F', path=pathExpert, title=title,
+ xbins=40, xmin=-0.5, xmax=39.5)
varName = 'ServiceRecord_val'
title = fullDressTitle('IBL ServiceRecord Weighted with Payload', False, ';SR',';# errors/event')
varName += ';ServiceRecord_Weighted_IBL'
errorGroup.defineHistogram(varName, weight='ServiceRecord_wgt',
- type='TH1F', path=pathExpert, title=title,
- xbins=40, xmin=-0.5, xmax=39.5)
-
+ type='TH1F', path=pathExpert, title=title,
+ xbins=40, xmin=-0.5, xmax=39.5)
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py
index 20d240a20e596638347c4c166a89089fb88f0407..50ada6a7aca435744c58ec382f90832fac296204 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthHitMonAlgCfg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
'''
@@ -8,9 +8,8 @@
'''
from PixelMonitoring.PixelAthMonitoringBase import define2DProfHist, definePP0Histos, getLayerGroup
-from PixelMonitoring.PixelAthMonitoringBase import define1DLayers
from PixelMonitoring.PixelAthMonitoringBase import define1DProfLumiLayers
-from PixelMonitoring.PixelAthMonitoringBase import layers, totcuts, xbinsem, xminsem, lumibinsx, bcidbinsx
+from PixelMonitoring.PixelAthMonitoringBase import layers, lumibinsx, bcidbinsx
from PixelMonitoring.PixelAthMonitoringBase import addOnTrackTxt, addOnTrackToPath, fullDressTitle
from PixelMonitoring.PixelAthMonitoringBase import runtext
@@ -74,8 +73,8 @@ def PixelAthHitMonAlgCfg(helper, alg, **kwargs):
fullvarstr+= ',{0}_{1}'.format(histoname, 'val')
fullvarstr+= ';' + histoname + '_{0}'.format(layer)
layerGroup.defineHistogram(fullvarstr,
- type='TProfile', path=pathGroup, title=title,
- xbins=bcidbinsx, xmin=-0.5, xmax=-0.5+bcidbinsx)
+ type='TProfile', path=pathGroup, title=title,
+ xbins=bcidbinsx, xmin=-0.5, xmax=-0.5+bcidbinsx)
histoGroupName = 'Hit_Occupancy_PP0'
title = 'Average per module(FE) hit occupancy reset every 5 min'
@@ -109,7 +108,7 @@ def PixelAthHitMonAlgCfg(helper, alg, **kwargs):
titleLB = 'Hit Level 1 Accept lowstat {0}'.format(layer) + runtext + ';Level 1 Accept;# hits'
fullvarstrLB = varName + ';' + histonameLB
layerGroup.defineHistogram(fullvarstrLB,
- type='TH1F', path=pathLowStat, title=title,
+ type='TH1F', path=pathLowStat, title=titleLB,
xbins=14, xmin=-1.5, xmax=12.5, duration='lowStat')
###