diff --git a/Tracking/Acts/ActsGeometry/CMakeLists.txt b/Tracking/Acts/ActsGeometry/CMakeLists.txt
index e78c9dcbb212b85b313c636093f2b882bdd2e175..496b225f026d12137f7e52ef4073afab5a8651ff 100755
--- a/Tracking/Acts/ActsGeometry/CMakeLists.txt
+++ b/Tracking/Acts/ActsGeometry/CMakeLists.txt
@@ -1,37 +1,17 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ActsGeometry )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- PRIVATE
- Control/StoreGate
- DetectorDescription/Identifier
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- Control/AthenaBaseComps
- AthenaKernel
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/GeoPrimitives
- Event/EventInfo
- GaudiKernel
- MagFieldElements MagFieldConditions
- Calorimeter/CaloDetDescr
- Tracking/Acts/ActsGeometryInterfaces
- Tracking/Acts/ActsInterop
- Tracking/TrkDetDescr/TrkGeometry)
-
# External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
+find_package( Acts COMPONENTS Core PluginJson )
find_package( Boost )
-find_package( nlohmann_json )
-
-find_package( Acts COMPONENTS Core PluginJson)
+find_package( CLHEP )
+find_package( GeoModelCore )
+find_package( ROOT COMPONENTS Core Tree RIO )
+find_package( TBB )
# Component(s) in the package:
-
atlas_add_library( ActsGeometryLib
src/ActsAlignmentStore.cxx
src/ActsDetectorElement.cxx
@@ -40,16 +20,28 @@ atlas_add_library( ActsGeometryLib
src/ActsTrackingGeometrySvc.cxx
src/util/*.cxx
PUBLIC_HEADERS ActsGeometry
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES}
- AthenaKernel
- ActsInteropLib
- ActsGeometryInterfacesLib
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${TBB_LIBRARIES}
ActsCore
+ ActsGeometryInterfacesLib
+ ActsInteropLib
ActsPluginJson
- TrkGeometry
+ AthenaBaseComps
+ AthenaKernel
+ CaloDetDescrLib
+ EventInfo
+ GaudiKernel
+ GeoModelUtilities
+ GeoPrimitives
+ Identifier
+ InDetIdentifier
+ InDetReadoutGeometry
+ MagFieldConditions
+ PRIVATE_LINK_LIBRARIES
+ StoreGateLib
TRT_ReadoutGeometry
- MagFieldElements MagFieldConditions)
+ TrkGeometry
+ TrkSurfaces )
atlas_add_component( ActsGeometry
src/ActsExtrapolationAlg.cxx
@@ -71,17 +63,20 @@ atlas_add_component( ActsGeometry
src/ActsPropStepRootWriterSvc.cxx
src/ActsCaloTrackingVolumeBuilder.cxx
src/components/*.cxx
- PUBLIC_HEADERS ActsGeometry
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES}
- EventInfo
- CaloDetDescrLib
- ActsInteropLib
- ActsGeometryLib
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} ${ROOT_LIBRARIES}
ActsGeometryInterfacesLib
- ActsCore
- ActsPluginJson)
+ ActsGeometryLib
+ ActsInteropLib
+ AthenaBaseComps
+ AthenaKernel
+ CaloDetDescrLib
+ EventInfo
+ GaudiKernel
+ StoreGateLib
+ TRT_ReadoutGeometry
+ TrkGeometry )
# 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} )
diff --git a/Tracking/Acts/ActsGeometry/python/ActsGeometryConfigDb.py b/Tracking/Acts/ActsGeometry/python/ActsGeometryConfigDb.py
index 0214f13ccca6c3dacd46ad0df969e5e1ab0e4561..27024f51cc8dcf7e35214d8fe193f6a2ab151cd2 100644
--- a/Tracking/Acts/ActsGeometry/python/ActsGeometryConfigDb.py
+++ b/Tracking/Acts/ActsGeometry/python/ActsGeometryConfigDb.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.CfgGetter import addService
addService('ActsGeometry.ActsGeometryConfig.TrackingGeometrySvc', 'TrackingGeometrySvc')
diff --git a/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py b/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py
index 0537e430445c037d5230c3e65760aaab34f1bab1..3c5132131317326ff4beb697ee7da7e700af2f7f 100644
--- a/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py
+++ b/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py
@@ -12,8 +12,6 @@ from __future__ import print_function
# import the DetFlags for the setting
from AthenaCommon.DetFlags import DetFlags
-from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
-
# import the Extrapolator configurable
from ActsGeometry.ActsGeometryConf import ActsTrackingGeometryTool
diff --git a/Tracking/Acts/ActsGeometryInterfaces/CMakeLists.txt b/Tracking/Acts/ActsGeometryInterfaces/CMakeLists.txt
index 71664b93af92f0dad276acb72bb4031d554e027f..b98ea3d9957841115d9c515b65d120c38fced405 100644
--- a/Tracking/Acts/ActsGeometryInterfaces/CMakeLists.txt
+++ b/Tracking/Acts/ActsGeometryInterfaces/CMakeLists.txt
@@ -1,28 +1,19 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ActsGeometryInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- PRIVATE
- Control/StoreGate
- AthenaKernel
- AthenaBaseComps
- GaudiKernel
- ActsInterop )
-
# External dependencies:
-find_package( Eigen )
find_package( Acts COMPONENTS Core )
# Component(s) in the package:
-
atlas_add_library( ActsGeometryInterfacesLib
ActsGeometryInterfaces/*.h
INTERFACE
PUBLIC_HEADERS ActsGeometryInterfaces
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES}
- AthenaKernel
- ActsInteropLib
- ActsCore)
+ LINK_LIBRARIES
+ AthenaBaseComps
+ ActsCore
+ ActsGeometryLib
+ GaudiKernel
+ TrkGeometry )
diff --git a/Tracking/Acts/ActsPriVtxFinder/CMakeLists.txt b/Tracking/Acts/ActsPriVtxFinder/CMakeLists.txt
index bb78265c75719445627efe1174e03d293d0e195f..d9980b8fed53641d2ea3243488a0fb3c12786cb1 100644
--- a/Tracking/Acts/ActsPriVtxFinder/CMakeLists.txt
+++ b/Tracking/Acts/ActsPriVtxFinder/CMakeLists.txt
@@ -1,98 +1,29 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ActsPriVtxFinder )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- PRIVATE
- Control/StoreGate
- DetectorDescription/Identifier
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelReadoutGeometry
- InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- InnerDetector/InDetConditions/BeamSpotConditionsData
- InnerDetector/InDetRecTools/InDetTrackSelectionTool
- Control/AthenaBaseComps
- AthenaKernel
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/GeoPrimitives
- Event/EventInfo
- GaudiKernel
- MagFieldElements MagFieldConditions
- Calorimeter/CaloDetDescr
- Tracking/Acts/ActsInterop
- Tracking/TrkEvent/TrkTrackLink
- Tracking/TrkEvent/TrkLinks
- Event/xAOD/xAODCore
- Event/xAOD/xAODTracking
- Reconstruction/RecoTools/ITrackToVertex
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/VxVertex
- Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
- InnerDetector/InDetRecTools/InDetRecToolInterfaces )
-
# External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
-find_package( Boost )
-
find_package( Acts COMPONENTS Core )
+find_package( Boost )
# Component(s) in the package:
-
-atlas_add_library( ActsPriVtxFinderLib
- PUBLIC_HEADERS ActsPriVtxFinder
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES}
- AthenaKernel
- ActsInteropLib
- ActsGeometryLib
- ActsGeometryInterfacesLib
- ActsCore
- PixelReadoutGeometry
- SCT_ReadoutGeometry
- TRT_ReadoutGeometry
- BeamSpotConditionsData
- InDetTrackSelectionToolLib
- TrkLinks
- xAODCore
- xAODTracking
- ITrackToVertex
- TrkSurfaces
- TrkParticleBase
- TrkTrack
- VxVertex
- TrkVertexFitterInterfaces
- AthenaMonitoringKernelLib
- InDetRecToolInterfaces
- MagFieldElements MagFieldConditions)
-
atlas_add_component( ActsPriVtxFinder
src/*.cxx
src/components/*.cxx
- PUBLIC_HEADERS ActsPriVtxFinder
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES}
- EventInfo
- CaloDetDescrLib
- ActsInteropLib
- ActsPriVtxFinderLib
- ActsGeometryLib
- ActsGeometryInterfacesLib
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES}
ActsCore
+ ActsGeometryInterfacesLib
+ ActsGeometryLib
+ ActsInteropLib
+ AthenaBaseComps
BeamSpotConditionsData
+ GaudiKernel
+ InDetRecToolInterfaces
+ InDetTrackSelectionToolLib
TrkLinks
- xAODCore
- xAODTracking
- ITrackToVertex
- TrkSurfaces
- TrkParticleBase
- TrkTrack
- VxVertex
- TrkVertexFitterInterfaces
- AthenaMonitoringKernelLib
- InDetRecToolInterfaces )
+ TrkParticleBase
+ TrkTrack
+ TrkTrackLink
+ xAODTracking )
diff --git a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
index 0a037919e6622e8895a97f1bc2d9f0102ecd6305..f463b8d2e9623ac945173c4b26ad9873a8a3b77e 100755
--- a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
+++ b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h"
+#include "ActsAdaptiveMultiPriVtxFinderTool.h"
// ATHENA
#include "GaudiKernel/IInterface.h"
diff --git a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.h
similarity index 100%
rename from Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
rename to Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.h
diff --git a/Tracking/Acts/ActsPriVtxFinder/src/components/ActsPriVtxFinder_entries.cxx b/Tracking/Acts/ActsPriVtxFinder/src/components/ActsPriVtxFinder_entries.cxx
index 2cec71f866bda6c56de25484b4c59f195fe66162..0b2ff48a3cdcb482f6d2bdf3807913a99722a6b4 100755
--- a/Tracking/Acts/ActsPriVtxFinder/src/components/ActsPriVtxFinder_entries.cxx
+++ b/Tracking/Acts/ActsPriVtxFinder/src/components/ActsPriVtxFinder_entries.cxx
@@ -3,7 +3,7 @@
*/
//#include "ActsPriVtxFinder/ActsPrimaryVtxFinderAlg.h"
-#include "ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h"
+#include "../ActsAdaptiveMultiPriVtxFinderTool.h"
// DECLARE_COMPONENT( ActsPrimaryVtxFinderAlg )
DECLARE_COMPONENT( ActsAdaptiveMultiPriVtxFinderTool )