diff --git a/Reconstruction/RecJobTransforms/share/new_jo_raw_reco_aod_digest.ref b/Reconstruction/RecJobTransforms/share/new_jo_raw_reco_aod_digest.ref
index 3398134ba5e0cfaa4eb62bb806e5611498a77626..daa6eee520f25bac891fd587d33c3f81e8a79a95 100644
--- a/Reconstruction/RecJobTransforms/share/new_jo_raw_reco_aod_digest.ref
+++ b/Reconstruction/RecJobTransforms/share/new_jo_raw_reco_aod_digest.ref
@@ -1,6 +1,6 @@
          run       event       nTopo   nIdTracks      nMuons       nElec   nTrueElec   nFakeElec       nPhot   nTruePhot   nFakePhot
       327265   186524665         430         416           0           0           0           0           0           0           0
-      327265   186525031         451         429           0           0           0           0           0           0           0
+      327265   186525031         451         430           0           0           0           0           0           0           0
       327265   186542447         338         293           0           0           0           0           0           0           0
       327265   186543405         425         320           0           0           0           0           0           0           0
       327265   186548387         537         513           0           0           0           0           0           0           0
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/share/TrkVKalVrtFitter_test.ref b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/share/TrkVKalVrtFitter_test.ref
index 29b1c8207ea6bbb57998f1d66e16ae7f3ac4ebf0..75c2d7dd817511fb30f61d46fe18e4fb0d8a0481 100644
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/share/TrkVKalVrtFitter_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/share/TrkVKalVrtFitter_test.ref
@@ -1,55 +1,60 @@
-Tue May 26 23:17:55 CEST 2020
+Thu Jul 22 09:58:31 CEST 2021
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.14] [x86_64-centos7-gcc8-opt] [magFieldCache-fixes-testCleanupAgain/836569f] -- built on [2020-05-26T2311]
+Py:Athena            INFO using release [WorkDir-22.0.40] [x86_64-centos7-gcc8-opt] [fixesForCondAlf/1b97caf7369] -- built on [2021-07-22T0954]
 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 "TrkVKalVrtFitter/TrkVKalVrtFitter_test.py"
 Py:Athena            INFO SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5528 configurables from 15 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5052 configurables from 4 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version  Athena-22.0.14
+EventInfoMgtInit: Got release version  Athena-22.0.40
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
-Py:ConfiguredFactory    INFO imported 135 confDb modules in 2.19 seconds
+Py:Athena            INFO Importing MuonRecExample.MuonRecUtils
+Py:Athena            INFO Importing module MuonCnvExample.MuonCalibFlags
+Py:Athena            INFO Importing MuonCnvExample.MuonCnvUtils
+Py:MuonCnvExample.MuonCalibFlags    INFO Changing default mdtPropagationSpeedBeta = 1.0
+Py:MuonRec           INFO Importing MuonRecExample.MuonRecFlags
+Py:MuonRec           INFO Changing default applyResilience = True
+Py:MuonRec           INFO Changing default doMSVertex = True
+Py:MuonRec           INFO Changing default enableErrorTuning = True
+Py:MuonRec           INFO Changing default writeSDOs = True
+Py:ConfiguredFactory    INFO imported 134 confDb modules in 1.13 seconds
 Py:Athena            INFO Importing MagFieldServices.SetupField
 Py:Athena            INFO Importing MagFieldServices.MagFieldServicesSetup
 [ TrackingGeometrySvc ]     base material tag :  AtlasLayerMat_v21_
 [ TrackingGeometrySvc ]     translated to COOL:  /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
+[ TrackingGeometryCondAlg ]     base material tag :  AtlasLayerMat_v21_
+[ TrackingGeometryCondAlg ]     translated to COOL:  /GLOBAL/TrackingGeo/LayerMaterialV2<tag>TagInfoMajor/AtlasLayerMat_v21_/GeoAtlas</tag>
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-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 v33r1)
-                                          running on ccwige0002 on Tue May 26 23:18:09 2020
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v36r0)
+                                          running on Beast2 on Thu Jul 22 09:58:42 2021
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 3736 CLIDRegistry entries for module ALL
-CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
+ClassIDSvc           INFO getRegistryEntries: read 3377 CLIDRegistry entries for module ALL
 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
-AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
+MetaDataSvc          INFO Initializing MetaDataSvc
 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 Frontier server at (serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://atlasfrontier2-ai.cern.ch:8000/atlr)(serverurl=http://atlasfrontier1-ai.cern.ch:8000/atlr)(proxyurl=http://ccatlassquid.in2p3.fr:3128)(proxyurl=http://ccatlassquid02.in2p3.fr:3128)(proxyurl=http://ccatlassquid04.in2p3.fr:3128)(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_Athena_x86_64-centos7-gcc8-opt/2020-05-25T2141/Athena/22.0.14/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc         INFO Total of 1 servers found for host ccwige0002.in2p3.fr [ATLF ]
+DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(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_Athena_x86_64-centos7-gcc8-opt/2021-07-21T2101/Athena/22.0.40/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc         INFO No specific match for domain found - use default fallback
+DBReplicaSvc         INFO Total of 2 servers found for host Beast2.localdomain [ATLF atlas_dd ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
-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 Unable find catalog apcfile:poolcond/PoolCat_oflcond.xml in $ATLAS_POOLCOND_PATH and $DATAPATH
 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
@@ -57,7 +62,9 @@ IOVDbFolder          INFO Read from meta data only for folder /TagInfo
 IOVDbFolder          INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
 IOVDbSvc             INFO Initialised with 5 connections and 8 folders
 IOVDbSvc             INFO Service IOVDbSvc initialised successfully
-ClassIDSvc           INFO  getRegistryEntries: read 1967 CLIDRegistry entries for module ALL
+IOVDbSvc             INFO   AlgTool: ToolSvc.IOVDbMetaDataTool
+TagInfoMgr           INFO   AlgTool: TagInfoMgr.IOVDbMetaDataTool
+ClassIDSvc           INFO getRegistryEntries: read 1513 CLIDRegistry entries for module ALL
 IOVDbSvc             INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_INDET/OFLP200
 IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -76,8 +83,8 @@ IOVDbSvc             INFO Added taginfo remove for /Indet/Align
 IOVDbSvc             INFO Added taginfo remove for /Indet/IBLDist
 IOVDbSvc             INFO Added taginfo remove for /Indet/PixelDist
 IOVDbSvc             INFO Added taginfo remove for /TRT/Align
-ClassIDSvc           INFO  getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 35 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO getRegistryEntries: read 42 CLIDRegistry entries for module ALL
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service
 DetDescrCnvSvc       INFO  filling proxies for detector managers 
@@ -91,6 +98,7 @@ DetDescrCnvSvc       INFO  filling address for AtlasID with CLID 164875623 and s
 DetDescrCnvSvc       INFO  filling address for PixelID with CLID 2516 and storage type 68 to detector store 
 DetDescrCnvSvc       INFO  filling address for SCT_ID with CLID 2517 and storage type 68 to detector store 
 DetDescrCnvSvc       INFO  filling address for TRT_ID with CLID 2518 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for HGTD_ID with CLID 79264207 and storage type 68 to detector store 
 DetDescrCnvSvc       INFO  filling address for SiliconID with CLID 129452393 and storage type 68 to detector store 
 DetDescrCnvSvc       INFO  filling address for LArEM_ID with CLID 163583365 and storage type 68 to detector store 
 DetDescrCnvSvc       INFO  filling address for LArEM_SuperCell_ID with CLID 99488227 and storage type 68 to detector store 
@@ -117,6 +125,8 @@ DetDescrCnvSvc       INFO  filling address for CaloCell_ID with CLID 123500438 a
 DetDescrCnvSvc       INFO  filling address for CaloCell_SuperCell_ID with CLID 128365736 and storage type 68 to detector store 
 DetDescrCnvSvc       INFO  filling address for CaloDM_ID with CLID 167756483 and storage type 68 to detector store 
 DetDescrCnvSvc       INFO  filling address for ZdcID with CLID 190591643 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for JTower_ID with CLID 218674799 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for GTower_ID with CLID 49678914 and storage type 68 to detector store 
 GeoModelSvc::RD...WARNING  Getting PixTBMatComponents with default tag
 GeoModelSvc::RD...WARNING  Getting PixTBMaterials with default tag
 GeoModelSvc::RD...WARNING  Getting InDetMatComponents with default tag
@@ -246,7 +256,10 @@ PixelGeoModel        INFO Layer 3 in/out radius 117.51  136.132
 PixelGeoModel        INFO Build IBL I-Flex services
 PixelGeoModel        INFO Build IBL I-Flex services
 PixelGeoModel        INFO Build IBL I-Flex services
-PixelGeoModel        INFO Build IBL fwd services - CAD tool design / S. model1 : 0/0
+PixelGeoModel        INFO Build IBL fwd services - CAD tool design / S. model1 : 0/1
+PixelGeoModel        INFO GeoPixelIBLFwdService - CAD tool design / S. model1 : 0/1
+PixelGeoModel        INFO Build IBL fwd services - S. Menke  design
+PixelGeoModel        INFO Build IBL fwd services
 PixelDetectorMa...   INFO Registering alignment channel with key /Indet/Align/ID, level 2, with frame global.
 PixelDetectorMa...   INFO Registering alignment channel with key /Indet/Align/PIX, level 1, with frame global.
 PixelDetectorMa...   INFO Registering alignment channel with key /Indet/Align/PIXB1, level 0, with frame local.
@@ -295,11 +308,12 @@ SCTDetectorManager   INFO Registering alignment channel with key /Indet/Align/SC
 SCTDetectorManager   INFO Registering alignment channel with key /Indet/Align/SCTEC7, level 1, with frame local.
 SCTDetectorManager   INFO Registering alignment channel with key /Indet/Align/SCTEC8, level 1, with frame local.
 SCTDetectorManager   INFO Registering alignment channel with key /Indet/Align/SCTEC9, level 1, with frame local.
-ClassIDSvc           INFO  getRegistryEntries: read 3566 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc           INFO  getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 1232 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 291 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO getRegistryEntries: read 3605 CLIDRegistry entries for module ALL
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr
+ClassIDSvc           INFO getRegistryEntries: read 2781 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO getRegistryEntries: read 1538 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO getRegistryEntries: read 240 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO getRegistryEntries: read 255 CLIDRegistry entries for module ALL
 CondInputLoader      INFO Initializing CondInputLoader...
 CondInputLoader      INFO Adding base classes:
   +  ( 'AlignableTransformContainer' , 'ConditionStore+/Indet/Align' )   -> no bases
@@ -315,34 +329,38 @@ CondInputLoader      INFO Will create WriteCondHandle dependencies for the follo
     +  ( 'CondAttrListCollection' , 'ConditionStore+/GLOBAL/BField/Maps' ) 
     +  ( 'CondAttrListCollection' , 'ConditionStore+/Indet/IBLDist' ) 
     +  ( 'DetCondCFloat' , 'ConditionStore+/Indet/PixelDist' ) 
-AtlasFieldMapCo...   INFO Initialize
 AtlasFieldMapCo...   INFO Initialize: Key  ( 'AtlasFieldMapCondObj' , 'ConditionStore+fieldMapCondObj' )  has been succesfully registered 
 AtlasFieldMapCo...   INFO Initialize: Will update the field map from conditions
-AtlasFieldCache...   INFO Initialize
 AtlasFieldCache...   INFO Initialize: Key  ( 'AtlasFieldCacheCondObj' , 'ConditionStore+fieldCondObj' )  has been succesfully registered 
 AtlasFieldCache...   INFO Initialize: Will update current from conditions
 AtlasFieldCache...   INFO Initialize: useDCS, useSoleCurrent, useToroCurrent. 1,  'UseSoleCurrent':7730.0000,  'UseToroCurrent':20400.000 LockMapCurrents 0
-ClassIDSvc           INFO  getRegistryEntries: read 440 CLIDRegistry entries for module ALL
-xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-ClassIDSvc           INFO  getRegistryEntries: read 1202 CLIDRegistry entries for module ALL
-xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-xAODMaker::Even...WARNING Beam conditions service not available
-xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
+AtlasGeometry_E...   INFO Initializing ...
+AtlasGeometry_E...   INFO No entries for table 'InDetEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
+AtlasGeometry_E...   INFO Unable to retrieve envelope definitions from DDDB. Enabling Python-based fallback definitions.
+AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'InDetEnvelope'.
+AtlasGeometry_E...   INFO No entries for table 'BeamPipeEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
+AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'BeamPipeEnvelope'.
+AtlasGeometry_E...   INFO No entries for table 'CaloEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
+AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'CaloEnvelope'.
+AtlasGeometry_E...   INFO No entries for table 'MuonEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
+AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'MuonEnvelope'.
+AtlasGeometry_E...   INFO No entries for table 'CavernEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
+AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'CavernEnvelope'.
+AtlasGeometry_E...   INFO Initialize successful.
+ClassIDSvc           INFO getRegistryEntries: read 1872 CLIDRegistry entries for module ALL
+AtlasTrackingGe...   INFO Retrieved tool LayerArrayCreator = PublicToolHandle('Trk::LayerArrayCreator/InDetLayerArrayCreatorCond')
+AtlasTrackingGe...   INFO initialize() succesful
+ClassIDSvc           INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+xAODMaker::Even...   INFO Initializing xAODMaker::EventInfoCnvAlg
+ClassIDSvc           INFO getRegistryEntries: read 1167 CLIDRegistry entries for module ALL
+xAODMaker::Even...   INFO Beam conditions service not available
+xAODMaker::Even...   INFO Will not fill beam spot information into xAOD::EventInfo
 testalg1            DEBUG Property update for OutputLevel : new value = 1
 testalg1          VERBOSE ServiceLocatorHelper::service: found service EventDataSvc
 testalg1          VERBOSE ServiceLocatorHelper::service: found service TimelineSvc
 testalg1.TrkVKa...  DEBUG Property update for OutputLevel : new value = 1
-ClassIDSvc           INFO  getRegistryEntries: read 668 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 111 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 926 CLIDRegistry entries for module ALL
-AtlasTrackingGe...   INFO initialize() successful! 
-testalg1.TrkVKa...   INFO Successfully retrieved TrackingGeometrySvc = ServiceHandle('AtlasTrackingGeometrySvc')
-testalg1.TrkVKa...   INFO Minimal momentum cut for material update : 50 MeV
-ToolSvc.AtlasEn...   INFO initialize()
-ToolSvc.AtlasMu...   INFO initialize() successful
-testalg1.TrkVKa...   INFO Minimal momentum cut for material update : 50 MeV
-testalg1.TrkVKa...   INFO initialize() successful
-testalg1.TrkVKa...   INFO initialize()
+ClassIDSvc           INFO getRegistryEntries: read 631 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO getRegistryEntries: read 113 CLIDRegistry entries for module ALL
 testalg1.TrkVKa...   INFO TrkVKalVrtFitter initialize() successful
 testalg1          VERBOSE ServiceLocatorHelper::service: found service AlgExecStateSvc
 testalg1            DEBUG input handles: 0
@@ -350,6 +368,7 @@ testalg1            DEBUG output handles: 0
 testalg1            DEBUG Adding private ToolHandle tool testalg1.TrkVKalVrtFitter (Trk::TrkVKalVrtFitter)
 testalg1            DEBUG Data Deps for testalg1
   + INPUT   ( 'AtlasFieldCacheCondObj' , 'ConditionStore+fieldCondObj' ) 
+  + INPUT   ( 'Trk::TrackingGeometry' , 'ConditionStore+AtlasTrackingGeometry' ) 
 ApplicationMgr       INFO Application Manager Initialized successfully
 CondInputLoader      INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/Indet/Align'
 CondInputLoader      INFO created CondCont<AlignableTransformContainer> with key 'ConditionStore+/TRT/Align'
@@ -359,55 +378,23 @@ CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'Con
 CondInputLoader      INFO created CondCont<DetCondCFloat> with key 'ConditionStore+/Indet/PixelDist'
 ApplicationMgr       INFO Application Manager Started successfully
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
-EventPersistenc...   INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc...   INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc           INFO  getRegistryEntries: read 118 CLIDRegistry entries for module ALL
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_INDET/OFLP200
 IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetAlign_IOVDEP-03 for folder /Indet/Align
 IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to IBLDist-NULL for folder /Indet/IBLDist
 IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to InDetPixelDist-nominal for folder /Indet/PixelDist
 IOVDbSvc             INFO Disconnecting from COOLOFL_INDET/OFLP200
+IOVDbSvc             INFO Opened read transaction for POOL PersistencySvc
+EventPersistenc...   INFO Added successfully Conversion service:AthenaPoolCnvSvc
+DbSession            INFO     Open     DbSession    
+Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
 Domain[ROOT_All]     INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root
 RootDatabase.open    INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0001.pool.root File version:52600
 PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier  [2.1.0.0.0] at level 2
 PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
-PixelDetectorMa...   INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
+PixelDetectorMa...   INFO Processing IBLDist alignment container with key (/Indet/IBLDist)and alignment folder pointing to /Indet/Align
 PixelDetectorMa...WARNING Invalid HashID for identifier [2.1.0.0.0]
-PixelDetectorMa...WARNING No IBLDist corrections can be applied for invalid HashID's - exiting 
-ToolSvc.Trackin...   INFO initialize()
-ToolSvc.Trackin...   INFO initialize() 
-ToolSvc.LayerAr...   INFO initialize()
-ToolSvc.Trackin...   INFO Retrieved tool LayerArrayCreator = PublicToolHandle('Trk::LayerArrayCreator/LayerArrayCreator')
-ToolSvc.Trackin...   INFO Retrieved tool TrackingVolumeArrayCreator = PublicToolHandle('Trk::TrackingVolumeArrayCreator/TrackingVolumeArrayCreator')
-AtlasGeometry_E...   INFO Initializing ...
-AtlasGeometry_E...   INFO No entries for table 'InDetEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E...   INFO Unable to retrieve envelope definitions from DDDB. Enabling Python-based fallback definitions.
-AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'InDetEnvelope'.
-AtlasGeometry_E...   INFO No entries for table 'BeamPipeEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'BeamPipeEnvelope'.
-AtlasGeometry_E...   INFO No entries for table 'CaloEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'CaloEnvelope'.
-AtlasGeometry_E...   INFO No entries for table 'MuonEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'MuonEnvelope'.
-AtlasGeometry_E...   INFO No entries for table 'CavernEnvelope' in Detector Description Database (DDDB). Maybe you are using Python-based envelope definitions...
-AtlasGeometry_E...   INFO Sucessfully read Python-based envelope definition for 'CavernEnvelope'.
-AtlasGeometry_E...   INFO Initialize successful.
-ToolSvc.InDetLa...   INFO initialize()
-ToolSvc.InDetTr...   INFO initialize()
-ToolSvc.InDetTr...   INFO initialize() 
-ToolSvc.InDetTr...   INFO Retrieved tool LayerArrayCreator = PublicToolHandle('Trk::LayerArrayCreator/LayerArrayCreator')
-ToolSvc.InDetTr...   INFO Retrieved tool TrackingVolumeArrayCreator = PublicToolHandle('Trk::TrackingVolumeArrayCreator/TrackingVolumeArrayCreator')
-ToolSvc.InDetCy...   INFO initialize() successful
-AtlasTrackingGe...   INFO Retrieved tool LayerArrayCreator = PublicToolHandle('Trk::LayerArrayCreator/InDetLayerArrayCreator')
-AtlasTrackingGe...   INFO initialize() succesful
-IOVDbSvc             INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
-IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to BFieldMap-Run1-14m-v01 for folder /GLOBAL/BField/Maps
-IOVDbSvc             INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
-ElementTableCnv      INFO LayerMaterialMapCnv::initialize()
-Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 2B8BB54A-2F81-7B49-8484-60F83666998E
-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
+PixelDetectorMa...WARNING No IBLDist corrections can be applied for invalid HashID's - exiting
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_TRT/OFLP200
 IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TRTAlign_Nominal2 for folder /TRT/Align
@@ -420,6 +407,9 @@ RootDatabase.open    INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmc
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_DCS/OFLP200
 IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to ExtDCSMagnetsSensorData-001 for folder /EXT/DCS/MAGNETS/SENSORDATA
 IOVDbSvc             INFO Disconnecting from COOLOFL_DCS/OFLP200
+IOVDbSvc             INFO Opening COOL connection for COOLOFL_GLOBAL/OFLP200
+IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to BFieldMap-Run1-14m-v01 for folder /GLOBAL/BField/Maps
+IOVDbSvc             INFO Disconnecting from COOLOFL_GLOBAL/OFLP200
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
 Domain[ROOT_All]     INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.recon.pool.v0000/oflcond.000001.conditions.recon.pool.v0000._0058.pool.root
 Warning in <TClass::Init>: no dictionary for class DataHeader_p2 is available
@@ -437,14 +427,21 @@ AtlasFieldMapCo...   INFO updateFieldMap: reading magnetic field map filenames f
 AtlasFieldMapCo...   INFO updateFieldMap: found map of type GlobalMap with soleCur=7730 toroCur=20400 (path file:MagneticFieldMaps/bfieldmap_7730_20400_14m.root)
 AtlasFieldMapCo...   INFO updateFieldMap: found map of type SolenoidMap with soleCur=7730 toroCur=0 (path file:MagneticFieldMaps/bfieldmap_7730_0_14m.root)
 AtlasFieldMapCo...   INFO updateFieldMap: found map of type ToroidMap with soleCur=0 toroCur=20400 (path file:MagneticFieldMaps/bfieldmap_0_20400_14m.root)
-AtlasFieldMapCo...   INFO updateFieldMap: tagInfoH  ( 'TagInfo' , 'DetectorStore+ProcessingTags' )  is valid. 
+AtlasFieldMapCo...   INFO checkCurrentFromConditions: Range of input currents is {[0,0,t:0] - [t:4294967294.854775807]}
+AtlasFieldMapCo...   INFO checkCurrentFromConditions: Attempt 1 at reading currents from DCS (using channel name)
+AtlasFieldMapCo...   INFO checkCurrentFromConditions: Trying to read from DCS: [channel name, index, value] CentralSol_Current , 1 , 7730
+AtlasFieldMapCo...   INFO checkCurrentFromConditions: Trying to read from DCS: [channel name, index, value] CentralSol_SCurrent , 2 , 7730
+AtlasFieldMapCo...   INFO checkCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_Current , 3 , 20400
+AtlasFieldMapCo...   INFO checkCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20400
+AtlasFieldMapCo...   INFO checkCurrentFromConditions: Currents read from DCS - solenoid 7730 toroid 20400
+AtlasFieldMapCo...   INFO updateFieldMap: currents are OK, will use nominal maps
+AtlasFieldMapCo...   INFO updateFieldMap: found TagInfoMgr 
 AtlasFieldMapCo...   INFO updateFieldMap: DID NOT reset currents from TagInfo
 AtlasFieldMapCo...   INFO updateFieldMap: Set map currents from FieldSvc: solenoid/toroid 7730,20400
 AtlasFieldMapCo...   INFO updateFieldMap: Use map file MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldMapCo...   INFO updateFieldMap: Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
+AtlasFieldMapCo...   INFO updateFieldMap: Initialized the field map from /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
 AtlasFieldMapCo...   INFO execute: solenoid zone id  7000
-AtlasFieldMapCo...   INFO execute: recored AtlasFieldMapCondObj with field map
-AtlasFieldCache...   INFO UpdateCurrentFromConditions  
+AtlasFieldMapCo...   INFO execute: recorded AtlasFieldMapCondObj with EventRange {[0,l:0] - [INVALID]}
 AtlasFieldCache...   INFO UpdateCurrentFromConditions: Range of input/output is {[0,0,t:0] - [t:4294967294.854775807]}
 AtlasFieldCache...   INFO UpdateCurrentFromConditions: Attempt 1 at reading currents from DCS (using channel name)
 AtlasFieldCache...   INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] CentralSol_Current , 1 , 7730
@@ -452,73 +449,61 @@ AtlasFieldCache...   INFO UpdateCurrentFromConditions: Trying to read from DCS:
 AtlasFieldCache...   INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_Current , 3 , 20400
 AtlasFieldCache...   INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20400
 AtlasFieldCache...   INFO UpdateCurrentFromConditions: Currents read from DCS - solenoid 7730 toroid 20400
-AtlasFieldCache...   INFO scaleField: Solenoid field scale factor 1. Solenoid and map currents: 7730,7730
-AtlasFieldCache...   INFO scaleField: Toroid field scale factor 1. Toroid and map currents: 20400,20400
-AtlasFieldCache...   INFO execute: initialized AtlasFieldCacheCondObj and cache with SFs - sol/tor 1/1
+AtlasFieldCache...   INFO scaleField: Solenoid field scale factor 1. Desired current and map current: 7730,7730
+AtlasFieldCache...   INFO scaleField: Toroid field scale factor 1. Desired current and map current: 20400,20400
+AtlasFieldCache...   INFO execute: initialized AtlasFieldCacheCondObj and cache with SFs - sol/tor 1/1, EventRange {[0,0,t:0] - [t:4294967294.854775807]}
 AtlasFieldCache...   INFO execute: solenoid zone id  7000
-testalg1          VERBOSE execute
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
-testalg1          VERBOSE execute
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
+ElementTableCnv      INFO LayerMaterialMapCnv::initialize()
+Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 2B8BB54A-2F81-7B49-8484-60F83666998E
+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
 /cvmfs/atlas-co...   INFO Database being retired...
 Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] D0709FD7-6A55-E011-925D-002481043EC0
+testalg1          VERBOSE execute
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
 /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] 0E3CF1E5-143D-DB11-92C7-000CF1DA62DD
 /cvmfs/atlas-co...   INFO Database being retired...
 Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 8C5D7155-23E9-DC11-99B4-001320DCF58D
+/cvmfs/atlas-co...   INFO Database being retired...
+Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 2B8BB54A-2F81-7B49-8484-60F83666998E
+Domain[ROOT_All]     INFO >   Deaccess DbDomain     READ      [ROOT_All] 
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
+testalg1          VERBOSE execute
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
 Domain[ROOT_All]     INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 ApplicationMgr       INFO Application Manager Stopped successfully
-IncidentProcAlg1     INFO Finalize
 CondInputLoader      INFO Finalizing CondInputLoader...
-AtlasFieldMapCo...   INFO  in finalize 
-AtlasFieldCache...   INFO  in finalize 
-IncidentProcAlg2     INFO Finalize
-AtlasTrackingGe...   INFO finalize() successful.
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/1 objs/chan/bytes 4/4/20 ((     0.04 ))s
-IOVDbFolder          INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 ((     0.12 ))s
-IOVDbFolder          INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/1 objs/chan/bytes 1/1/231 ((     0.03 ))s
-IOVDbFolder          INFO Folder /Indet/Align (PoolRefColl) db-read 1/2 objs/chan/bytes 34/43/5440 ((     0.08 ))s
-IOVDbFolder          INFO Folder /Indet/IBLDist (AttrListColl) db-read 1/2 objs/chan/bytes 14/14/280 ((     0.03 ))s
-IOVDbFolder          INFO Folder /Indet/PixelDist (PoolRef) db-read 1/1 objs/chan/bytes 1/1/179 ((     0.02 ))s
-IOVDbFolder          INFO Folder /TRT/Align (PoolRefColl) db-read 1/1 objs/chan/bytes 32/32/5120 ((     0.09 ))s
-IOVDbSvc             INFO  bytes in ((      0.42 ))s
+IOVDbFolder          INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/1 objs/chan/bytes 4/4/20 ((     0.15 ))s
+IOVDbFolder          INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 ((     0.17 ))s
+IOVDbFolder          INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/1 objs/chan/bytes 1/1/231 ((     0.05 ))s
+IOVDbFolder          INFO Folder /Indet/Align (PoolRefColl) db-read 1/2 objs/chan/bytes 34/43/5440 ((     0.16 ))s
+IOVDbFolder          INFO Folder /Indet/IBLDist (AttrListColl) db-read 1/2 objs/chan/bytes 14/14/280 ((     0.09 ))s
+IOVDbFolder          INFO Folder /Indet/PixelDist (PoolRef) db-read 1/1 objs/chan/bytes 1/1/179 ((     0.10 ))s
+IOVDbFolder          INFO Folder /TRT/Align (PoolRefColl) db-read 1/1 objs/chan/bytes 32/32/5120 ((     0.14 ))s
+IOVDbSvc             INFO  bytes in ((      0.87 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_INDET/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: ((     0.13 ))s
-IOVDbSvc             INFO Connection COOLOFL_TRT/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: ((     0.09 ))s
-IOVDbSvc             INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.15 ))s
-IOVDbSvc             INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: ((     0.04 ))s
+IOVDbSvc             INFO Connection COOLOFL_INDET/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: ((     0.35 ))s
+IOVDbSvc             INFO Connection COOLOFL_TRT/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: ((     0.14 ))s
+IOVDbSvc             INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.22 ))s
+IOVDbSvc             INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: ((     0.15 ))s
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
-ToolSvc.InDetTr...   INFO finalize() successful
-ToolSvc.InDetTr...   INFO finalize() successful
-ToolSvc.InDetCy...   INFO finalize() successful
-AtlasTrackingGe...   INFO finalize() successful
-ToolSvc.Trackin...   INFO finalize() successful
-testalg1.TrkVKa...   INFO finalize() successful
-testalg1.TrkVKa...   INFO finalize() successful
-testalg1.TrkVKa...   INFO finalize() successful
 testalg1.TrkVKa...   INFO Trk::Extrapolator::Cache s_navigSurfsMax    = 0
 testalg1.TrkVKa...   INFO Trk::Extrapolator::Cache s_navigSurfsMax    = 0
 testalg1.TrkVKa...   INFO Trk::Extrapolator::Cache s_navigVolsMax     = 0
 testalg1.TrkVKa...   INFO Trk::Extrapolator::Cache s_navigVolsIntMax  = 0
-testalg1.TrkVKa...   INFO Trk::Extrapolator::Cache s_containerSizeMax = 3
-testalg1.TrkVKa...   INFO finalize() successful
+testalg1.TrkVKa...   INFO Trk::Extrapolator::Cache s_containerSizeMax = 0
 testalg1.TrkVKa...   INFO TrkVKalVrtFitter finalize() successful
-ToolSvc.InDetLa...   INFO finalize() successful
-ToolSvc.LayerAr...   INFO finalize() successful
-ToolSvc.AtlasMu...   INFO finalize() successful
-ToolSvc.AtlasEn...   INFO finalize() successful
-ToolSvc.Trackin...   INFO finalize() successful
+AtlasTrackingGe...   INFO finalize() successful
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot=  160 [ms] Ave/Min/Max= 1.57(+-   12)/    0/  120 [ms] #=102
-cObj_ALL             INFO Time User   : Tot=  190 [ms] Ave/Min/Max= 21.1(+- 43.1)/    0/  140 [ms] #=  9
-ChronoStatSvc        INFO Time User   : Tot= 2.89  [s]                                             #=  1
+cObj_ALL             INFO Time User   : Tot=  100 [ms] Ave/Min/Max=    11.1(+-    24.7)/       0/      80 [ms] #=  9
+cObjR_ALL            INFO Time User   : Tot=  100 [ms] Ave/Min/Max=    0.98(+-    7.98)/       0/      80 [ms] #=102
+ChronoStatSvc        INFO Time User   : Tot= 1.61  [s]  #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully