Build/AtlasLCG/modules/FindDavix.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindDavix.cmake 724137 2016-02-16 09:01:57Z krasznaa $
+# $Id: FindDavix.cmake 780184 2016-10-25 08:19:02Z elmsheus $
 #
 # Defines:
 #  - DAVIX_FOUND
@@ -18,16 +18,16 @@ include( LCGFunctions )
 
 # Declare the external module:
 lcg_external_module( NAME Davix
-   INCLUDE_SUFFIXES include INCLUDE_NAMES davix/davix.hpp
-   LIBRARY_SUFFIXES lib lib64
-   DEFAULT_COMPONENTS davix )
+   INCLUDE_SUFFIXES include/davix INCLUDE_NAMES davix.hpp
+   LIBRARY_SUFFIXES lib64
+   COMPULSORY_COMPONENTS davix )
 
 # Handle the standard find_package arguments:
 include( FindPackageHandleStandardArgs )
 find_package_handle_standard_args( Davix DEFAULT_MSG DAVIX_INCLUDE_DIR
    DAVIX_LIBRARIES )
 mark_as_advanced( DAVIX_FOUND DAVIX_INCLUDE_DIR DAVIX_INCLUDE_DIRS
-   DAVIX_LIBRARY_DIRS )
+   DAVIX_LIBRARIES DAVIX_LIBRARY_DIRS  )
 
 # Set up the RPM dependency:
 lcg_need_rpm( Davix )

Build/AtlasLCG/modules/FindDoxygen.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindDoxygen.cmake 719980 2016-01-27 08:38:07Z krasznaa $
+# $Id: FindDoxygen.cmake 772148 2016-09-07 15:04:09Z krasznaa $
 #
 # This file is here to intercept find_package(Doxygen) calls, and extend the
 # environment setup file of the project with the correct Doxygen paths.
@@ -15,8 +15,10 @@ set( _modulePathBackup ${CMAKE_MODULE_PATH} )
 set( CMAKE_MODULE_PATH )
 
 # Make the code ignore the system path(s):
-set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
-   /usr/lib64 )
+if( DOXYGEN_ROOT )
+   set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
+      /usr/lib64 )
+endif()
 
 # Call CMake's own FindDoxygen.cmake. Note that the arguments created for this
 # script by CMake pass through to the official script. So we don't need to
@@ -33,5 +35,11 @@ if( DOXYGEN_EXECUTABLE )
    get_filename_component( DOXYGEN_BINARY_PATH ${DOXYGEN_EXECUTABLE} PATH )
 endif()
 
+# This is just needed to set up a proper dependency on graphviz:
+if( DOXYGEN_DOT_FOUND )
+   set( GRAPHVIZ_FOUND TRUE )
+endif()
+
 # Set up the RPM dependency:
 lcg_need_rpm( doxygen )
+lcg_need_rpm( graphviz )

Build/AtlasLCG/modules/FindEXPAT.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindEXPAT.cmake 719980 2016-01-27 08:38:07Z krasznaa $
+# $Id: FindEXPAT.cmake 772148 2016-09-07 15:04:09Z krasznaa $
 #
 # File intercepting find_package(EXPAT) calls, and making the created
 # paths relocatable.
@@ -15,8 +15,10 @@ set( _modulePathBackup ${CMAKE_MODULE_PATH} )
 set( CMAKE_MODULE_PATH )
 
 # Make the code ignore the system path(s):
-set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
-   /usr/lib64 )
+if( EXPAT_ROOT )
+   set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
+      /usr/lib64 )
+endif()
 
 # Call CMake's own FindEXPAT.cmake. Note that the arguments created
 # for this script by CMake pass through to the official script. So we don't

Build/AtlasLCG/modules/FindFFTW.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindFFTW.cmake 718732 2016-01-20 12:30:12Z krasznaa $
+# $Id: FindFFTW.cmake 769797 2016-08-24 10:03:31Z krasznaa $
 #
 # Defines:
 #
@@ -21,7 +21,8 @@ include( LCGFunctions )
 # Declare the external module:
 lcg_external_module( NAME FFTW
    INCLUDE_SUFFIXES include INCLUDE_NAMES fftw3.h
-   LIBRARY_SUFFIXES lib COMPULSORY_COMPONENTS fftw3 )
+   LIBRARY_SUFFIXES lib COMPULSORY_COMPONENTS fftw3f
+   EXTRA_OPTIONS NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH )
 
 # Handle the standard find_package arguments:
 include( FindPackageHandleStandardArgs )

Build/AtlasLCG/modules/FindGSL.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindGSL.cmake 724137 2016-02-16 09:01:57Z krasznaa $
+# $Id: FindGSL.cmake 772148 2016-09-07 15:04:09Z krasznaa $
 #
 # This file is here to intercept find_package(GSL) calls, and massage
 # the paths produced by the system module, to make them relocatable.
@@ -10,8 +10,10 @@
 include( LCGFunctions )
 
 # Ignore the system paths:
-set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
-   /usr/lib64 )
+if( GSL_ROOT )
+   set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
+      /usr/lib64 )
+endif()
 
 # Temporarily clean out CMAKE_MODULE_PATH, so that we could pick up
 # FindGSL.cmake from CMake:

Build/AtlasLCG/modules/FindPythonInterp.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindPythonInterp.cmake 719980 2016-01-27 08:38:07Z krasznaa $
+# $Id: FindPythonInterp.cmake 782719 2016-11-07 12:30:42Z limosani $
 #
 # This file is here to intercept find_package(PythonInterp) calls, and extend
 # the environment setup file of the project with the correct Python paths.
@@ -14,9 +14,12 @@ include( LCGFunctions )
 set( _modulePathBackup ${CMAKE_MODULE_PATH} )
 set( CMAKE_MODULE_PATH )
 
-# Make the code ignore the system path(s):
-set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
-   /usr/lib64 )
+# Make the code ignore the system path(s). If we are to pick up Python
+# from the release.
+if( PYTHON_ROOT )
+   set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
+      /usr/lib64 )
+endif()
 
 # Call CMake's own FindPythonInterp.cmake. Note that the arguments created
 # for this script by CMake pass through to the official script. So we don't
@@ -31,7 +34,14 @@ set( CMAKE_SYSTEM_IGNORE_PATH )
 # Set some extra variable(s), to make the environment configuration easier:
 if( PYTHON_EXECUTABLE )
    get_filename_component( PythonInterp_BINARY_PATH ${PYTHON_EXECUTABLE} PATH )
+   get_filename_component( PYTHONHOME ${PythonInterp_BINARY_PATH} PATH )
+   set ( PythonInterp_ENVIRONMENT
+       SET PYTHONHOME ${PYTHONHOME} )
 endif()
 
+
 # Set up the RPM dependency:
 lcg_need_rpm( Python FOUND_NAME PYTHONINTERP VERSION_NAME PYTHON )
+
+
+

Build/AtlasLCG/modules/FindPythonLibs.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindPythonLibs.cmake 734923 2016-04-08 15:32:19Z krasznaa $
+# $Id: FindPythonLibs.cmake 782719 2016-11-07 12:30:42Z limosani $
 #
 # This file is here to intercept find_package(PythonLibs) calls, and
 # massage the paths produced by the system module, to make them relocatable.
@@ -14,9 +14,12 @@ include( LCGFunctions )
 set( _modulePathBackup ${CMAKE_MODULE_PATH} )
 set( CMAKE_MODULE_PATH )
 
-# Make the code ignore the system path(s):
-set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
-   /usr/lib64 )
+# Make the code ignore the system path(s). If we are to pick up Python
+# from the release.
+if( PYTHON_ROOT )
+   set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
+      /usr/lib64 )
+endif()
 
 # Call CMake's own FindPythonLibs.cmake. Note that the arguments created
 # for this script by CMake pass through to the official script. So we don't
@@ -67,7 +70,11 @@ if( PYTHONLIBS_FOUND AND NOT GAUDI_ATLAS )
    # lcg_generate_env function later on:
    set( PYTHONLIBS_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} )
 
+   get_filename_component( PYTHONHOME ${PYTHONLIBS_LIBRARY_DIRS} PATH )
+   set( PythonLibs_ENVIRONMENT
+   	  SET PYTHONHOME ${PYTHONHOME} )
 endif()
 
+
 # Set up the RPM dependency:
 lcg_need_rpm( Python FOUND_NAME PYTHONLIBS VERSION_NAME PYTHON )

Build/AtlasLCG/modules/FindQt4.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindQt4.cmake 728694 2016-03-09 15:42:56Z krasznaa $
+# $Id: FindQt4.cmake 772148 2016-09-07 15:04:09Z krasznaa $
 #
 # This file is here to intercept find_package(Qt4) calls, and
 # massage the paths produced by the system module, to make them relocatable.
@@ -15,8 +15,10 @@ set( _modulePathBackup ${CMAKE_MODULE_PATH} )
 set( CMAKE_MODULE_PATH )
 
 # Make the code ignore the system path(s):
-set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
-   /usr/lib64 )
+if( QT4_ROOT )
+   set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
+      /usr/lib64 )
+endif()
 
 # Call CMake's own FindQt4.cmake. Note that the arguments created
 # for this script by CMake pass through to the official script. So we don't

Build/AtlasLCG/modules/FindQt5.cmake

+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+# $Id: FindQt5.cmake 772148 2016-09-07 15:04:09Z krasznaa $
+#
+# This file is here to intercept find_package(Qt5) calls, and
+# massage the paths produced by the system module, to make them relocatable.
+#
+
+# The LCG include(s):
+include( LCGFunctions )
+
+# Qt5 needs at least one component to be requested from it. So let's make
+# Core compulsory.
+list( APPEND Qt5_FIND_COMPONENTS Core )
+list( REMOVE_DUPLICATES Qt5_FIND_COMPONENTS )
+
+# Temporarily clean out CMAKE_MODULE_PATH, so that we could pick up
+# FindQt5.cmake from CMake:
+set( _modulePathBackup ${CMAKE_MODULE_PATH} )
+set( CMAKE_MODULE_PATH )
+
+# Make the code ignore the system path(s):
+if( QT5_ROOT )
+   set( CMAKE_SYSTEM_IGNORE_PATH /usr/include /usr/bin /usr/lib /usr/lib32
+      /usr/lib64 )
+endif()
+
+# Let Qt's own CMake code be found:
+find_package( Qt5 )
+
+# Restore CMAKE_MODULE_PATH:
+set( CMAKE_MODULE_PATH ${_modulePathBackup} )
+unset( _modulePathBackup )
+set( CMAKE_SYSTEM_IGNORE_PATH )
+
+# Massage the paths found by the system module:
+if( Qt5_FOUND AND NOT GAUDI_ATLAS )
+
+   # Make sure that the lib/ directory is added to the environment:
+   set( QT5_LIBRARY_DIRS "${QT5_ROOT}/lib" ) 
+
+   # At this point we'll have to figure out how to convince the Qt5 code
+   # to run the build executables inside the build environment. So that
+   # they could actually find the Qt5 libraries.
+   #set( AM_QT_MOC_EXECUTABLE
+   #   "${CMAKE_BINARY_DIR}/atlas_build_run.sh ${AM_QT_MOC_EXECUTABLE}" )
+   #set( _qt_uic_executable
+   #   "${CMAKE_BINARY_DIR}/atlas_build_run.sh ${_qt_uic_executable}" )
+   #set( AM_QT_RCC_EXECUTABLE
+   #   "${CMAKE_BINARY_DIR}/atlas_build_run.sh ${AM_QT_RCC_EXECUTABLE}" )
+
+endif()

Build/AtlasLCG/modules/FindROOT.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindROOT.cmake 744728 2016-05-04 07:37:43Z krasznaa $
+# $Id: FindROOT.cmake 775392 2016-09-27 14:46:32Z krasznaa $
 #
 # Find the ROOT libraries, headers and tools.
 # Sets:
@@ -62,8 +62,11 @@ find_path( ROOT_PYTHON_PATH ROOT.py
 
 # Handle the standard find_package arguments:
 include( FindPackageHandleStandardArgs )
-find_package_handle_standard_args( ROOT DEFAULT_MSG ROOT_INCLUDE_DIR
-   ROOT_VERSION_STRING ROOT_LIBRARIES ROOT_BINARY_PATH ROOT_PYTHON_PATH )
+find_package_handle_standard_args( ROOT
+   FOUND_VAR ROOT_FOUND
+   REQUIRED_VARS ROOT_INCLUDE_DIR ROOT_LIBRARIES ROOT_BINARY_PATH
+   ROOT_PYTHON_PATH
+   VERSION_VAR ROOT_VERSION_STRING )
 mark_as_advanced( ROOT_FOUND ROOT_INCLUDE_DIR ROOT_INCLUDE_DIRS
    ROOT_LIBRARIES ROOT_LIBRARY_DIRS ROOT_BINARY_PATH ROOT_PYTHON_PATH )
 

Build/AtlasLCG/modules/FindUUID.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: FindUUID.cmake 718732 2016-01-20 12:30:12Z krasznaa $
+# $Id: FindUUID.cmake 772148 2016-09-07 15:04:09Z krasznaa $
 #
 # - Locate UUID library
 # Defines:
@@ -25,12 +25,23 @@ lcg_external_module( NAME UUID
   LIBRARY_SUFFIXES lib
   COMPULSORY_COMPONENTS uuid )
 
+# On MacOS X the uuid functions are in libSystem.dylib. So no extra library
+# needs to be linked against.
+if( APPLE )
+   set( uuid_extra_dep )
+else()
+   set( uuid_extra_dep UUID_LIBRARIES )
+endif()
+
 # Handle the standard find_package arguments:
 include( FindPackageHandleStandardArgs )
 find_package_handle_standard_args( UUID DEFAULT_MSG UUID_INCLUDE_DIR
-  UUID_LIBRARIES )
+   ${uuid_extra_dep} )
 mark_as_advanced( UUID_FOUND UUID_INCLUDE_DIR UUID_INCLUDE_DIRS
-  UUID_LIBRARIES UUID_LIBRARY_DIRS )
+   UUID_LIBRARIES UUID_LIBRARY_DIRS )
 
 # For SLC6 this is picked up from the system. But for CC7, it will come from
 # LCG. So eventually an RPM dependency will have to be added in a smart way...
+
+# Clean up:
+unset( uuid_extra_dep )

Build/AtlasLCG/modules/Findpyanalysis.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: Findpyanalysis.cmake 723053 2016-02-10 11:00:16Z krasznaa $
+# $Id: Findpyanalysis.cmake 771424 2016-09-02 09:14:08Z elmsheus $
 #
 # Sets:
 #  PYANALYSIS_BINARY_PATH
@@ -22,7 +22,7 @@ find_path( PYANALYSIS_BINARY_PATH isympy
    PATH_SUFFIXES bin PATHS ${PYANALYSIS_ROOT} )
 
 # Find the python path:
-find_path( PYANALYSIS_PYTHON_PATH numpy/__init__.py
+find_path( PYANALYSIS_PYTHON_PATH site.py
    PATH_SUFFIXES lib/python2.7/site-packages
    PATHS ${PYANALYSIS_ROOT} )
 

Build/AtlasLCG/modules/Findpytools.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: Findpytools.cmake 722366 2016-02-08 10:06:10Z krasznaa $
+# $Id: Findpytools.cmake 771318 2016-09-01 14:55:33Z elmsheus $
 #
 # Sets:
 #  PYTOOLS_BINARY_PATH
@@ -22,7 +22,7 @@ find_path( PYTOOLS_BINARY_PATH ipython
    PATH_SUFFIXES bin PATHS ${PYTOOLS_ROOT} )
 
 # Find the python path:
-find_path( PYTOOLS_PYTHON_PATH mock.py
+find_path( PYTOOLS_PYTHON_PATH site.py
    PATH_SUFFIXES lib/python2.7/site-packages
    PATHS ${PYTOOLS_ROOT} )
 

Build/AtlasLCG/modules/Findtcmalloc.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: Findtcmalloc.cmake 718732 2016-01-20 12:30:12Z krasznaa $
+# $Id: Findtcmalloc.cmake 769797 2016-08-24 10:03:31Z krasznaa $
 #
 # - Locate tcmalloc library
 # Defines:
@@ -12,6 +12,7 @@
 #  TCMALLOC_profiler_LIBRARY
 #  TCMALLOC_LIBRARIES
 #  TCMALLOC_LIBRARY_DIRS
+#  TCMALLOC_BINARY_PATH
 #  PPROF_EXECUTABLE
 #
 # Can be steered using TCMALLOC_ROOT.
@@ -40,5 +41,5 @@ mark_as_advanced( TCMALLOC_FOUND TCMALLOC_INCLUDE_DIR TCMALLOC_INCLUDE_DIRS
    TCMALLOC_LIBRARIES TCMALLOC_LIBRARY_DIRS PPROF_EXECUTABLE
    TCMALLOC_BINARY_PATH )
 
-# tcmalloc is picked up from AtlasExternals, so let's not set up an LCG
-# RPM dependency for it.
+# Set up the RPM dependency:
+lcg_need_rpm( gperftools FOUND_NAME TCMALLOC VERSION_NAME GPERFTOOLS )

Build/AtlasLCG/modules/LCGFunctions.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: LCGFunctions.cmake 734807 2016-04-08 10:32:33Z krasznaa $
+# $Id: LCGFunctions.cmake 772148 2016-09-07 15:04:09Z krasznaa $
 #
 # Some helper functions, used by the Find<Bla>.cmake modules of the package.
 #
@@ -181,6 +181,12 @@ function( lcg_need_rpm name )
    # Add the optional argument(s):
    cmake_parse_arguments( ARG "" "FOUND_NAME;VERSION_NAME" "" ${ARGN} )
 
+   # In case no actual LCG release is set up, don't set up any LCG RPM
+   # dependencies either:
+   if( LCG_VERSION EQUAL 0 )
+      return()
+   endif()
+
    # Create the "found name" of the package:
    if( ARG_FOUND_NAME )
       set( nameFound ${ARG_FOUND_NAME} )

Calorimeter/CaloCellCorrection/src/CaloCellNeighborsAverageCorr.cxx

@@ -34,7 +34,10 @@ CaloCellNeighborsAverageCorr::CaloCellNeighborsAverageCorr(
 			     const std::string& type, 
 			     const std::string& name, 
 			     const IInterface* parent)
-  :AthAlgTool(type, name, parent)
+  :AthAlgTool(type, name, parent),
+   m_calo_dd_man(nullptr),
+   m_calo_id(nullptr),
+   m_tile_id(nullptr)
 {
   declareInterface<ICaloCellMakerTool>(this);
   declareProperty("testMode",m_testMode=false,"test mode");

Calorimeter/CaloCellCorrection/src/CaloCellPedestalCorr.cxx

@@ -37,7 +37,10 @@ CaloCellPedestalCorr::CaloCellPedestalCorr(
 			     const std::string& name, 
 			     const IInterface* parent)
   : CaloCellCorrection(type, name, parent),
-   m_caloCoolIdTool("CaloCoolIdTool"),m_caloLumiBCIDTool(""),m_isMC(false)
+    m_caloCoolIdTool("CaloCoolIdTool"),
+    m_cellId(nullptr),
+    m_caloLumiBCIDTool(""),
+    m_isMC(false)
 {
  declareInterface<CaloCellCorrection>(this);
  declareProperty("Luminosity",m_lumi0=0,"Luminosity in 10**33 units");

Calorimeter/CaloClusterCorrection/CMakeLists.txt

@@ -21,13 +21,13 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/xAOD/xAODCaloEvent
                           GaudiKernel
                           LArCalorimeter/LArIdentifier
-                          LArCalorimeter/LArTools
+                          LArCalorimeter/LArCabling
                           PRIVATE
                           AtlasTest/TestTools
                           Calorimeter/CaloDetDescr
                           Calorimeter/CaloGeoHelpers
                           Calorimeter/CaloUtils
-                          Control/DataModel
+                          Control/AthContainers
                           DetectorDescription/GeoModel/GeoModelInterfaces
                           DetectorDescription/Identifier
                           Event/EventKernel

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloClusterCorrection.h

@@ -55,13 +55,13 @@ class CaloClusterCorrection
 
  public:
   // Destructor 
-  virtual ~CaloClusterCorrection();
+  virtual ~CaloClusterCorrection() override;
 
 
   /**
    * @brief Standard initialization method.
    */
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
 
 
   using CaloClusterProcessor::setProperty;
@@ -73,7 +73,7 @@ class CaloClusterCorrection
    * Defined here as required by @c ToolWithConstantsMixin.
    */
   virtual StatusCode setProperty (const std::string& propname,
-                                  const std::string& value);
+                                  const std::string& value) override;
 
   /**
    * @brief Method to set a property value.
@@ -81,7 +81,7 @@ class CaloClusterCorrection
    *
    * Defined here as required by @c ToolWithConstantsMixin.
    */
-  virtual StatusCode setProperty (const Property& p);
+  virtual StatusCode setProperty (const Property& p) override;
 
 
   // modifying CaloCluster object 
@@ -89,17 +89,18 @@ class CaloClusterCorrection
                          CaloSampling::CaloSample sampling,
 			 float em, float etam, float phim, 
 			 float emax, float etamax, float phimax, 
-			 float etas, float phis);
+			 float etas, float phis) const;
 
   // set energy of cluster.  if samplings=true, rescale the energy
   // in each sampling accordingly.  default is to do the rescaling.
   virtual void setenergy(xAOD::CaloCluster* cluster, float energy) const;
 
   // derived class implement the real correction.
-  virtual void makeCorrection(xAOD::CaloCluster*)=0 ;
+  virtual void makeCorrection(const EventContext& ctx,
+                              xAOD::CaloCluster*) const = 0;
 
   using CaloClusterProcessor::execute;
-  StatusCode execute(xAOD::CaloCluster* cluster);
+  StatusCode execute(xAOD::CaloCluster* cluster) override;
 
  protected:
   /**

Calorimeter/CaloClusterCorrection/CaloClusterCorrection/CaloClusterCorrectionCommon.h

@@ -16,6 +16,7 @@
 
 
 #include "CaloClusterCorrection/CaloClusterCorrection.h"
+#include "GaudiKernel/EventContext.h"
 #include <vector>
 class CaloDetDescrManager;
 class CaloDetDescrElement;
@@ -53,25 +54,28 @@ public:
   /**
    * @brief Destructor.
    */
-  ~CaloClusterCorrectionCommon ();
+  virtual ~CaloClusterCorrectionCommon () override;
 
 
   /**
    * @brief Initialization.
    */
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
 
 
   /**
    * @brief Perform the correction.  Called by the tool
+   * @param ctx     The event context.
    * @param cluster The cluster to correct.
    *                It is updated in place.
    */
-  virtual void makeCorrection(xAOD::CaloCluster* cluster);
+  virtual void makeCorrection(const EventContext& ctx,
+                              xAOD::CaloCluster* cluster) const override;
 
 
   /**
    * @brief Virtual function for the correction-specific code.
+   * @param ctx     The event context.
    * @param cluster The cluster to correct.
    *                It is updated in place.
    * @param elt     The detector description element corresponding
@@ -91,7 +95,8 @@ public:
    *                the calorimeter region and sampling encoded.
    *                Otherwise, this is Unknown.
    */
-  virtual void makeTheCorrection (xAOD::CaloCluster* cluster,
+  virtual void makeTheCorrection (const EventContext& ctx,
+                                  xAOD::CaloCluster* cluster,
                                   const CaloDetDescrElement* elt,
                                   float eta,
                                   float adj_eta,
@@ -180,7 +185,7 @@ public:
                const xAOD::CaloCluster* cluster,
                float eta,
                float phi,
-               std::vector<CaloDetDescrElement*>& dummy_elts);
+               const std::vector<std::unique_ptr<const CaloDetDescrElement> >& dummy_elts);
 
 
 private:
@@ -195,7 +200,7 @@ private:
 
   // Hold dummy DD elements we've created to work around DD innermost
   // layer 1 strip problem.
-  std::vector<CaloDetDescrElement*> m_dummy_elts;
+  std::vector<std::unique_ptr<const CaloDetDescrElement> > m_dummy_elts;
 };