diff --git a/Simulation/FastShower/FastCaloSim/CMakeLists.txt b/Simulation/FastShower/FastCaloSim/CMakeLists.txt
index e8da8b3bd1a93648232f65afbceda3ace80ad106..7ab19540d1346782bf05dcda682e10c644ca0d00 100644
--- a/Simulation/FastShower/FastCaloSim/CMakeLists.txt
+++ b/Simulation/FastShower/FastCaloSim/CMakeLists.txt
@@ -27,7 +27,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Generators/GeneratorObjects
                           Simulation/FastShower/FastCaloSimAthenaPool
                           PRIVATE
-                          Calorimeter/CaloTrackingGeometry
                           Control/AthAllocators
                           Database/AthenaPOOL/AthenaPoolUtilities
                           DetectorDescription/AtlasDetDescr
diff --git a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
index 5a19792348b095391d1ecc82ba956366cba4668f..96dc4db01acbbeac3e6e6ed1a1193acbea9038bd 100755
--- a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
+++ b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
@@ -57,7 +57,6 @@ namespace Trk {
   class TrackingVolume;
 }
 
-class ICaloSurfaceHelper;
 class ICaloCoordinateTool;
 class CaloDepthTool;
 class ParticleEnergyParametrization;
@@ -160,7 +159,6 @@ private:
   /** The Extrapolator setup */
   ToolHandle<Trk::ITimedExtrapolator>   m_extrapolator; //public tool
 
-  ToolHandle<ICaloSurfaceHelper>   m_caloSurfaceHelper; //public tool
   ToolHandle<ICaloCoordinateTool>  m_calo_tb_coord; //public tool
 
   bool                           m_jo_interpolate{false}; //ATA: make marjorie's iterpolation optional
diff --git a/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactory.py b/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactory.py
index 5fb01f9e356b5bbc0dae7a600a532a271ac6e05a..3f8c6f7015c018abe270f802eff1d648e4937bb5 100644
--- a/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactory.py
+++ b/Simulation/FastShower/FastCaloSim/python/FastCaloSimFactory.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.Constants import *
 from RecExConfig.Configured import Configured
@@ -32,16 +32,10 @@ def FastCaloSimFactory(name="FastCaloSimFactory", **kwargs):
     #theFastShowerCellBuilderTool.Extrapolator=timedExtrapolator
     mlog.info("configure TimedExtrapolator finished")
 
-    from CaloTrackingGeometry.CaloTrackingGeometryConf import CaloSurfaceHelper
-    caloSurfaceHelper = CaloSurfaceHelper()
-    ToolSvc+=caloSurfaceHelper
-    #theFastShowerCellBuilderTool.CaloSurfaceHelper=caloSurfaceHelper  
-
     from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags 
     #theFastShowerCellBuilderTool.CaloEntrance = TrkDetFlags.InDetContainerName()
 
     kwargs.setdefault("CaloEntrance", TrkDetFlags.InDetContainerName())
-    kwargs.setdefault("CaloSurfaceHelper", caloSurfaceHelper)
     kwargs.setdefault("Extrapolator", timedExtrapolator)
     
     from FastCaloSim.FastCaloSimConf import FastShowerCellBuilderTool
diff --git a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref
index 287f1ae08c5a200a12875efb5011c388fa755e4d..63971ea45b88d27facea2c9e931cc7b41a48a033 100644
--- a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref
+++ b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref
@@ -1,15 +1,16 @@
-Thu Jan  3 00:21:53 EST 2019
+Thu May  9 10:08:41 EDT 2019
+Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [?-21.0.0] [i686-slc5-gcc43-dbg] [?/?] -- built on [?]
+Py:Athena            INFO using release [WorkDir-22.0.2] [x86_64-centos7-gcc8-dbg] [atlas-master-acas-b/7c291c9d8e9] -- built on [2019-05-09T0946]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "FastCaloSim/FastShowerCellBuilderTool_test.py"
-SetGeometryVersion.py obtained major release version 21
+SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 4749 configurables from 2 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5474 configurables from 12 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version  sss-rel_0
+EventInfoMgtInit: Got release version  Athena-22.0.2
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
 Py:Athena            INFO including file "TileConditions/TileConditions_jobOptions.py"
 Py:TileInfoConf.     INFO Adding TileCablingSvc to ServiceMgr
@@ -22,7 +23,7 @@ Py:TileInfoConf.     INFO Changing default TileCondToolNoiseSample configuration
 Py:TileInfoConf.     INFO Changing default TileCondToolTiming configuration to COOL source
 Py:TileConditions_jobOptions.py    INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
 Py:Athena            INFO Importing MagFieldServices.SetupField
-Py:ConfiguredFactory    INFO imported 88 confDb modules in 0.02 seconds
+Py:ConfiguredFactory    INFO imported 132 confDb modules in 1.16 seconds
 Py:Athena            INFO Importing MagFieldServices.MagFieldServicesConfig
 Py:FastCaloSimFactory::configure:    INFO now configure the non-interacting propagator...
 Py:FastCaloSimFactory::configure:    INFO configure nono-interacting propagator finished
@@ -30,7 +31,7 @@ Py:FastCaloSimFactory::configure:    INFO now configure the TimedExtrapolator...
 [ TrackingGeometrySvc ]     base material tag :  AtlasLayerMat_v21_
 [ TrackingGeometrySvc ]     translated to COOL:  /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
 Py:FastCaloSimFactory::configure:    INFO configure TimedExtrapolator finished
-Py:FastCaloSimFactory::configure:    INFO ParticleParametrizationFile=/home/sss/nobackup/atlas/ReleaseData/v20/FastCaloSim/v1/ParticleEnergyParametrization.root
+Py:FastCaloSimFactory::configure:    INFO ParticleParametrizationFile=/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/FastCaloSim/v1/ParticleEnergyParametrization.root
 Py:FastCaloSimFactory::configure:    INFO all values:
 /***** Private AlgTool FastShowerCellBuilderTool/tool1 *********************************************
 |-AdditionalParticleParametrizationFileNames = []  (default: [])
@@ -44,8 +45,6 @@ Py:FastCaloSimFactory::configure:    INFO all values:
 |-CaloCoordinateTool                         = PublicToolHandle('TBCaloCoordinate')
 |-CaloEntrance                               = 'InDet::Containers::InnerDetector'
 |                                            (default: 'InDet::Containers::InnerDetector')
-|-CaloSurfaceHelper                          = PublicToolHandle('CaloSurfaceHelper/CaloSurfaceHelper')
-|                                            (default: '')
 |-CoolHistSvc                                = ServiceHandle('CoolHistSvc')
 |-DetStore                                   = ServiceHandle('StoreGateSvc/DetectorStore')
 |-DoEnergyInterpolation                      = False
@@ -68,7 +67,7 @@ Py:FastCaloSimFactory::configure:    INFO all values:
 |-MuonEnergyInCaloContainerName              = 'StoreGateSvc+FatrasDepositedMuonEnergyInCalo'
 |-OutputLevel                                = 0
 |-PartPropSvc                                = ServiceHandle('PartPropSvc')
-|-ParticleParametrizationFileName            = '/home/sss/nobackup/atlas/ReleaseData/v20/FastCaloSim/v1/ParticleEnergyParametrization.root'
+|-ParticleParametrizationFileName            = '/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/FastCaloSim/v1/ParticleEnergyParametrization.root'
 |                                            (default: '')
 |-RandomService                              = ServiceHandle('AthRNGSvc')
 |-RandomStreamName                           = 'FastCaloSimRnd'
@@ -80,21 +79,19 @@ Py:FastCaloSimFactory::configure:    INFO all values:
 |-use_Ekin_for_depositions                   = False
 \----- (End of Private AlgTool FastShowerCellBuilderTool/tool1) ------------------------------------
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-# setting LC_ALL to "C"
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Thu Jan  3 00:21:56 2019
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v31r0)
+                                          running on spar0101.usatlas.bnl.gov on Thu May  9 10:09:05 2019
 ====================================================================================================================================
-ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 7301 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 6961 CLIDRegistry entries for module ALL
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
@@ -102,20 +99,21 @@ AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version Athena
 PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
-DBReplicaSvc         INFO Read replica configuration from /home/sss/atlas/rootaccess/build/share/dbreplica.config
-DBReplicaSvc         INFO No specific match for domain found - use default fallback
-DBReplicaSvc         INFO Total of 1 servers found for host karma [atlas_dd ]
+DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/dbreplica.config
+DBReplicaSvc         INFO Total of 1 servers found for host spar0101.usatlas.bnl.gov [ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
-PoolSvc              INFO Resolved path (via DATAPATH) is /home/sss/atlas/DBRelease/current/poolcond/PoolCat_oflcond.xml
-PoolSvc              INFO Resolved path (via DATAPATH) is /home/sss/atlas/DBRelease/current/poolcond/PoolCat_oflcond.xml
-PoolSvc           WARNING Unable to locate catalog for apcfile:poolcond/PoolFileCatalog.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc           WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc              INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
 MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray([])
 IOVDbSvc             INFO Opened read transaction for POOL PersistencySvc
 IOVDbSvc             INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc             INFO Cache alignment will be done in 3 slices
 IOVDbSvc             INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
 IOVDbFolder          INFO Read from meta data only for folder /TagInfo
 IOVDbFolder          INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
@@ -149,9 +147,9 @@ IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
 IOVDbSvc             INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc           INFO  getRegistryEntries: read 1699 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2042 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 17 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 9 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 95 CLIDRegistry entries for module ALL
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service
 DetDescrCnvSvc       INFO  filling proxies for detector managers 
@@ -204,7 +202,7 @@ BarrelConstruction   INFO   Use sagging in geometry  ? 0
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EventPersistenc...   INFO Added successfully Conversion service:DetDescrCnvSvc
-ClassIDSvc           INFO  getRegistryEntries: read 2380 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2394 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileTBID helper object in the detector store
 IdDictDetDescrCnv    INFO in initialize
 IdDictDetDescrCnv    INFO in createObj: creating a IdDictManager object in the detector store
@@ -243,7 +241,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /home/sss/atlas/rootaccess/build/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -255,15 +253,15 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 TileDetDescrMan...   INFO Entering create_elements()
-ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 66 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
 TileInfoLoader       INFO Changing TTL1 calib from 4.1 to 6.9
@@ -284,11 +282,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -345,11 +343,11 @@ TileSampleNoise...   INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
 TileTimingCondA...   INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
 PyComponentMgr       INFO Initializing PyComponentMgr...
 testalg1             INFO Initializing testalg1...
-ClassIDSvc           INFO  getRegistryEntries: read 5013 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2009 CLIDRegistry entries for module ALL
 ToolSvc.tool1        INFO Initialisating started
 CaloMgrDetDescrCnv   INFO in createObj: creating a Calo Detector Manager object in the detector store
 CaloIdMgrDetDes...   INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc           INFO  getRegistryEntries: read 159 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 161 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a CaloDM_ID helper object in the detector store
 CaloDM_ID            INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -363,21 +361,22 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /home/sss/atlas/rootaccess/build/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-04-28T2154/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
 PartPropSvc          INFO No table format type specified for "PDGTABLE.MeV". Assuming PDG
+ --------------- HepPDT Version 2.06.01 --------------- 
 found 298 particles
 AthRNGSvc            INFO Creating engine ToolSvc.tool1/FastCaloSimRnd
 AtlasFieldSvc        INFO initialize() ...
 AtlasFieldSvc        INFO maps will be chosen reading COOL folder /GLOBAL/BField/Maps
-ClassIDSvc           INFO  getRegistryEntries: read 1128 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1099 CLIDRegistry entries for module ALL
 AtlasFieldSvc        INFO magnet currents will be read from COOL folder /EXT/DCS/MAGNETS/SENSORDATA
 AtlasFieldSvc        INFO Booked callback for /EXT/DCS/MAGNETS/SENSORDATA
 AtlasFieldSvc        INFO initialize() successful
@@ -392,14 +391,6 @@ ToolSvc.Materia...   INFO Minimal momentum cut for material update : 50 MeV
 ToolSvc.AtlasEn...   INFO initialize()
 ToolSvc.AtlasMu...   INFO initialize() successful
 ToolSvc.TimedEx...   INFO initialize() successful
-ToolSvc.LArReco...   INFO  Entering method ScanTree() 
-ToolSvc.LArReco...   INFO  LArRecoMaterialTool successfully initialized 
-ToolSvc.LArReco...   INFO DecodeVersionKey found : ATLAS-R2-2016-01-00-01 ATLAS-R2-2016-01-00-01
-ToolSvc.LArReco...   INFO LAr simplified geometry will use : ATLAS-R2-2016-01-00-01 ATLAS
-ToolSvc.LArReco...   INFO  did access RDBAccessSvc 
-ToolSvc.LArReco...   INFO  LArRecoSimpleGeomTool successfully initialized 
-ToolSvc.CaloDep...   INFO  CaloDepthTool ToolSvc.CaloDepthTool successfully initialised, will provide entrance (default)
-ToolSvc.CaloSur...   INFO Retrieved tool CaloSurfaceBuilder = PublicToolHandle('CaloSurfaceBuilder')
 ToolSvc.tool1        INFO retrieved TBCaloCoordinate
 ToolSvc.tool1        INFO ========================= Init EM map =============================
 ToolSvc.tool1        INFO ========================= Init EM fine map ========================
@@ -410,7 +401,7 @@ ToolSvc.tool1        INFO Building all maps
 ToolSvc.tool1        INFO Building all maps finished : n(total)=187652 n(volume>0)=179842 n(used)=177540
 ToolSvc.tool1        INFO ========================= Init volume all maps =========================
 ToolSvc.tool1        INFO McCollection=TruthEvent
-ToolSvc.tool1        INFO ==== LoadParametrizations from file : /home/sss/nobackup/atlas/ReleaseData/v20/FastCaloSim/v1/ParticleEnergyParametrization.root ====
+ToolSvc.tool1        INFO ==== LoadParametrizations from file : /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/FastCaloSim/v1/ParticleEnergyParametrization.root ====
 ToolSvc.tool1        INFO   LoadParametrizations : EnergyResults
 ToolSvc.tool1     WARNING Could fix some nan in input parametrization ParticleShape22_E200_eta236 (ParticleShape pdgid=22 E=200.0 eta=2.36): RMS(10,-1) is nan, fixed by removing correlation matrix, n=0 elements. 
 ToolSvc.tool1     WARNING Could fix some nan in input parametrization ParticleShape22_E200_eta264 (ParticleShape pdgid=22 E=200.0 eta=2.65): RMS(11,-2) is nan, fixed by removing correlation matrix, n=0 elements. 
@@ -437,10 +428,10 @@ ToolSvc.tool1        INFO      Shape  parametrization id=211 : 6637 parametrizat
 ToolSvc.tool1        INFO Invisible particles (n=1): (pdgid=0 -> Use TruthHelper class IsGenNonInteracting), 
 ToolSvc.tool1        INFO Reject ID truth particle vertices outside cylinder(s): [r=1070,z=800] [r=1030,z=3400] 
 ToolSvc.tool1        INFO Initialisating finished
-ClassIDSvc           INFO  getRegistryEntries: read 991 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 539 CLIDRegistry entries for module ALL
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
-ClassIDSvc           INFO  getRegistryEntries: read 77 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 80 CLIDRegistry entries for module ALL
 CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
 CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
 CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -468,8 +459,8 @@ IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVD
 IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
 IOVDbSvc             INFO Disconnecting from COOLOFL_LAR/OFLP200
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
-Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
-RootDatabase.open    INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
+Domain[ROOT_All]     INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
+RootDatabase.open    INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
 AtlasFieldSvc        INFO reading magnetic field map filenames from COOL
 AtlasFieldSvc        INFO found map of type GlobalMap with soleCur=7730 toroCur=20400 (path file:MagneticFieldMaps/bfieldmap_7730_20400_14m.root)
 AtlasFieldSvc        INFO found map of type SolenoidMap with soleCur=7730 toroCur=0 (path file:MagneticFieldMaps/bfieldmap_7730_0_14m.root)
@@ -482,8 +473,8 @@ AtlasFieldSvc        INFO Trying to read from DCS: [channel name, index, value]
 AtlasFieldSvc        INFO Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20400
 AtlasFieldSvc        INFO Currents read from DCS: solenoid 7730 toroid 20400
 AtlasFieldSvc        INFO Initializing the field map (solenoidCurrent=7730 toroidCurrent=20400)
-AtlasFieldSvc        INFO reading the map from /home/sss/nobackup/atlas/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc        INFO Initialized the field map from /home/sss/nobackup/atlas/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
+AtlasFieldSvc        INFO reading the map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
+AtlasFieldSvc        INFO Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
 ToolSvc.Trackin...   INFO initialize()
 ToolSvc.Trackin...   INFO initialize() 
 ToolSvc.LayerAr...   INFO initialize()
@@ -509,6 +500,13 @@ ToolSvc.CaloTra...   INFO Retrieved tool TrackingVolumeCreator = PublicToolHandl
 ToolSvc.LArVolu...   INFO Retrieved tool TrackingVolumeHelper = PublicToolHandle('Trk::TrackingVolumeHelper/TrackingVolumeHelper')
 ToolSvc.Trackin...   INFO initialize() successful
 ToolSvc.LArVolu...   INFO Retrieved tool TrackingVolumeCreator = PublicToolHandle('Trk::CylinderVolumeCreator/TrackingVolumeCreator')
+ToolSvc.LArReco...   INFO  Entering method ScanTree() 
+ToolSvc.LArReco...   INFO  LArRecoMaterialTool successfully initialized 
+ToolSvc.LArReco...   INFO DecodeVersionKey found : ATLAS-R2-2016-01-00-01 ATLAS-R2-2016-01-00-01
+ToolSvc.LArReco...   INFO LAr simplified geometry will use : ATLAS-R2-2016-01-00-01 ATLAS
+ToolSvc.LArReco...   INFO  did access RDBAccessSvc 
+ToolSvc.LArReco...   INFO  LArRecoSimpleGeomTool successfully initialized 
+ToolSvc.CaloDep...   INFO  CaloDepthTool ToolSvc.CaloDepthTool successfully initialised, will provide entrance (default)
 ToolSvc.LArVolu...   INFO Retrieved tool CaloSurfaceBuilder = PublicToolHandle('CaloSurfaceBuilder')
 ToolSvc.LArVolu...   INFO ToolSvc.LArVolumeBuilder initialize() successful
 ToolSvc.CaloTra...   INFO Retrieved tool LArVolumeBuilder = PublicToolHandle('LAr::LArVolumeBuilder/LArVolumeBuilder')
@@ -524,11 +522,11 @@ ToolSvc.CaloTra...   INFO 2 volumes retrieved from TileVolumeBuilder
 ToolSvc.CaloTra...   INFO --------------- detailed output ---------------------------------------------------------- 
 LayerMaterialMa...   INFO LayerMaterialMapCnv::initialize()
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 2B8BB54A-2F81-7B49-8484-60F83666998E
-Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000126.gen.COND/cond09_mc.000126.gen.COND._0001.pool.root
-RootDatabase.open    INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000126.gen.COND/cond09_mc.000126.gen.COND._0001.pool.root File version:60416
+Domain[ROOT_All]     INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000126.gen.COND/cond09_mc.000126.gen.COND._0001.pool.root
+RootDatabase.open    INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000126.gen.COND/cond09_mc.000126.gen.COND._0001.pool.root File version:60416
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
-Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
-RootDatabase.open    INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+Domain[ROOT_All]     INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open    INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_TILE/OFLP200
 IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
@@ -551,7 +549,7 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 1104 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1749 CLIDRegistry entries for module ALL
 AthRNGSvc         SUCCESS ToolSvc.tool1/FastCaloSimRnd 3630501711 90 3261692434 1073680638 823030377 1073723668 1868930291 1073677174 911996003 1073290479 3711715511 1072694548 2140068716 1072735951 539460630 1073178241 2282305494 1072708986 1641530683 1073202302 2631242835 1073321911 3961765294 1073467950 2626127931 1073272628 2396189536 1073590622 2374465580 1073564482 3416006862 1072800960 1352814095 1073333945 1932808853 1073111336 2004821113 1072722654 164197198 1072846416 751909680 1073721900 808721476 1073468761 690859097 1073483009 418699027 1073306662 1789296916 1073624469 2971093188 1072984953 2555298921 1072770453 3853840956 1073055738 3487439144 1073639698 1894545311 1072884286 626513571 1073631692 3421835136 1073307636 3985124064 1073729249 2607246495 1073094204 4090506844 1073695039 2410441688 1073487241 1069374412 1073423736 1760407317 1072765560 2827875924 1072827462 4146416168 1073037450 3197924302 1073718189 3551167333 1073676036 4115234429 1073230966 98903944 1073088578 4282482954 1073314928 2143692400 1073136393 3296550475 1072843872 3558803953 1073270281 3103842852 1073235469 1882909869 1073459859 916240561 1073339674 536539632 1073614296 1409495660 1073448151 358001842 1073483642 739667300 1073521338 3746187847 1072960505 2594847495 1073654670 3231825006 1073250176 3554125300 1073441586 889397564 1073010193 3102313462 1073424387 912563430 1073190059 2833054885 1073176909 2869107047 1073201355 4064975915 1073425934 3842344805 1073237417 2249570334 1073294265 933655068 1073661856 2823826967 1072983053 3187935985 1073666738 2012177277 1073511885 3705303978 1073354273 2263991526 1072860629 714897335 1073409664 3791090286 1072885706 3668090129 1072928433 4177473366 1073400077 4103000642 1072762422 1446170605 1072828225 2626904048 1073096349 787048638 1073597594 911588237 1072953144 271870086 1073290978 1047360370 1073346157 1872092527 1072822122 2841293698 1073002754 365773320 1073623173 3533126773 1073023548 1827082166 1073011537 769948162 1072741453 716869697 1073421964 950558058 1073688175 3654654741 1073077866 2148938756 1073636271 4042145415 1073729005 2295127568 1073051710 2538781685 1073500775 1382221002 1073134056 84184398 1072699157 1424487447 1073581512 419336873 1073657082 3569483343 1073003194 4070398286 1073300428 4070981007 1072944187 756286778 1073738055 2998212970 1073014133 462886270 1072731246 3544532359 1073371748 3720216818 1073530166 857383700 1073027294 2603143961 1073033720 3719393042 1073014678 3871031172 1073611172 3167825463 1073413837 3430927282 1073037455 2813514352 1073187562 1890932001 1072709290 3303417437 1073036901 1339564205 1073642312 2538448638 1073008042 1026462913 1073603981 1900392973 1072983365 4219218825 1073730572 729915534 1072743555 1592137825 1073699851 3580755983 1073180566 3646051161 1073621980 1888726728 1072884180 2759076898 1072988631 781657975 1072742798 539597383 1072933770 2862823903 1073461460 137639100 1073419163 1282995020 1073635629 2773321850 1073015233 864373926 1072783317 2945299790 1073564429 942801054 1073065933 469421843 1073736865 1205751158 1072817032 2557468817 1073741663 284681309 1073694428 3705796569 1073080815 2784424690 1073534939 87996075 1073165948 4251187390 1073694412 4133058395 1073171507 4148682519 1072914063 1438363651 1073586842 379154910 1072847866 1590169437 1072855295 3490089895 1073313887 2705421280 1073085513 1607354295 1072886471 2501280363 1073136524 1603739927 1072957178 1195334651 1072864186 3489732441 1073038891 1352657795 1072828769 19676344 1073018085 3103839646 1073314627 959564690 1073526279 1963499755 1073449889 250981548 1073668260 1777143703 1072842316 1134371421 1073057027 3860630533 1072887996 3065684433 1072813724 2169295742 1072773648 3514099379 1072862237 2637450043 1072749923 1458646333 1072947546 3991056209 1073352675 398024247 1073245696 456978228 1073685482 1275860529 1073446874 1104928121 1073349174 2709807511 1073414285 1001292837 1073391486 333779909 1072985692 3296251806 1073229593 4052332837 1073177524 3347382464 1072811729 1993826165 1072826950 2930738656 1072797162 3421648372 1073246843 159529425 1073067140 1822199323 1072821862 947562513 1072788222 2999108474 1073410975 3001267519 1073014979 2200426417 1072697229 3839301019 1073211197 653930178 1072821156 347931826 1073260473 3220160560 1072908029 2060537181 1073148903 1819201266 1072725052 752057633 1073712872 1284664544 1073018908 4061523052 1073715276 1678059209 1073120880 1563127687 1073397828 1073017791 1073448950 2160732782 1072736393 98102556 1073574247 2980862331 1073495372 10947338 1073388566 235712746 1073130536 1428538253 1073444911 1034331703 1073135276 1193514266 1073399517 2047530239 1073256035 1763468142 1073656778 95599117 1072831138 510292077 1073359403 2867275526 1073739478 1688604336 1073128745 1834286853 1073632701 1912869948 1073622452 2874594033 1073549554 2314352708 1073707463 1928987767 1073355679 156479999 1073107923 427377340 1073604020 3759005145 1073008275 2186399455 1073470828 27260339 1073631507 2972862105 1072875544 3306058547 1073674887 4243502 1073068761 4219093378 1072818031 2557302325 1073596249 296768555 1073125110 541062411 1073558141 8361674 1072788178 2747074052 1072706485 833875430 1072882109 2173602389 1072846141 1462039115 1073037234 1842330282 1073192077 1623547146 1072931134 718827894 1072939088 2939061236 1073584483 1164526291 1073138367 3530317869 1073444316 1933624563 1072996789 3306818729 1073206511 3465916374 1073208069 770688873 1073187945 1190230823 1072729827 2978207685 1073260241 1919240575 1072738920 4133661157 1073166622 3541555338 1073639985 3200451429 1073296053 2148722180 1073548242 2744498149 1073643883 1743594613 1073269305 3265447442 1073042739 3018353724 1073682837 1469213866 1073277068 4004154164 1073405891 1275293170 1072905879 4237407126 1073252636 808418950 1073598273 3352491937 1072753050 2120097613 1072889002 579900871 1073040505 3264609359 1073727315 741502134 1073187984 1392942119 1073154740 3769930099 1073043915 3825224772 1072940924 1112532450 1072821755 2547148240 1073167418 1931659309 1073124486 2849541086 1072819160 240941813 1072803712 3038640263 1073301050 963999170 1072908536 1707506099 1073606863 1877868468 1072821515 1065662759 1073287087 1700024633 1072995875 619690025 1073209278 2551852602 1072696157 2222723748 1072906116 1927104135 1073194953 2863380179 1073537077 2292713055 1072735008 2272466554 1073455406 2373215093 1073551764 3324063296 1073422970 2302478549 1073020979 1226262167 1073610915 3810494412 1072757930 3598016388 1072968968 3537807466 1072707226 1704779161 1073671798 3085424591 1073315979 585655719 1073193844 3060235115 1073091386 1863225538 1073616828 2550257447 1073138604 1041018708 1073698931 2550281390 1073091244 684679500 1073225758 1124361632 1072992252 3453512710 1072896846 2217085102 1073364366 2210679916 1072698927 313798325 1073055347 160295651 1073721031 2919317005 1073225837 2914657176 1073576644 3628120085 1073475641 1067340581 1073546013 340517196 1073724752 1127352683 1072769370 1492607570 1073392139 4135266509 1072867941 47699585 1072720565 2696229633 1072920700 4026883948 1073401517 1563530900 1073127246 2450531703 1073047787 3190069830 1073274034 654254270 1072925380 2415086862 1073508836 2610776490 1073236289 2122340525 1073009911 2785746802 1073338598 1350136126 1073311616 3970399521 1072852344 3106047532 1073554151 2582386806 1072695066 981697222 1072785304 3195759033 1073700288 2921106626 1073092172 183150695 1073252808 4099644845 1073456800 1288824535 1072940897 1563673146 1073411168 2496781743 1073338375 2962768285 1073223705 1576579287 1072922059 550057400 1073582928 2862331727 1073242743 2852012108 1072891435 2627580467 1073358635 3211577202 1073355904 3039848443 1073447954 3913185655 1073199284 2600647611 1073686940 827096734 1073585076 1554652000 1073406528 4165811413 1073244527 441484542 1072780555 2536639643 1073409915 2310341371 1073452160 114457467 1073379111 2815515709 1073106406 3442879574 1072805611 2247673049 1072875215 1461815981 1073341895 67919517 1073612505 4179474298 1072753058 2515614785 1073709826 124095440 1072847200 1645148762 1072916829 830435430 1073499794 3629871842 1073005476 2223287807 1073122271 3292803050 1072761672 3826188126 1073616228 3721761610 1073580536 3707133827 1073494701 1950134628 1072919780 1522092269 1073542864 1655081062 1073465610 811524494 1072839924 3516415211 1073710058 4222427839 2995058703 2624364569 3711061605 
 ToolSvc.tool1        INFO CaloEntrance not found 
 ToolSvc.tool1        INFO CaloEntrance not found 
@@ -561,12 +559,12 @@ ToolSvc.tool1        INFO CaloEntrance not found
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
 TileInfoLoader       INFO Handling EndRun incident
 TileInfoLoader       INFO Removed TileInfo object from detector store.
-/home/sss/atlas...   INFO Database being retired...
-Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
-/home/sss/atlas...   INFO Database being retired...
-Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
-/home/sss/atlas...   INFO Database being retired...
+/cvmfs/atlas-co...   INFO Database being retired...
 Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 2B8BB54A-2F81-7B49-8484-60F83666998E
+/cvmfs/atlas-co...   INFO Database being retired...
+Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
+/cvmfs/atlas-co...   INFO Database being retired...
+Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
 Domain[ROOT_All]     INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 ApplicationMgr       INFO Application Manager Stopped successfully
 IncidentProcAlg1     INFO Finalize
@@ -577,28 +575,28 @@ AtlasTrackingGe...   INFO finalize() successful.
 AtlasFieldSvc        INFO finalize() successful
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/20 ((     0.06 ))s
-IOVDbFolder          INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 ((     0.06 ))s
-IOVDbFolder          INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/1 objs/chan/bytes 1/1/231 ((     0.00 ))s
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     0.06 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 ((     0.06 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.00 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.00 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 ((     0.00 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 ((     0.00 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 ((     0.00 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.00 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 ((     0.01 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 ((     0.00 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.00 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.00 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     0.00 ))s
-IOVDbSvc             INFO  bytes in ((      0.29 ))s
+IOVDbFolder          INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/20 ((     2.12 ))s
+IOVDbFolder          INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 ((     1.93 ))s
+IOVDbFolder          INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/1 objs/chan/bytes 1/1/231 ((     0.53 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     1.78 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 ((     2.20 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     1.89 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     1.88 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 ((     1.51 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 ((     1.66 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 ((     1.66 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     1.66 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 ((     2.52 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 ((     1.50 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     1.67 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.11 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     1.17 ))s
+IOVDbSvc             INFO  bytes in ((     25.78 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.06 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     0.10 ))s
-IOVDbSvc             INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.06 ))s
-IOVDbSvc             INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: ((     0.06 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     2.95 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((    18.25 ))s
+IOVDbSvc             INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     2.46 ))s
+IOVDbSvc             INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: ((     2.12 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -619,9 +617,9 @@ ToolSvc.Trackin...   INFO finalize() successful
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot=  240 [ms] Ave/Min/Max=   80(+- 86.4)/    0/  200 [ms] #=  3
-cObj_ALL             INFO Time User   : Tot=  320 [ms] Ave/Min/Max= 18.8(+- 52.9)/    0/  220 [ms] #= 17
-ChronoStatSvc        INFO Time User   : Tot= 29.4  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot= 1.83  [s] Ave/Min/Max= 0.61(+-0.779)/ 0.02/ 1.71  [s] #=  3
+cObj_ALL             INFO Time User   : Tot= 1.98  [s] Ave/Min/Max=0.116(+-0.408)/    0/ 1.74  [s] #= 17
+ChronoStatSvc        INFO Time User   : Tot=  147  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
index eaa1cdff923a58768a3d0bd0ac764b4de2d64a88..da809c6e44089db049c4dd1a55b77319f0b0ec54 100755
--- a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
@@ -52,7 +52,6 @@
 #include "TrkSurfaces/CylinderSurface.h"
 #include "TrkSurfaces/DiscSurface.h"
 #include "TrkSurfaces/DiscBounds.h"
-#include "CaloTrackingGeometry/ICaloSurfaceHelper.h"
 #include "TrkExInterfaces/IExtrapolator.h"
 #include "TrkMaterialOnTrack/EnergyLoss.h"
 //#include "TruthHelper/PileUpType.h"
@@ -118,7 +117,6 @@ FastShowerCellBuilderTool::FastShowerCellBuilderTool(const std::string& type, co
   , m_partPropSvc("PartPropSvc", name)
   , m_rndmSvc("AthRNGSvc", name)
   , m_extrapolator("")
-  , m_caloSurfaceHelper("")
   , m_calo_tb_coord("TBCaloCoordinate")
   , m_sampling_energy_reweighting(CaloCell_ID_FCS::MaxSample,1.0)
   , m_invisibles(0)
@@ -147,7 +145,6 @@ FastShowerCellBuilderTool::FastShowerCellBuilderTool(const std::string& type, co
 
   declareProperty("Extrapolator",                   m_extrapolator );
   declareProperty("CaloEntrance",                   m_caloEntranceName );
-  declareProperty("CaloSurfaceHelper",              m_caloSurfaceHelper );
   declareProperty("CaloCoordinateTool",             m_calo_tb_coord);
 
   declareProperty("StoreFastShowerInfo",            m_storeFastShowerInfo);
@@ -397,9 +394,6 @@ StatusCode FastShowerCellBuilderTool::initialize()
     ATH_MSG_DEBUG("Extrapolator retrieved "<< m_extrapolator);
   }
 
-  // Get CaloSurfaceHelper
-  ATH_CHECK(m_caloSurfaceHelper.retrieve());
-
   ATH_CHECK(m_calo_tb_coord.retrieve());
   ATH_MSG_INFO("retrieved " << m_calo_tb_coord.name());