Merge branch 'acts-adapt-logger' into 'master'

Externals Update, including Acts, master branch (2020.08.17.)

See merge request atlas/athena!35663

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 )

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/* )
 
 

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 )

Projects/AnalysisBase/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.72
+AnalysisBaseExternalsVersion = 2.0.73

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

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

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

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

Projects/VP1Light/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.72
+VP1LightExternalsVersion = 2.0.73

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/* )

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"};
 

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;