diff --git a/PhysicsAnalysis/AnalysisCommon/PMGTools/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/PMGTools/CMakeLists.txt index 389be61f89bffe56d007ea7a0f760ce04a17c3c0..20f47211bd2307520e4a9369ee710b8a86893901 100644 --- a/PhysicsAnalysis/AnalysisCommon/PMGTools/CMakeLists.txt +++ b/PhysicsAnalysis/AnalysisCommon/PMGTools/CMakeLists.txt @@ -98,7 +98,3 @@ atlas_add_test( ut_PMGTruthWeightTool_test SOURCES test/ut_PMGTruthWeightTool_test.cxx INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} LINK_LIBRARIES ${ROOT_LIBRARIES} PMGToolsLib ${xaod_access_lib} ) - - -# Install files from the package: -atlas_install_data( data/*.txt share/*.txt ) diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/CMakeLists.txt b/PhysicsAnalysis/D3PDTools/EventLoopGrid/CMakeLists.txt index 6010760484481d241a9c37f5a0e231f4bd6ff28b..bfa5033bbddd8af9498ce02e7d6a890648781814 100644 --- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/CMakeLists.txt +++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/CMakeLists.txt @@ -29,8 +29,6 @@ atlas_add_library( EventLoopGrid target_compile_definitions (EventLoopGrid PUBLIC USE_CMAKE) # Install files from the package: -atlas_install_python_modules( python/*.py ) -atlas_install_scripts( scripts/* ) atlas_install_data( data/* ) diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/CMakeLists.txt b/PhysicsAnalysis/D3PDTools/EventLoopTest/CMakeLists.txt index c97149f2c00d4aa2fb65ab33bc65f647cefcc06d..9edc7241bab54c724636356f1631a99129ae7e92 100644 --- a/PhysicsAnalysis/D3PDTools/EventLoopTest/CMakeLists.txt +++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/CMakeLists.txt @@ -74,5 +74,4 @@ endforeach (source ${util_sources}) # Install files from the package: -atlas_install_scripts( scripts/el_retrieve scripts/el_wait ) -atlas_install_data( data/*.root data/*.yml ) +atlas_install_data( data/*.yml ) diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt index f40c389b87c2e27839f9cae0195ce4905aa5d6aa..dd81412ec5cc7bf8975503133bf65f525f06260a 100644 --- a/Projects/AnalysisBase/externals.txt +++ b/Projects/AnalysisBase/externals.txt @@ -6,4 +6,4 @@ # forbidden. # The version of atlas/atlasexternals to use: -AnalysisBaseExternalsVersion = 2.0.72 +AnalysisBaseExternalsVersion = 2.0.73 diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt index 3fb6232f033fdec47dd4af6ca5a4de1b0b736440..2b313c5f524c712bf3d3b174981a361183917a83 100644 --- a/Projects/AthDataQuality/externals.txt +++ b/Projects/AthDataQuality/externals.txt @@ -5,4 +5,4 @@ # an "origin/" prefix before it. For tags however this is explicitly # forbidden. -AtlasExternalsVersion = 2.0.72 +AtlasExternalsVersion = 2.0.73 diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt index 283a2a39f42e9e42f72a57fce7581988e9e18a1f..291446ea5ab93faa27491ebb3a109d7df69ab5ee 100644 --- a/Projects/AthGeneration/externals.txt +++ b/Projects/AthGeneration/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthGenerationExternalsVersion = 2.0.72 +AthGenerationExternalsVersion = 2.0.73 # The version of atlas/Gaudi to use: GaudiVersion = v34r0.003 diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt index 6b7106844207668f7378bd0e9441d8258cb50a36..6e0f6c452b93e22657a960f8651997b75ec11959 100644 --- a/Projects/AthSimulation/externals.txt +++ b/Projects/AthSimulation/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthSimulationExternalsVersion = 2.0.72 +AthSimulationExternalsVersion = 2.0.73 # The version of atlas/Gaudi to use: GaudiVersion = v34r0.003 diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt index e1b1715350052a42e4aff75863dd9a7344f585b5..ac936d035108849972bcd45509506809df054ace 100644 --- a/Projects/Athena/externals.txt +++ b/Projects/Athena/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthenaExternalsVersion = 2.0.72 +AthenaExternalsVersion = 2.0.73 # The version of atlas/Gaudi to use: GaudiVersion = v34r0.003 diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt index bb11012d898a61bb2e88decde4e714c1beb9b69d..5201910d21c3bf973665b46b84662e1a9e0dbe02 100644 --- a/Projects/VP1Light/externals.txt +++ b/Projects/VP1Light/externals.txt @@ -6,4 +6,4 @@ # forbidden. # The version of atlas/atlasexternals to use: -VP1LightExternalsVersion = 2.0.72 +VP1LightExternalsVersion = 2.0.73 diff --git a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt index d3c51ae70992c385f4a732c6dade2f067f2b2d82..dbed1b3346251cb755313f743b9e4cc42f841c10 100644 --- a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt +++ b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt @@ -72,6 +72,5 @@ if( XAOD_STANDALONE ) endif() # Install files from the package: -atlas_install_python_modules( python/*.py ) atlas_install_joboptions( share/*.py ) atlas_install_data( data/* ) diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h index 3b3588e846d323dfab659776bab1ba219e84abb3..9a117e51f0e6de68fc7631e44d2a66c9130038c7 100644 --- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h +++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h @@ -37,6 +37,7 @@ namespace Acts { class Surface; class BoundaryCheck; +class Logger; } @@ -110,6 +111,7 @@ public: private: std::unique_ptr<ActsExtrapolationDetail::VariantPropagator> m_varProp; + std::unique_ptr<const Acts::Logger> m_logger{nullptr}; SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheCondObjInputKey {this, "AtlasFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"}; diff --git a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx index f572ebaf15b6a1e7f5b65fdbca2f2955500d413b..6c5d6459b1885cef9b09d74186ca93c444a2f840 100644 --- a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx +++ b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx @@ -21,6 +21,7 @@ #include "Acts/Propagator/ActionList.hpp" #include "Acts/Surfaces/BoundaryCheck.hpp" #include "Acts/Surfaces/Surface.hpp" +#include "Acts/Utilities/Logger.hpp" // BOOST #include <boost/variant/variant.hpp> @@ -68,6 +69,8 @@ ActsExtrapolationTool::initialize() ATH_MSG_INFO("Initializing ACTS extrapolation"); + m_logger = makeActsAthenaLogger(this, "Prop", "ActsExtrapTool"); + ATH_CHECK( m_trackingGeometryTool.retrieve() ); std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry = m_trackingGeometryTool->trackingGeometry(); @@ -127,7 +130,7 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx, using Options = Acts::PropagatorOptions<ActionList, AbortConditions>; - Options options(anygctx, mctx); + Options options(anygctx, mctx, Acts::LoggerWrapper{*m_logger}); options.pathLimit = pathLimit; bool debug = msg().level() == MSG::VERBOSE; options.debug = debug; @@ -207,7 +210,7 @@ ActsExtrapolationTool::propagate(const EventContext& ctx, using AbortConditions = Acts::AbortList<EndOfWorld>; using Options = Acts::PropagatorOptions<ActionList, AbortConditions>; - Options options(anygctx, mctx); + Options options(anygctx, mctx, Acts::LoggerWrapper{*m_logger}); options.pathLimit = pathLimit; bool debug = msg().level() == MSG::VERBOSE; options.debug = debug; @@ -258,7 +261,7 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx, using AbortConditions = Acts::AbortList<EndOfWorld>; using Options = Acts::PropagatorOptions<ActionList, AbortConditions>; - Options options(anygctx, mctx); + Options options(anygctx, mctx, Acts::LoggerWrapper{*m_logger}); options.pathLimit = pathLimit; bool debug = msg().level() == MSG::VERBOSE; options.debug = debug; @@ -331,7 +334,7 @@ ActsExtrapolationTool::propagate(const EventContext& ctx, using AbortConditions = Acts::AbortList<EndOfWorld>; using Options = Acts::PropagatorOptions<ActionList, AbortConditions>; - Options options(anygctx, mctx); + Options options(anygctx, mctx, Acts::LoggerWrapper{*m_logger}); options.pathLimit = pathLimit; bool debug = msg().level() == MSG::VERBOSE; options.debug = debug;