Calorimeter/CaloCellCorrection/src/CaloCellNeighborsAverageCorr.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ****************************************************************************************
@@ -31,12 +31,11 @@ CaloCellNeighborsAverageCorr::CaloCellNeighborsAverageCorr(
 			     const std::string& type, 
 			     const std::string& name, 
 			     const IInterface* parent)
-  :AthAlgTool(type, name, parent),
+  :base_class(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");
   declareProperty("skipDeadFeb",    m_skipDeadFeb=true,     "Skip dead LAr Febs (default = true)");
   declareProperty("skipDeadLAr",    m_skipDeadLAr=false,    "Skip all dead LAr cells (default = false)");
@@ -78,7 +77,9 @@ StatusCode CaloCellNeighborsAverageCorr::initialize()
 
 // ============================================================================
 
-StatusCode CaloCellNeighborsAverageCorr::process(CaloCellContainer* theCont)
+StatusCode
+CaloCellNeighborsAverageCorr::process (CaloCellContainer* theCont,
+                                       const EventContext& /*ctx*/) const
 {
   ATH_MSG_VERBOSE ( " in process " );
 

Calorimeter/CaloCellCorrection/src/CaloCellNeighborsAverageCorr.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOCELLCORRECTION_CALOCELLNEIGHBORSAVERAGECORR_H
@@ -17,9 +17,8 @@ class CaloCell_ID;
 class TileID;
 
 //inspiration from http://alxr.usatlas.bnl.gov/lxr-stb3/source/atlas/Calorimeter/CaloRec/CaloRec/CaloCellCopyTool.h#032
-class CaloCellNeighborsAverageCorr :  public AthAlgTool, 
-                                      virtual public ICaloCellMakerTool
-
+class CaloCellNeighborsAverageCorr
+  : public extends<AthAlgTool, ICaloCellMakerTool>
 {
 
 public:
@@ -32,11 +31,12 @@ public:
 
   /** initialize method
   */
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
 
   /** process calo cell collection to apply corrections
   */
-  StatusCode process( CaloCellContainer * theCellContainer);
+  virtual StatusCode process ( CaloCellContainer * theCellContainer,
+                               const EventContext& ctx) const override;
 
 private:
 

Calorimeter/CaloCellCorrection/src/CaloCellPedestalCorr.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ****************************************************************************************
@@ -67,11 +67,7 @@ StatusCode CaloCellPedestalCorr::initialize()
   ATH_MSG_INFO( "CaloCellPedestalCorr initialize() end"  );
   return StatusCode::SUCCESS;
 }
-StatusCode CaloCellPedestalCorr::process( CaloCellContainer * theCellContainer) {
-  //This function is a stopgap solution until all CaloCellCorrector tools are const
-  const EventContext& ctx = Gaudi::Hive::currentContext();
-  return this->process(theCellContainer,ctx);
-}
+
 
 StatusCode CaloCellPedestalCorr::process( CaloCellContainer * theCellContainer, const EventContext& ctx) const {
 

Calorimeter/CaloCellCorrection/src/CaloCellPedestalCorr.h

 //Dear emacs, this is -*-c++-*-
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOCELLCORRECTION_CALOCELLPEDESTALCORR_H
@@ -33,11 +33,8 @@ public:
 
   virtual StatusCode initialize() override;
 
-  StatusCode process( CaloCellContainer * theCellContainer) override;
-
-
   StatusCode process( CaloCellContainer * theCellContainer, 
-		      const EventContext& ctx) const; //override;
+		      const EventContext& ctx) const override;
 
 private:
   // const DataHandle<CondAttrListCollection> m_noiseAttrListColl;

Calorimeter/CaloCnv/CaloJiveXML/CaloJiveXML/CaloMBTSRetriever.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef JIVEXML_CALOMBTSRETRIEVER_H
@@ -13,6 +13,7 @@
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "TileEvent/TileCellContainer.h"
 #include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/TileCondToolTiming.h"
 
 #include "JiveXML/IDataRetriever.h"
 #include "AthenaBaseComps/AthAlgTool.h"
@@ -61,6 +62,12 @@ namespace JiveXML{
       ///The data type that is generated by this retriever
       const std::string m_typeName;
 
+      ToolHandle<TileCondToolTiming> m_tileToolTiming{this,
+          "TileCondToolTiming", "TileCondToolTiming", "Tile timing tool"};
+
+      ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+          "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
       const TileTBID*    m_tileTBID;
 
       ///properties:

Calorimeter/CaloCnv/CaloJiveXML/CaloJiveXML/CaloTileRetriever.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef JIVEXML_CALOTILERETRIEVER_H
@@ -10,6 +10,10 @@
 #include <cstddef>
 #include <map>
 
+#include "TileConditions/TileCondToolTiming.h"
+#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/ITileBadChanTool.h"
+
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "LArCabling/LArCablingService.h"
 
@@ -65,6 +69,15 @@ namespace JiveXML{
       ///The data type that is generated by this retriever
       const std::string m_typeName;
 
+      ToolHandle<TileCondToolTiming> m_tileToolTiming{this,
+          "TileCondToolTiming", "TileCondToolTiming", "Tile timing tool"};
+
+      ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+          "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
+      ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
+          "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
+
       void calcTILELayerSub(Identifier&);
       const CaloIdManager* m_calo_id_man;
       const CaloCell_ID*   m_calocell_id;

Calorimeter/CaloCnv/CaloJiveXML/src/CaloMBTSRetriever.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloJiveXML/CaloMBTSRetriever.h"
@@ -21,8 +21,6 @@
 #include "TileIdentifier/TileTBID.h"
 #include "TileConditions/TileInfo.h"
 #include "TileConditions/TileCablingService.h"
-#include "TileConditions/ITileBadChanTool.h"
-#include "TileConditions/TileCondToolEmscale.h"
 #include "TileCalibBlobObjs/TileCalibUtils.h"
 
 namespace JiveXML {
@@ -56,7 +54,15 @@ namespace JiveXML {
 
   StatusCode CaloMBTSRetriever::initialize() {
 
-    if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Initialising Tool" << endmsg;
+    ATH_MSG_DEBUG( "Initialising Tool" );
+
+
+    //=== get TileCondToolTiming
+    ATH_CHECK( m_tileToolTiming.retrieve() );
+
+    //=== get TileCondToolEmscale
+    ATH_CHECK( m_tileToolEmscale.retrieve() );
+
 
     return StatusCode::SUCCESS;
   }
@@ -121,7 +127,6 @@ namespace JiveXML {
     const TileHWID* tileHWID;
     const TileInfo* tileInfo;
     const TileCablingService* cabling=nullptr;
-    ToolHandle<TileCondToolEmscale> tileToolEmscale("TileCondToolEmscale"); //!< main Tile Calibration tool
     TileRawChannelUnit::UNIT RChUnit = TileRawChannelUnit::ADCcounts;  //!< Unit for TileRawChannels (ADC, pCb, etc.)
     cabling = TileCablingService::getInstance();
     bool offlineRch = false;
@@ -136,9 +141,6 @@ namespace JiveXML {
     if ( detStore()->retrieve(tileInfo, "TileInfo").isFailure() )
       if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "in getMBTSData(), Could not retrieve TileInfo"<< endmsg;
 
-    //=== get TileCondToolEmscale
-    if ( tileToolEmscale.retrieve().isFailure())
-      if (msgLvl(MSG::ERROR)) msg(MSG::ERROR)<< "in getMBTSData(), Could not retrieve " << tileToolEmscale << endmsg;
 
     std::string RchName[7] = {"TileRawChannelOpt2","TileRawChannelOpt","TileRawChannelFixed",
                               "TileRawChannelFitCool","TileRawChannelFit",
@@ -219,9 +221,9 @@ namespace JiveXML {
             amplitude = (*chItr)->amplitude();
             //Change amplitude units to ADC counts
             if (TileRawChannelUnit::ADCcounts < RChUnit && RChUnit < TileRawChannelUnit::OnlineADCcounts) {
-              amplitude /= tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0, TileRawChannelUnit::ADCcounts, RChUnit);
+              amplitude /= m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0, TileRawChannelUnit::ADCcounts, RChUnit);
             } else if (RChUnit > TileRawChannelUnit::OnlineADCcounts) {
-              amplitude = tileToolEmscale->undoOnlCalib(drawerIdx, channel, adc, amplitude, RChUnit);
+              amplitude = m_tileToolEmscale->undoOnlCalib(drawerIdx, channel, adc, amplitude, RChUnit);
             }
 
             theMbtspedestal.insert(std::make_pair( cellid, (*chItr)->pedestal() ) );
@@ -344,14 +346,17 @@ namespace JiveXML {
           int drawer    = tileHWID->drawer(hwid);
           int ros       = tileHWID->ros(hwid);
           int drawerIdx = TileCalibUtils::getDrawerIdx(ros,drawer);
-          float scale = tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
+          float scale = m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
+                                                        TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
           float amp;
 
           if (  cell->energy() >= m_mbtsThreshold ) amp = cell->energy()/scale;
           else amp = 0.0;
           float time = cell->time();
 
-          if ((qual != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) time -= tileInfo->TimeCalib(hwid,0.0);
+          if ((qual != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) {
+            time += m_tileToolTiming->getSignalPhase(drawerIdx, channel, adc);
+          }
 
           cellRawAmplitude.push_back(DataType(amp));
           cellRawTime.push_back(DataType(time));

Calorimeter/CaloCnv/CaloJiveXML/src/CaloTileRetriever.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloJiveXML/CaloTileRetriever.h"
@@ -22,8 +22,6 @@
 #include "TileIdentifier/TileTBID.h"
 #include "TileConditions/TileInfo.h"
 #include "TileConditions/TileCablingService.h"
-#include "TileConditions/ITileBadChanTool.h"
-#include "TileConditions/TileCondToolEmscale.h"
 #include "TileCalibBlobObjs/TileCalibUtils.h"
 
 using Athena::Units::GeV;
@@ -63,7 +61,16 @@ namespace JiveXML {
 
   StatusCode CaloTileRetriever::initialize() {
 
-    if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Initialising Tool" << endmsg;
+    ATH_MSG_DEBUG( "Initialising Tool" );
+
+    //=== get TileCondToolTiming
+    ATH_CHECK( m_tileToolTiming.retrieve() );
+
+    //=== get TileCondToolEmscale
+    ATH_CHECK( m_tileToolEmscale.retrieve() );
+
+    //=== get TileBadChanTool
+    ATH_CHECK( m_tileBadChanTool.retrieve() );
 
     return StatusCode::SUCCESS;
   }
@@ -147,8 +154,6 @@ namespace JiveXML {
     const TileHWID* tileHWID;
     const TileInfo* tileInfo;
     const TileCablingService* cabling=nullptr;
-    ToolHandle<ITileBadChanTool> tileBadChanTool("TileBadChanTool"); //!< Tile Bad Channel tool
-    ToolHandle<TileCondToolEmscale> tileToolEmscale("TileCondToolEmscale"); //!< main Tile Calibration tool
     const TileDigitsContainer *tileDigits = nullptr;
     const TileRawChannelContainer* RawChannelCnt;
     TileRawChannelUnit::UNIT RChUnit = TileRawChannelUnit::ADCcounts;  //!< Unit for TileRawChannels (ADC, pCb, etc.)
@@ -186,16 +191,6 @@ namespace JiveXML {
     if (sc.isFailure())
         if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "in getCaloTileData(), Could not retrieve TileInfo"<< endmsg;
 
-    //=== get TileBadChanTool
-    sc = tileBadChanTool.retrieve();
-    if ( sc.isFailure() )
-        if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "in getCaloTileData(), Could not retrieve " << tileBadChanTool << endmsg;
-
-    //=== get TileCondToolEmscale
-    sc = tileToolEmscale.retrieve();
-    if (sc.isFailure())
-      if (msgLvl(MSG::ERROR)) msg(MSG::ERROR) << "in getCaloTileData(), Could not retrieve " << tileToolEmscale << endmsg;
-
 
     if (m_doTileDigit) {
 
@@ -264,15 +259,15 @@ namespace JiveXML {
           int ros       = tileHWID->ros(hwid);
           int PMT = abs( cabling->channel2hole(ros,channel) );
           int drawerIdx = TileCalibUtils::getDrawerIdx(ros,drawer);
-          uint32_t tileAdcStatus = tileBadChanTool->encodeStatus(tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
+          uint32_t tileAdcStatus = m_tileBadChanTool->encodeStatus(m_tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
 
           amplitude = (*chItr)->amplitude();
           //Change amplitude units to ADC counts
           if (TileRawChannelUnit::ADCcounts < RChUnit && RChUnit < TileRawChannelUnit::OnlineADCcounts) {
-            amplitude /= tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0, TileRawChannelUnit::ADCcounts, RChUnit);
+            amplitude /= m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0, TileRawChannelUnit::ADCcounts, RChUnit);
           } else if (RChUnit > TileRawChannelUnit::OnlineADCcounts) {
             // Should never get here due to offlineRch test above.
-            //amplitude = tileToolEmscale->undoOnlCalib(drawerIdx, channel, adc, amplitude, RChUnit);
+            //amplitude = m_tileToolEmscale->undoOnlCalib(drawerIdx, channel, adc, amplitude, RChUnit);
             std::abort();
           }
 
@@ -463,15 +458,17 @@ namespace JiveXML {
             int ros       = tileHWID->ros(hwid);
             int PMT = abs( cabling->channel2hole(ros,channel) );
             int drawerIdx = TileCalibUtils::getDrawerIdx(ros,drawer);
-            float scale = tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
+            float scale = m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
                                                           TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
             float amp = theTileCell->ene1() / scale;
             float time = theTileCell->time1();
 
             int qbit = (theTileCell->qbit1() & TileCell::MASK_TIME);
-            if ((qual1 != 0 || qbit != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) time -= tileInfo->TimeCalib(hwid,0.0);
+            if ((qual1 != 0 || qbit != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) {
+              time += m_tileToolTiming->getSignalPhase(drawerIdx, channel, adc);
+            }
 
-            uint32_t tileAdcStatus = tileBadChanTool->encodeStatus(tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
+            uint32_t tileAdcStatus = m_tileBadChanTool->encodeStatus(m_tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
             if (badch1) tileAdcStatus += 10;
 
             pmt1RawAmplitude.push_back(DataType(amp));
@@ -496,15 +493,17 @@ namespace JiveXML {
             int ros       = tileHWID->ros(hwid);
             int PMT = abs( cabling->channel2hole(ros,channel) );
             int drawerIdx = TileCalibUtils::getDrawerIdx(ros,drawer);
-            float scale = tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
-                                                            TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
+            float scale = m_tileToolEmscale->channelCalib(drawerIdx, channel, adc, 1.0,
+                                                          TileRawChannelUnit::ADCcounts, TileRawChannelUnit::MegaElectronVolts);
             float amp = theTileCell->ene2() / scale;
             float time = theTileCell->time2();
 
             int qbit = (theTileCell->qbit2() & TileCell::MASK_TIME);
-            if ((qual2 != 0 || qbit != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) time -= tileInfo->TimeCalib(hwid,0.0);
+            if ((qual2 != 0 || qbit != 0 || amp != 0.0) && (fabs(time) < maxTime && time != 0.0)) {
+              time += m_tileToolTiming->getSignalPhase(drawerIdx, channel, adc);
+            }
 
-            uint32_t tileAdcStatus = tileBadChanTool->encodeStatus(tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
+            uint32_t tileAdcStatus = m_tileBadChanTool->encodeStatus(m_tileBadChanTool->getAdcStatus(drawerIdx,channel,adc));
             if (badch2) tileAdcStatus += 10;
 
             pmt2RawAmplitude.push_back(DataType(amp));

Calorimeter/CaloInterface/CaloInterface/ICaloCellMakerTool.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOINTERFACE_ICALOCELLMAKERTOOL_H
 #define CALOINTERFACE_ICALOCELLMAKERTOOL_H
 
 
-class CaloCellContainer ;
+class CaloCellContainer;
+class EventContext;
 
 // Includes for Gaudi
 #include "GaudiKernel/StatusCode.h"
 #include "GaudiKernel/IAlgTool.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 
 
-static const InterfaceID IID_ICaloCellMakerTool("ICaloCellMakerTool", 1 , 0);
-
-class ICaloCellMakerTool: virtual public IAlgTool {
-
+class ICaloCellMakerTool
+  : virtual public IAlgTool
+{
 public:
-  // update theCellContainer, fill more cells  for example
-  virtual StatusCode process( CaloCellContainer * theCellContainer)=0 ;
+  DeclareInterfaceID (ICaloCellMakerTool, 1, 0);
 
-  static const InterfaceID& interfaceID() { return IID_ICaloCellMakerTool;}
+  // FIXME: Remove default value from second arg.
+  virtual StatusCode process ( CaloCellContainer* theCellContainer,
+                               const EventContext& ctx = Gaudi::Hive::currentContext() ) const = 0;
 };
 
 #endif 

Calorimeter/CaloInterface/CaloInterface/ICaloConstCellMakerTool.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -22,6 +22,7 @@
 
 
 class CaloConstCellContainer;
+class EventContext;
 
 
 /**
@@ -37,8 +38,9 @@ class ICaloConstCellMakerTool
 public:
   DeclareInterfaceID (ICaloConstCellMakerTool, 1, 0);
 
-  // update theCellContainer, fill more cells for example
-  virtual StatusCode process( CaloConstCellContainer* theCellContainer) = 0;
+  // FIXME: Remove default value from second arg.
+  virtual StatusCode process ( CaloConstCellContainer* theCellContainer,
+                               const EventContext& ctx = Gaudi::Hive::currentContext() ) const = 0;
 };
 
 

Calorimeter/CaloMonitoring/CMakeLists.txt

@@ -33,7 +33,8 @@ atlas_depends_on_subdirs(
    Event/xAOD/xAODEventInfo
    LArCalorimeter/LArRecEvent
    Reconstruction/Jet/JetEvent
-   Reconstruction/RecBackground/RecBackgroundEvent )
+   Reconstruction/RecBackground/RecBackgroundEvent
+   Trigger/TriggerAnalysis/TrigAnalysisInterfaces )
 
 # External dependencies:
 find_package( ROOT COMPONENTS Core Hist MathCore Gpad )

Calorimeter/CaloRec/share/CaloCellFastCopyTool_test.ref

@@ -4,12 +4,12 @@ Initializing Gaudi ApplicationMgr using job opts ./CaloCellFastCopyTool_test_gen
 JobOptionsSvc        INFO Job options successfully read in from ./CaloCellFastCopyTool_test_generated.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Sun Jul  8 09:27:22 2018
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r3)
+                                          running on spar0102.usatlas.bnl.gov on Sat Sep  8 22:10:54 2018
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : StoreGate
 ApplicationMgr       INFO Application Manager Configured successfully
-ClassIDSvc           INFO  getRegistryEntries: read 7122 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 7296 CLIDRegistry entries for module ALL
 StoreGateSvc        DEBUG Property update for OutputLevel : new value = 2
 StoreGateSvc        DEBUG Service base class initialized successfully
 StoreGateSvc        DEBUG trying to create store SGImplSvc/StoreGateSvc_Impl
@@ -22,131 +22,131 @@ ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
 test1
-ClassIDSvc           INFO  getRegistryEntries: read 372 CLIDRegistry entries for module ALL
-StoreGateSvc_Impl   DEBUG Recorded object @0x26c3bd0 with key AllCalo of type CaloCellContainer(CLID 2802)
- in DataObject @0x26b6e60
+StoreGateSvc_Impl   DEBUG Recorded object @0x1ec8870 with key AllCalo of type CaloCellContainer(CLID 2802)
+ in DataObject @0x1ea6fe0
  object not modifiable when retrieved
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
+ClassIDSvc           INFO  getRegistryEntries: read 372 CLIDRegistry entries for module ALL
 CopyToolTest[1]     DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[1]      INFO In initialize 
 CopyToolTest[1]     DEBUG Accepted calo samplings: 17; 
 CopyToolTest[1]     DEBUG Accepted sub calos: 3; 
 CopyToolTest[1]     DEBUG CaloCell hash max: 187652
 CopyToolTest[1]     DEBUG Number of accepted hashes: 0
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[1]      INFO In initialize 
 CopyToolTest[1]     DEBUG Accepted calo samplings: 17; 
 CopyToolTest[1]     DEBUG Accepted sub calos: 3; 
 CopyToolTest[1]     DEBUG CaloCell hash max: 187652
 CopyToolTest[1]     DEBUG Number of accepted hashes: 512
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[3]     DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[3]      INFO In initialize 
 CopyToolTest[3]     DEBUG Accepted calo samplings: 17; 
 CopyToolTest[3]     DEBUG Accepted sub calos: 3; 
 CopyToolTest[3]     DEBUG CaloCell hash max: 187652
 CopyToolTest[3]     DEBUG Number of accepted hashes: 0
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[4]     DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[4]      INFO In initialize 
 CopyToolTest[4]     DEBUG Accepted calo samplings: 17; 
 CopyToolTest[4]     DEBUG Accepted sub calos: 3; 
 CopyToolTest[4]     DEBUG CaloCell hash max: 187652
 CopyToolTest[4]     DEBUG Number of accepted hashes: 512
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[13]    DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[13]     INFO In initialize 
 CopyToolTest[13]    DEBUG Accepted calo samplings: 17; 
 CopyToolTest[13]    DEBUG Accepted sub calos: 3; 
 CopyToolTest[13]    DEBUG CaloCell hash max: 187652
 CopyToolTest[13]    DEBUG Number of accepted hashes: 0
-CopyToolTest[13]    ERROR ../src/CaloCellFastCopyTool.cxx:333 (StatusCode CaloCellFastCopyTool::dispatchCopy(const CaloCellContainer*, CaloCellContainer*) const): code 0: Can't copy to a non-const view container.
-CopyToolTest[13]    FATAL ../src/CaloCellFastCopyTool.cxx:116 (StatusCode CaloCellFastCopyTool::process(CaloCellContainer*)): code 0: dispatchCopy (srcCont.cptr(), theCont)
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+CopyToolTest[13]    ERROR /usatlas/u/snyder/usatlasdata/atlas-master-mt/Calorimeter/CaloRec/src/CaloCellFastCopyTool.cxx:335 (StatusCode CaloCellFastCopyTool::dispatchCopy(const CaloCellContainer*, CaloCellContainer*) const): code 0: Can't copy to a non-const view container.
+CopyToolTest[13]    FATAL /usatlas/u/snyder/usatlasdata/atlas-master-mt/Calorimeter/CaloRec/src/CaloCellFastCopyTool.cxx:117 (StatusCode CaloCellFastCopyTool::process(CaloCellContainer*, const EventContext&) const): code 0: dispatchCopy (srcCont.cptr(), theCont)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[14]    DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[14]     INFO In initialize 
 CopyToolTest[14]    DEBUG Accepted calo samplings: 17; 
 CopyToolTest[14]    DEBUG Accepted sub calos: 3; 
 CopyToolTest[14]    DEBUG CaloCell hash max: 187652
 CopyToolTest[14]    DEBUG Number of accepted hashes: 512
-CopyToolTest[14]    ERROR ../src/CaloCellFastCopyTool.cxx:322 (StatusCode CaloCellFastCopyTool::dispatchCopy(const CaloCellContainer*, CaloCellContainer*) const): code 0: Can't copy to a non-const view container.
-CopyToolTest[14]    FATAL ../src/CaloCellFastCopyTool.cxx:116 (StatusCode CaloCellFastCopyTool::process(CaloCellContainer*)): code 0: dispatchCopy (srcCont.cptr(), theCont)
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+CopyToolTest[14]    ERROR /usatlas/u/snyder/usatlasdata/atlas-master-mt/Calorimeter/CaloRec/src/CaloCellFastCopyTool.cxx:324 (StatusCode CaloCellFastCopyTool::dispatchCopy(const CaloCellContainer*, CaloCellContainer*) const): code 0: Can't copy to a non-const view container.
+CopyToolTest[14]    FATAL /usatlas/u/snyder/usatlasdata/atlas-master-mt/Calorimeter/CaloRec/src/CaloCellFastCopyTool.cxx:117 (StatusCode CaloCellFastCopyTool::process(CaloCellContainer*, const EventContext&) const): code 0: dispatchCopy (srcCont.cptr(), theCont)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[15]    DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[15]     INFO In initialize 
 CopyToolTest[15]    DEBUG Accepted calo samplings: 17; 
 CopyToolTest[15]    DEBUG Accepted sub calos: 3; 
 CopyToolTest[15]    DEBUG CaloCell hash max: 187652
 CopyToolTest[15]    DEBUG Number of accepted hashes: 0
-CopyToolTest[15]    ERROR ../src/CaloCellFastCopyTool.cxx:333 (StatusCode CaloCellFastCopyTool::dispatchCopy(const CaloCellContainer*, CaloCellContainer*) const): code 0: Can't copy to a non-const view container.
-CopyToolTest[15]    FATAL ../src/CaloCellFastCopyTool.cxx:116 (StatusCode CaloCellFastCopyTool::process(CaloCellContainer*)): code 0: dispatchCopy (srcCont.cptr(), theCont)
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+CopyToolTest[15]    ERROR /usatlas/u/snyder/usatlasdata/atlas-master-mt/Calorimeter/CaloRec/src/CaloCellFastCopyTool.cxx:335 (StatusCode CaloCellFastCopyTool::dispatchCopy(const CaloCellContainer*, CaloCellContainer*) const): code 0: Can't copy to a non-const view container.
+CopyToolTest[15]    FATAL /usatlas/u/snyder/usatlasdata/atlas-master-mt/Calorimeter/CaloRec/src/CaloCellFastCopyTool.cxx:117 (StatusCode CaloCellFastCopyTool::process(CaloCellContainer*, const EventContext&) const): code 0: dispatchCopy (srcCont.cptr(), theCont)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[16]    DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[16]     INFO In initialize 
 CopyToolTest[16]    DEBUG Accepted calo samplings: 17; 
 CopyToolTest[16]    DEBUG Accepted sub calos: 3; 
 CopyToolTest[16]    DEBUG CaloCell hash max: 187652
 CopyToolTest[16]    DEBUG Number of accepted hashes: 512
-CopyToolTest[16]    ERROR ../src/CaloCellFastCopyTool.cxx:322 (StatusCode CaloCellFastCopyTool::dispatchCopy(const CaloCellContainer*, CaloCellContainer*) const): code 0: Can't copy to a non-const view container.
-CopyToolTest[16]    FATAL ../src/CaloCellFastCopyTool.cxx:116 (StatusCode CaloCellFastCopyTool::process(CaloCellContainer*)): code 0: dispatchCopy (srcCont.cptr(), theCont)
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+CopyToolTest[16]    ERROR /usatlas/u/snyder/usatlasdata/atlas-master-mt/Calorimeter/CaloRec/src/CaloCellFastCopyTool.cxx:324 (StatusCode CaloCellFastCopyTool::dispatchCopy(const CaloCellContainer*, CaloCellContainer*) const): code 0: Can't copy to a non-const view container.
+CopyToolTest[16]    FATAL /usatlas/u/snyder/usatlasdata/atlas-master-mt/Calorimeter/CaloRec/src/CaloCellFastCopyTool.cxx:117 (StatusCode CaloCellFastCopyTool::process(CaloCellContainer*, const EventContext&) const): code 0: dispatchCopy (srcCont.cptr(), theCont)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[5]     DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[5]      INFO In initialize 
 CopyToolTest[5]     DEBUG Accepted calo samplings: 17; 
 CopyToolTest[5]     DEBUG Accepted sub calos: 3; 
 CopyToolTest[5]     DEBUG CaloCell hash max: 187652
 CopyToolTest[5]     DEBUG Number of accepted hashes: 0
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[6]     DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[6]      INFO In initialize 
 CopyToolTest[6]     DEBUG Accepted calo samplings: 17; 
 CopyToolTest[6]     DEBUG Accepted sub calos: 3; 
 CopyToolTest[6]     DEBUG CaloCell hash max: 187652
 CopyToolTest[6]     DEBUG Number of accepted hashes: 512
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[7]     DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[7]      INFO In initialize 
 CopyToolTest[7]     DEBUG Accepted calo samplings: 17; 
 CopyToolTest[7]     DEBUG Accepted sub calos: 3; 
 CopyToolTest[7]     DEBUG CaloCell hash max: 187652
 CopyToolTest[7]     DEBUG Number of accepted hashes: 0
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[8]     DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[8]      INFO In initialize 
 CopyToolTest[8]     DEBUG Accepted calo samplings: 17; 
 CopyToolTest[8]     DEBUG Accepted sub calos: 3; 
 CopyToolTest[8]     DEBUG CaloCell hash max: 187652
 CopyToolTest[8]     DEBUG Number of accepted hashes: 512
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[9]     DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[9]      INFO In initialize 
 CopyToolTest[9]     DEBUG Accepted calo samplings: 17; 
 CopyToolTest[9]     DEBUG Accepted sub calos: 3; 
 CopyToolTest[9]     DEBUG CaloCell hash max: 187652
 CopyToolTest[9]     DEBUG Number of accepted hashes: 0
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[10]    DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[10]     INFO In initialize 
 CopyToolTest[10]    DEBUG Accepted calo samplings: 17; 
 CopyToolTest[10]    DEBUG Accepted sub calos: 3; 
 CopyToolTest[10]    DEBUG CaloCell hash max: 187652
 CopyToolTest[10]    DEBUG Number of accepted hashes: 512
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[11]    DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[11]     INFO In initialize 
 CopyToolTest[11]    DEBUG Accepted calo samplings: 17; 
 CopyToolTest[11]    DEBUG Accepted sub calos: 3; 
 CopyToolTest[11]    DEBUG CaloCell hash max: 187652
 CopyToolTest[11]    DEBUG Number of accepted hashes: 0
-StoreGateSvc_Impl   DEBUG Retrieved const handle to object AllCalo  of type CaloCellContainer(CLID 2802)
+StoreGateSvc_Impl   DEBUG Retrieved const pointer to object AllCalo  of type CaloCellContainer(CLID 2802)
 CopyToolTest[12]    DEBUG Property update for OutputLevel : new value = 1
 CopyToolTest[12]     INFO In initialize 
 CopyToolTest[12]    DEBUG Accepted calo samplings: 17; 
 CopyToolTest[12]    DEBUG Accepted sub calos: 3; 
 CopyToolTest[12]    DEBUG CaloCell hash max: 187652
 CopyToolTest[12]    DEBUG Number of accepted hashes: 512
-StoreGateSvc_Impl   DEBUG Recorded object @0x26ea280 with key AllCalloFull of type CaloCellContainer(CLID 2802)
- in DataObject @0x4debd90
+StoreGateSvc_Impl   DEBUG Recorded object @0x1ecc0c0 with key AllCalloFull of type CaloCellContainer(CLID 2802)
+ in DataObject @0x45cb870
  object not modifiable when retrieved
 CopyToolTest[9]      INFO In initialize 
 CopyToolTest[9]     DEBUG Accepted calo samplings: 17; 
@@ -159,9 +159,9 @@ CopyToolTest[9]     DEBUG Accepted sub calos: 3;
 CopyToolTest[9]     DEBUG CaloCell hash max: 187652
 CopyToolTest[9]     DEBUG Number of accepted hashes: 0
 StoreGateSvc_Impl WARNING  setupProxy:: error setting up proxy for key AllCalloFull and clid 2802
- Pre-existing valid DataProxy @0x2761d30 found in Store for key AllCalloFull with clid 2802
-StoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x4df2780
- recorded with key AllCalloFull of type CaloCellContainer (CLID 2802) in DataObject @0x7325850
+ Pre-existing valid DataProxy @0x45cb940 found in Store for key AllCalloFull with clid 2802
+StoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x45cbad0
+ recorded with key AllCalloFull of type CaloCellContainer (CLID 2802) in DataObject @0x6b05390
 CopyToolTest[10]     INFO In initialize 
 CopyToolTest[10]    DEBUG Accepted calo samplings: 17; 
 CopyToolTest[10]    DEBUG Accepted sub calos: 3; 

Calorimeter/CaloRec/src/CaloCellContainerCheckerTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /********************************************************************
@@ -56,16 +56,18 @@ StatusCode CaloCellContainerCheckerTool::initialize() {
 
 
 StatusCode
-CaloCellContainerCheckerTool::process (CaloCellContainer* theCont)
+CaloCellContainerCheckerTool::process (CaloCellContainer* theCont,
+                                       const EventContext& ctx) const
 {
-  return doProcess (theCont, Gaudi::Hive::currentContext());
+  return doProcess (theCont, ctx);
 }
 
 
 StatusCode
-CaloCellContainerCheckerTool::process (CaloConstCellContainer* theCont)
+CaloCellContainerCheckerTool::process (CaloConstCellContainer* theCont,
+                                       const EventContext& ctx) const
 {
-  return doProcess (theCont->asDataVector(), Gaudi::Hive::currentContext());
+  return doProcess (theCont->asDataVector(), ctx);
 }
 
 

Calorimeter/CaloRec/src/CaloCellContainerCheckerTool.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //Dear emacs, this is -*-c++-*-
@@ -23,8 +23,10 @@ public:
 
   virtual StatusCode initialize() override; 
 
-  virtual StatusCode process (CaloCellContainer* theCellContainer) override;
-  virtual StatusCode process (CaloConstCellContainer* theCellContainer) override;
+  virtual StatusCode process (CaloCellContainer* theCellContainer,
+                              const EventContext& ctx) const override;
+  virtual StatusCode process (CaloConstCellContainer* theCellContainer,
+                              const EventContext& ctx) const override;
 
  private:
   StatusCode doProcess (const CaloCellContainer* theCellContainer,

Calorimeter/CaloRec/src/CaloCellContainerCorrectorTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /********************************************************************
@@ -18,7 +18,6 @@ PURPOSE:  Apply cell correction to CaloCellContainer
 #include "CaloEvent/CaloCellContainer.h"
 #include "CaloEvent/CaloCell.h"
 #include "CaloIdentifier/CaloCell_ID.h"
-#include "GaudiKernel/ThreadLocalContext.h"
 
 
 /////////////////////////////////////////////////////////////////////
@@ -29,10 +28,9 @@ CaloCellContainerCorrectorTool::CaloCellContainerCorrectorTool(
 			     const std::string& type, 
 			     const std::string& name, 
 			     const IInterface* parent)
-  :AthAlgTool(type, name, parent),
+  :base_class(type, name, parent),
    m_caloSelection(false)
 {
-  declareInterface<ICaloCellMakerTool>(this); 
   declareProperty("CaloNums",m_caloNums);
   declareProperty("CellCorrectionToolNames",m_cellCorrectionTools);
   m_caloNums.clear();
@@ -87,14 +85,16 @@ StatusCode CaloCellContainerCorrectorTool::initialize() {
 
 }
 
-StatusCode CaloCellContainerCorrectorTool::process(CaloCellContainer * theCont )
+StatusCode
+CaloCellContainerCorrectorTool::process (CaloCellContainer* theCont,
+                                         const EventContext& ctx) const
 {
   if (!m_caloSelection) {
     // no selection mode (faster)
     CaloCellContainer::iterator itrCellBeg=theCont->begin();
     CaloCellContainer::iterator itrCellEnd=theCont->end();
     
-    StatusCode sc = processOnCellIterators(itrCellBeg, itrCellEnd );
+    StatusCode sc = processOnCellIterators(itrCellBeg, itrCellEnd, ctx );
     if (sc.isFailure()) 
       msg(MSG::WARNING) << "Failure from processOnCellIterators" << endmsg ;
   }else {
@@ -113,7 +113,7 @@ StatusCode CaloCellContainerCorrectorTool::process(CaloCellContainer * theCont )
 	    << *itrCalo << endmsg ;
       } else 
       {
-	StatusCode sc=processOnCellIterators(itrCellBeg, itrCellEnd );
+	StatusCode sc=processOnCellIterators(itrCellBeg, itrCellEnd, ctx );
 	if (sc.isFailure()) 
 	  msg(MSG::WARNING) << "Failure from processOnCellIterators for calo "
 	      << static_cast<int> (caloNum)
@@ -131,10 +131,12 @@ StatusCode CaloCellContainerCorrectorTool::process(CaloCellContainer * theCont )
   return StatusCode::SUCCESS ;
 }
 
-StatusCode CaloCellContainerCorrectorTool::processOnCellIterators(const CaloCellContainer::iterator &  itrCellBeg, const CaloCellContainer::iterator & itrCellEnd )
-{
-  const EventContext& ctx = Gaudi::Hive::currentContext();
 
+StatusCode
+CaloCellContainerCorrectorTool::processOnCellIterators(const CaloCellContainer::iterator &  itrCellBeg,
+                                                       const CaloCellContainer::iterator & itrCellEnd,
+                                                       const EventContext& ctx) const
+{
   // not clear what s the best way to do the loop
   CaloCellContainer::iterator itrCell;
 

Calorimeter/CaloRec/src/CaloCellContainerCorrectorTool.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOREC_CALOCELLCONTAINERCORRECTORTOOL_H
@@ -13,9 +13,8 @@ class StoreGateSvc;
 
 #include "GaudiKernel/ToolHandle.h"
 
-class CaloCellContainerCorrectorTool: public AthAlgTool,
-	             virtual public ICaloCellMakerTool 
-
+class CaloCellContainerCorrectorTool
+  : public extends<AthAlgTool, ICaloCellMakerTool>
 {
 public:    
   CaloCellContainerCorrectorTool(const std::string& type, 
@@ -25,9 +24,10 @@ public:
   typedef ToolHandleArray<CaloCellCorrection> ::iterator 
     CellCorrectionToolIterator;   
 
-  virtual StatusCode initialize() ; 
+  virtual StatusCode initialize() override;
   // update theCellContainer
-  virtual StatusCode process( CaloCellContainer * theCellContainer) ;
+  virtual StatusCode process ( CaloCellContainer* theCellContainer,
+                               const EventContext& ctx ) const override;
 
 
  private:
@@ -40,7 +40,9 @@ public:
 
   bool m_caloSelection ;
 
-  StatusCode processOnCellIterators(const CaloCellContainer::iterator  &  itrCellBeg, const CaloCellContainer::iterator & itrCellEnd );
+  StatusCode processOnCellIterators(const CaloCellContainer::iterator  &  itrCellBeg,
+                                    const CaloCellContainer::iterator & itrCellEnd,
+                                    const EventContext& ctx) const;
   
 
 };

Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /********************************************************************
@@ -38,11 +38,9 @@ CaloCellContainerFinalizerTool::CaloCellContainerFinalizerTool(
 			     const std::string& type, 
 			     const std::string& name, 
 			     const IInterface* parent)
-  :AthAlgTool(type, name, parent),
-   m_theCaloCCIDM(nullptr)
+  :base_class (type, name, parent),
+   m_theCaloCCIDM (nullptr)
 {
-  declareInterface<ICaloCellMakerTool>(this); 
-  declareInterface<ICaloConstCellMakerTool>(this); 
 }
 
 
@@ -66,7 +64,7 @@ StatusCode CaloCellContainerFinalizerTool::initialize()
 }
 
 template <class CONTAINER>
-StatusCode CaloCellContainerFinalizerTool::doProcess(CONTAINER* theCont )
+StatusCode CaloCellContainerFinalizerTool::doProcess(CONTAINER* theCont ) const
 {
 
   const unsigned int hashMax=m_theCaloCCIDM->calo_cell_hash_max();
@@ -147,7 +145,8 @@ StatusCode CaloCellContainerFinalizerTool::doProcess(CONTAINER* theCont )
 
 
 StatusCode
-CaloCellContainerFinalizerTool::process(CaloCellContainer * theCont )
+CaloCellContainerFinalizerTool::process (CaloCellContainer * theCont,
+                                         const EventContext& /*ctx*/) const
 {
   CHECK( doProcess (theCont) );
   return StatusCode::SUCCESS;
@@ -155,7 +154,8 @@ CaloCellContainerFinalizerTool::process(CaloCellContainer * theCont )
 
 
 StatusCode
-CaloCellContainerFinalizerTool::process(CaloConstCellContainer * theCont )
+CaloCellContainerFinalizerTool::process (CaloConstCellContainer * theCont,
+                                         const EventContext& /*ctx*/) const
 {
   // Container will automatically be locked when recorded.
   return doProcess (theCont);

Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -16,9 +16,7 @@
 class CaloCell_ID;
 
 class CaloCellContainerFinalizerTool
-  : public AthAlgTool,
-    virtual public ICaloCellMakerTool,
-    virtual public ICaloConstCellMakerTool
+  : public extends<AthAlgTool, ICaloCellMakerTool, ICaloConstCellMakerTool>
 {
 public:    
   CaloCellContainerFinalizerTool(const std::string& type, 
@@ -29,12 +27,14 @@ public:
   virtual StatusCode initialize() override; 
 
   // update theCellContainer
-  virtual StatusCode process(CaloCellContainer     * theCellContainer) override;
-  virtual StatusCode process(CaloConstCellContainer* theCellContainer) override;
+  virtual StatusCode process (CaloCellContainer* theCellContainer,
+                              const EventContext& ctx) const override;
+  virtual StatusCode process (CaloConstCellContainer* theCellContainer,
+                              const EventContext& ctx) const  override;
 
 private:
   template <class CONTAINER>
-  StatusCode doProcess (CONTAINER* theCellContainer);
+  StatusCode doProcess (CONTAINER* theCellContainer) const;
 
   const CaloCell_ID* m_theCaloCCIDM;
 };

Calorimeter/CaloRec/src/CaloCellContainerFromClusterTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /********************************************************************
@@ -144,9 +144,10 @@ StatusCode CaloCellContainerFromClusterTool::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode CaloCellContainerFromClusterTool::process(CaloConstCellContainer* theCont) {
-  const EventContext& ctx = Gaudi::Hive::currentContext();
-
+StatusCode
+CaloCellContainerFromClusterTool::process (CaloConstCellContainer* theCont,
+                                           const EventContext& ctx) const
+{
   unsigned nCells=0;
   //Build bitmap to keep track which cells have been added to reducedCellContainer;
   std::bitset<200000> addedCellsMap;

Calorimeter/CaloRec/src/CaloCellContainerFromClusterTool.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOREC_CALOCELLCONTAINERFROMCLUSTERTOOL_H
@@ -26,7 +26,8 @@ class CaloCellContainerFromClusterTool
     virtual StatusCode initialize() override;
 
     // update theCellContainer
-    virtual StatusCode process(CaloConstCellContainer* theCellContainer) override;
+    virtual StatusCode process (CaloConstCellContainer* theCellContainer,
+                                const EventContext& ctx) const override;
 
   private: