From 5aa9bbfc48875a3bdcc28e6c617d132cfd7d2924 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Fri, 23 Dec 2016 05:03:46 +0100
Subject: [PATCH] 'Update reference files for Gaudi changes.'
 (ControlTest-00-02-71)

	* Tagging ControlTest-00-02-71.
	* Update reference files for Gaudi changes.

2016-12-13  scott snyder  <snyder@bnl.gov>

	* Tagging ControlTest-00-02-70.
	* Update for StoreGate-03-08-05.

2016-09-24  scott snyder  <snyder@bnl.gov>

	* Tagging ControlTest-00-02-69.
	* Update for StoreGate-03-07-14.

2016-08-26  scott snyder  <snyder@bnl.gov>

	* Tagging ControlTest-00-02-68.
	* Further clang-tidy fixes.
	* Tagging ControlTest-00-02-67.
	* clang-tidy: Use nullptr.
...
(Long ChangeLog diff - truncated)
---
 AtlasTest/ControlTest/CMakeLists.txt          |   4 +-
 AtlasTest/ControlTest/cmt/requirements        |   2 +-
 .../ControlTest/share/StoreGateDFlow.ref      | 215 +++---
 AtlasTest/ControlTest/share/StoreGateGen.ref  | 370 +++++-----
 .../ControlTest/share/StoreGateReentrant.ref  | 289 ++++----
 .../share/StoreGateSvcClient_test.ref         | 687 +++++++++---------
 .../ControlTest/test/ClearStore_test.cxx      |   2 +-
 AtlasTest/ControlTest/test/DataProxy_test.cxx |   4 +-
 .../test/ProxyProviderSvc_test.cxx            |  40 +-
 .../ControlTest/test/SGDataLink_test.cxx      |   2 +-
 .../test/StoreGateSvcClient_test.cxx          |  26 +-
 AtlasTest/ControlTest/test/StoreID_test.cxx   |   4 +-
 12 files changed, 801 insertions(+), 844 deletions(-)

diff --git a/AtlasTest/ControlTest/CMakeLists.txt b/AtlasTest/ControlTest/CMakeLists.txt
index b3861d46beb..c5c6462d7be 100644
--- a/AtlasTest/ControlTest/CMakeLists.txt
+++ b/AtlasTest/ControlTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 757711 2016-06-26 13:59:12Z ssnyder $
+# $Id: CMakeLists.txt 764877 2016-07-28 01:48:11Z ssnyder $
 ################################################################################
 # Package: ControlTest
 ################################################################################
@@ -111,7 +111,7 @@ endif()
 atlas_add_test( StoreGateReentrant
    SCRIPT test/StoreGateReentrant.sh
    PROPERTIES TIMEOUT 300
-   EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$${SGGoptignore}|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc" )
+   EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$${SGGoptignore}|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc|TExMapRemove" )
 
 atlas_add_test( StoreGateGen
    SCRIPT test/StoreGateGen.sh
diff --git a/AtlasTest/ControlTest/cmt/requirements b/AtlasTest/ControlTest/cmt/requirements
index a9d5a709475..10dc87460bf 100644
--- a/AtlasTest/ControlTest/cmt/requirements
+++ b/AtlasTest/ControlTest/cmt/requirements
@@ -85,7 +85,7 @@ use AthExStoreGateExample AthExStoreGateExample-*   Control/AthenaExamples -no_a
 apply_pattern athenarun_test name="StoreGateReentrant" \
 	      pre_script="../cmt/setup.sh"	\	      
 	      options="AthExStoreGateExample/StoreGateExample_Reentrant_jobOptions.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh StoreGateReentrant $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$$(SGGoptignore)|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc$(q)"
+	      post_script="${TESTTOOLSROOT}/share/post.sh StoreGateReentrant $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$$(SGGoptignore)|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc|TExMap::Remove$(q)"
 
 apply_pattern athenarun_test name="StoreGateGen" \
 	      pre_script="../cmt/setup.sh"	\	      
diff --git a/AtlasTest/ControlTest/share/StoreGateDFlow.ref b/AtlasTest/ControlTest/share/StoreGateDFlow.ref
index 83441933614..8d34ad868ac 100644
--- a/AtlasTest/ControlTest/share/StoreGateDFlow.ref
+++ b/AtlasTest/ControlTest/share/StoreGateDFlow.ref
@@ -1,28 +1,21 @@
-Tue May  3 22:27:15 CEST 2016
+Fri Sep 23 20:16:22 CEST 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-1.0.0] [x86_64-slc6-gcc49-opt] [private/private] -- built on [2016-05-03 22:07]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-09-23 13:38]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Warning in <TInterpreter::ReadRootmapFile>: class  Event found in libG4AtlasControlDict.so  is already in libtest_GPyTestDict.so 
-Warning in <TInterpreter::ReadRootmapFile>: class  L1CaloCoolChannelId found in libTrigT1CaloCalibConditionsDict.so  is already in libLArMonitoringDict.so 
-Warning in <TInterpreter::ReadRootmapFile>: class  UCharDbArray found in libStorageSvcDict.so  is already in libRootCnvDict.so 
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthExStoreGateExample/dflow_jobo.py"
-Py:ConfigurableDb    INFO Read module info for 5023 configurables from 66 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 66 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -D3PD__TrigConfMetadataTool: TriggerD3PDMaker.TriggerD3PDMakerConf - ['TrigCostD3PDMaker.TrigCostD3PDMakerConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+Py:ConfigurableDb    INFO Read module info for 5167 configurables from 57 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
-                                          running on lxplus018.cern.ch on Tue May  3 22:27:21 2016
+                                          running on lxplus003.cern.ch on Fri Sep 23 20:16:30 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -30,26 +23,21 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-19
-ClassIDSvc           INFO  getRegistryEntries: read 2109 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2297 CLIDRegistry entries for module ALL
 ChronoStatSvc        INFO  Number of skipped events for MemStat-1
 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) 
-AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-08
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-30
 AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
-ClassIDSvc           INFO  getRegistryEntries: read 492 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 512 CLIDRegistry entries for module ALL
 AthAlgSeq            INFO Member list: AthEx::DFlowAlg1/dflow_alg1, AthEx::DFlowAlg2/dflow_alg2, AthEx::DFlowAlg3/dflow_alg3
 dflow_alg1           INFO Initializing dflow_alg1...
 dflow_alg2           INFO Initializing dflow_alg2...
 dflow_alg3           INFO Initializing dflow_alg3...
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-06-40
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-02-07
 HistogramPersis...WARNING Histograms saving not required.
 EventSelector        INFO  Enter McEventSelector Initialization 
 AthenaEventLoopMgr   INFO Setup EventSelector service EventSelector
-ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-03-06-40
 ApplicationMgr       INFO Application Manager Initialized successfully
-StoreGateSvc         INFO Start StoreGateSvc
 ApplicationMgr       INFO Application Manager Started successfully
 EventPersistenc...   INFO Added successfully Conversion service:McCnvSvc
 AthenaEventLoopMgr   INFO   ===>>>  start of run 0    <<<===
@@ -58,7 +46,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 0
@@ -66,26 +54,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 0
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 20
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 20
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 20
 dflow_alg2           INFO val: 120
-dflow_alg2           INFO cptr: 0xffee950
+dflow_alg2           INFO cptr: 0x11ec58f8
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -95,20 +83,20 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffee950
+dflow_alg3           INFO ptr: 0x11ec58f8
 dflow_alg3           INFO val: 120
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x10667220
+dflow_alg3           INFO ptr: 0x12057760
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
 dflow_alg3           INFO val[1]= 120
 dflow_alg3           INFO val[2]= 10
 dflow_alg3           INFO val[3]= 120
-ClassIDSvc           INFO  getRegistryEntries: read 445 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 463 CLIDRegistry entries for module ALL
 dflow_alg3           INFO temporary r-handle[ints] - size: 4
 dflow_alg3           INFO compare pointers: ok=1
 dflow_alg3           INFO compare pointers: ok=1
@@ -121,9 +109,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -145,7 +131,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 1
@@ -153,26 +139,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 1
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 21
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 21
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 21
 dflow_alg2           INFO val: 121
-dflow_alg2           INFO cptr: 0xffeeaf0
+dflow_alg2           INFO cptr: 0x11ec5758
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -182,13 +168,13 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffeeaf0
+dflow_alg3           INFO ptr: 0x11ec5758
 dflow_alg3           INFO val: 121
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x10666300
+dflow_alg3           INFO ptr: 0x12057600
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -207,9 +193,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -231,7 +215,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 2
@@ -239,26 +223,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 2
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 22
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 22
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 22
 dflow_alg2           INFO val: 122
-dflow_alg2           INFO cptr: 0xffee950
+dflow_alg2           INFO cptr: 0x11ec58f8
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -268,13 +252,13 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffee950
+dflow_alg3           INFO ptr: 0x11ec58f8
 dflow_alg3           INFO val: 122
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x10667100
+dflow_alg3           INFO ptr: 0x12056840
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -293,9 +277,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -317,7 +299,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 3
@@ -325,26 +307,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 3
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 23
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 23
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 23
 dflow_alg2           INFO val: 123
-dflow_alg2           INFO cptr: 0xffeeaf0
+dflow_alg2           INFO cptr: 0x11ec5758
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -354,13 +336,13 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffeeaf0
+dflow_alg3           INFO ptr: 0x11ec5758
 dflow_alg3           INFO val: 123
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x106667e0
+dflow_alg3           INFO ptr: 0x12056fc0
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -379,9 +361,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -403,7 +383,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 4
@@ -411,26 +391,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 4
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 24
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 24
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 24
 dflow_alg2           INFO val: 124
-dflow_alg2           INFO cptr: 0xffee950
+dflow_alg2           INFO cptr: 0x11ec58f8
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -440,13 +420,13 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffee950
+dflow_alg3           INFO ptr: 0x11ec58f8
 dflow_alg3           INFO val: 124
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x106671c0
+dflow_alg3           INFO ptr: 0x12056800
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -465,9 +445,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -489,7 +467,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 5
@@ -497,26 +475,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 5
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 25
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 25
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 25
 dflow_alg2           INFO val: 125
-dflow_alg2           INFO cptr: 0xffeeaf0
+dflow_alg2           INFO cptr: 0x11ec5758
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -526,13 +504,13 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffeeaf0
+dflow_alg3           INFO ptr: 0x11ec5758
 dflow_alg3           INFO val: 125
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x106671a0
+dflow_alg3           INFO ptr: 0x120568c0
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -551,9 +529,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -575,7 +551,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 6
@@ -583,26 +559,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 6
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 26
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 26
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 26
 dflow_alg2           INFO val: 126
-dflow_alg2           INFO cptr: 0xffee950
+dflow_alg2           INFO cptr: 0x11ec58f8
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -612,13 +588,13 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffee950
+dflow_alg3           INFO ptr: 0x11ec58f8
 dflow_alg3           INFO val: 126
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x10666340
+dflow_alg3           INFO ptr: 0x12057500
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -637,9 +613,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -661,7 +635,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 7
@@ -669,26 +643,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 7
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 27
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 27
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 27
 dflow_alg2           INFO val: 127
-dflow_alg2           INFO cptr: 0xffeeaf0
+dflow_alg2           INFO cptr: 0x11ec5758
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -698,13 +672,13 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffeeaf0
+dflow_alg3           INFO ptr: 0x11ec5758
 dflow_alg3           INFO val: 127
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x10666f00
+dflow_alg3           INFO ptr: 0x12037f80
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -723,9 +697,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -747,7 +719,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 8
@@ -755,26 +727,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 8
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffee950
+dflow_alg1           INFO ptr: 0x11ec58f8
 dflow_alg1           INFO val: 28
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 28
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffee950
+dflow_alg2           INFO ptr: 0x11ec58f8
 dflow_alg2           INFO val: 28
 dflow_alg2           INFO val: 128
-dflow_alg2           INFO cptr: 0xffee950
+dflow_alg2           INFO cptr: 0x11ec58f8
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -784,13 +756,13 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffee950
+dflow_alg3           INFO ptr: 0x11ec58f8
 dflow_alg3           INFO val: 128
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x106670c0
+dflow_alg3           INFO ptr: 0x120571a0
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -809,9 +781,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -833,7 +803,7 @@ dflow_alg1           INFO evtinfo handle...
 dflow_alg1           INFO name: [McEventInfo]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [2101]
-dflow_alg1           INFO ei: 0x1068f040
+dflow_alg1           INFO ei: 0x12061a00
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 9
@@ -841,26 +811,26 @@ dflow_alg1           INFO myint handle...
 dflow_alg1           INFO name: [dflow_int]
 dflow_alg1           INFO store [StoreGateSvc]
 dflow_alg1           INFO clid: [244260744]
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 9
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0xffeeaf0
+dflow_alg1           INFO ptr: 0x11ec5758
 dflow_alg1           INFO val: 29
 dflow_alg2           INFO ================================
 dflow_alg2           INFO myint r-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 29
 dflow_alg2           INFO myint rw-handle...
 dflow_alg2           INFO name: [dflow_int]
 dflow_alg2           INFO store [StoreGateSvc]
 dflow_alg2           INFO clid: [244260744]
-dflow_alg2           INFO ptr: 0xffeeaf0
+dflow_alg2           INFO ptr: 0x11ec5758
 dflow_alg2           INFO val: 29
 dflow_alg2           INFO val: 129
-dflow_alg2           INFO cptr: 0xffeeaf0
+dflow_alg2           INFO cptr: 0x11ec5758
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -870,13 +840,13 @@ dflow_alg3           INFO myint r-handle...
 dflow_alg3           INFO name: [dflow_int]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [244260744]
-dflow_alg3           INFO ptr: 0xffeeaf0
+dflow_alg3           INFO ptr: 0x11ec5758
 dflow_alg3           INFO val: 129
 dflow_alg3           INFO ints r-handle...
 dflow_alg3           INFO name: [dflow_ints]
 dflow_alg3           INFO store [StoreGateSvc]
 dflow_alg3           INFO clid: [22592129]
-dflow_alg3           INFO ptr: 0x10666320
+dflow_alg3           INFO ptr: 0x12057660
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -895,9 +865,7 @@ dflow_alg3           INFO data mbr  r-handle[ints] - size: 4
 dflow_alg3           INFO data mbr rw-handle[ints] - size: 4
 dflow_alg3           INFO -- testing inexistant proxies --
 dflow_alg3           INFO name: --r-not-there--
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO valid:0
-VarHandle(Store...WARNING /afs/cern.ch/user/s/ssnyder/atlas-work3/Control/StoreGate/src/VarHandleBase.cxx:658 (void*SG::VarHandleBase::typeless_dataPointer_impl(bool)): could not get proxy for key --r-not-there--
 dflow_alg3           INFO name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -914,8 +882,6 @@ dflow_alg3           INFO valid:0
 dflow_alg3           INFO good, caught: [SG::ExcConstObject: Tried to retrieve non-const pointer to const object via VarHandleKey: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #9, run #0 10 events processed so far  <<<===
-StoreGateSvc         INFO Stop StoreGateSvc
-StoreGateSvc         INFO stop: setting service priority to 101 so that event stores get finalized and cleared before other stores
 ApplicationMgr       INFO Application Manager Stopped successfully
 dflow_alg1           INFO Finalizing dflow_alg1...
 dflow_alg2           INFO Finalizing dflow_alg2...
@@ -924,14 +890,13 @@ AthAlgSeq            INFO Finalizing AthAlgSeq...
 AthOutSeq            INFO Finalizing AthOutSeq...
 AthRegSeq            INFO Finalizing AthRegSeq...
 AthMasterSeq         INFO Finalizing AthMasterSeq...
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-03-06-40
 EventSelector        INFO finalize
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-ChronoStatSvc        INFO Time User   : Tot=  124 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  204 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/AtlasTest/ControlTest/share/StoreGateGen.ref b/AtlasTest/ControlTest/share/StoreGateGen.ref
index 12ca7df3824..6955380c58a 100644
--- a/AtlasTest/ControlTest/share/StoreGateGen.ref
+++ b/AtlasTest/ControlTest/share/StoreGateGen.ref
@@ -1,119 +1,117 @@
-Sat Mar 12 19:54:42 CET 2016
+Fri Dec 23 05:52:58 CET 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_6] -- built on [2016-03-11 22:40]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-opt] [private/private] -- built on [2016-12-23 05:01]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
+Warning in <TInterpreter::ReadRootmapFile>: class  xAOD::TReturnCode found in libxAODRootAccessDict.so  is already in libxAODRootAccess.so 
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthExStoreGateExample/StoreGateExample_Gen_jobOptions.py"
-Py:ConfigurableDb    INFO Read module info for 5022 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
+Py:ConfigurableDb    INFO Read module info for 4734 configurables from 51 genConfDb files
+Py:ConfigurableDb WARNING Found 3 duplicates among the 51 genConfDb files :
 Py:ConfigurableDb WARNING --------------------------------------------------
 Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
 Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigJetHypo.TrigJetHypoConf - ['TrigHLTJetHypo.TrigHLTJetHypoConf']
+Py:ConfigurableDb WARNING   -TrigEFRazorAllTE: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf', 'TrigJetHypo.TrigJetHypoConf']
+Py:ConfigurableDb WARNING   -TrigL2JetHypo: TrigJetHypo.TrigJetHypoConf - ['TrigCaloHypo.TrigCaloHypoConf']
+Py:ConfigurableDb WARNING   -TrigEFDPhiMetJetAllTE: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf', 'TrigJetHypo.TrigJetHypoConf']
 Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus031.cern.ch on Sat Mar 12 19:54:53 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v28r0)
+                                          running on lxplus032.cern.ch on Fri Dec 23 05:53:13 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+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 Initializing ClassIDSvc - package version CLIDComps-00-06-19
-ClassIDSvc           INFO  getRegistryEntries: read 2109 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2297 CLIDRegistry entries for module ALL
 ChronoStatSvc        INFO  Number of skipped events for MemStat-1
 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) 
-AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-02
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-45-01
 AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
 AthAlgSeq            INFO Member list: WriteData, ReadData
 WriteData            INFO in initialize()
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-06-31
+StoreGateSvc        DEBUG Property update for OutputLevel : new value = 1
+StoreGateSvc      VERBOSE Initializing StoreGateSvc - package version StoreGate-03-09-00
 StoreGateSvc        DEBUG Service base class initialized successfully
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-02-07
 ReadData             INFO in initialize()
 ReadData             INFO Data Object producer: WriteData
-HistogramPersis...WARNING Histograms saving not required.
-ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-03-06-31
+HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
-StoreGateSvc         INFO Start StoreGateSvc
+StoreGateSvc      VERBOSE Start StoreGateSvc
 ApplicationMgr       INFO Application Manager Started successfully
-StoreGateSvc        DEBUG Recorded object @0xde42300 with key  of type EventInfo(CLID 2101)
- in DataObject @0xdd238e0
- object modifiable when retrieved
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 WriteData            INFO in execute()
-StoreGateSvc        DEBUG Recorded object @0xd796540 with key  of type MyDataObj(CLID 8000)
- in DataObject @0xdd20050
+StoreGateSvc        DEBUG Recorded object @0x12deded0 with key  of type MyDataObj(CLID 8000)
+ in DataObject @0x15a8cff0
  object not modifiable when retrieved
-WriteData         WARNING we expect  an error message here
-StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key  and clid 8000
- Pre-existing valid DataProxy @0xde2fcd0 found in Store for key  with clid 8000
-ClassIDSvc           INFO  getRegistryEntries: read 1085 CLIDRegistry entries for module ALL
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xd796810
- recorded with key  of type MyDataObj (CLID 8000) in DataObject @0xdd20820
-WriteData         WARNING end of error message
-StoreGateSvc        DEBUG Recorded object @0xd7967d0 with key WriteData of type MyDataObj(CLID 8000)
- in DataObject @0xdd1d950
+WriteData         WARNING we expect  an error message here
+StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key  and clid 8000
+ Pre-existing valid DataProxy @0x15a6de30 found in Store for key  with clid 8000
+ClassIDSvc           INFO  getRegistryEntries: read 1127 CLIDRegistry entries for module ALL
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x12dec330
+ recorded with key  of type MyDataObj (CLID 8000) in DataObject @0x15a8cf50
+WriteData         WARNING end of error message
+StoreGateSvc        DEBUG Recorded object @0x12deddc0 with key WriteData of type MyDataObj(CLID 8000)
+ in DataObject @0x1596cad0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd43bd40 with key  of type DataVector<MyContObj>(CLID 9967)
- in DataObject @0xdd70f50
+StoreGateSvc        DEBUG Recorded object @0x151214e0 with key  of type DataVector<MyContObj>(CLID 9967)
+ in DataObject @0x158d9d50
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xdd59780 with key  of type std::vector<float>(CLID 202242136)
- in DataObject @0xdd2b610
+StoreGateSvc        DEBUG Recorded object @0x155fea20 with key  of type std::vector<float>(CLID 202242136)
+ in DataObject @0x1596bf90
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xdd5f240 with key  of type std::map<std::string,float>(CLID 193758082)
- in DataObject @0xdd324e0
+StoreGateSvc        DEBUG Recorded object @0x159c1080 with key  of type std::map<std::string,float>(CLID 193758082)
+ in DataObject @0x1596c940
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd796890 with key dobj2 of type MyDataObj(CLID 8000)
- in DataObject @0xdd42670
+StoreGateSvc        DEBUG Recorded object @0x12ded940 with key dobj2 of type MyDataObj(CLID 8000)
+ in DataObject @0x1596c3f0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd796700 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
- in DataObject @0xdd1a260
+StoreGateSvc        DEBUG Recorded object @0x12dedd50 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
+ in DataObject @0x1596a550
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xdd58c40 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
- in DataObject @0xdd23b10
+StoreGateSvc        DEBUG Recorded object @0x15a0b1c0 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
+ in DataObject @0x15a67020
  object not modifiable when retrieved
 WriteData            INFO  registered all data objects
 WriteData            INFO  StoreGate structure before returning from execute 
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 2 proxies for ClassID 1434 (BaseClass): 
- flags: (  valid,   locked,  reset) --- data:  0xdd20050 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd1d950 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data: 0x15a8cff0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x1596cad0 --- key: WriteData
 Found 1 proxy for ClassID 2101 (EventInfo): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd238e0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15a8c550 --- key: 
 Found 3 proxies for ClassID 8000 (MyDataObj): 
- flags: (  valid,   locked,  reset) --- data:  0xdd20050 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd1d950 --- key: WriteData
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd42670 --- key: dobj2
+ flags: (  valid,   locked,  reset) --- data: 0x15a8cff0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x1596cad0 --- key: WriteData
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x1596c3f0 --- key: dobj2
 Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
- flags: (  valid,   locked,  reset) --- data:  0xdd70f50 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x158d9d50 --- key: 
 Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
- flags: (  valid,   locked,  reset) --- data:  0xdd23b10 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x15a67020 --- key: 
 Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
- flags: (  valid,   locked,  reset) --- data:  0xdd1a260 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data: 0x1596a550 --- key: WriteData
 Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
- flags: (  valid,   locked,  reset) --- data:  0xdd324e0 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x1596c940 --- key: 
 Found 1 proxy for ClassID 202242136 (std::vector<float>): 
- flags: (  valid,   locked,  reset) --- data:  0xdd2b610 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x1596bf90 --- key: 
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 ReadData             INFO in execute()
 ReadData             INFO Get the MyDataObj recorded by WriteData
 StoreGateSvc        DEBUG Retrieved non-const handle to object WriteData  of type MyDataObj(CLID 8000)
-ReadData          WARNING FIXME loop of ConstIterator bombs
+ReadData          WARNING FIXME loop of ConstIterator bombs
 StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
  of type DataVector<MyContObj>(CLID 9967)
 ReadData             INFO Retrieved DataVector of MyContObj using a const pointer
@@ -133,91 +131,86 @@ ReadData             INFO ListVecLinks::linked element 3
 StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
 ReadData             INFO Retrieved vector of links
-ReadData             INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0xdd20434
-ReadData             INFO VectorMapLinks::linked element: key due - value 2 - stored as 0xdd2045c
+ReadData             INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0x15a67184
+ReadData             INFO VectorMapLinks::linked element: key due - value 2 - stored as 0x15a671ac
 ReadData             INFO  retrieve as BaseClass, print its address: 
 ReadData             INFO 0
-ReadData             INFO 0xd7967d0
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
+ReadData             INFO 0x12deddc0
 ReadData             INFO  EventInfo :  event: 1 run: 1
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2fcd0, recorded with key=, CLID=8000, containing data object @0xdd20050  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdd70cb0, recorded with key=WriteData, CLID=8000, containing data object @0xdd1d950  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2eae0, recorded with key=, CLID=2101, containing data object @0xdd238e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2fcd0, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdd70cb0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f720, recorded with key=dobj2, CLID=8000, containing data object @0xdd42670  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdd70930, recorded with key=, CLID=9967, containing data object @0xdd70f50  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f090, recorded with key=, CLID=9983, containing data object @0xdd23b10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2ee60, recorded with key=WriteData, CLID=9984, containing data object @0xdd1a260  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f560, recorded with key=, CLID=193758082, containing data object @0xdd324e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f020, recorded with key=, CLID=202242136, containing data object @0xdd2b610  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0xde8e0c0 with key  of type EventInfo(CLID 2101)
- in DataObject @0xdd2b610
- object modifiable when retrieved
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6de30, recorded with key=, CLID=8000, containing data object @0x15a8cff0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x158da060, recorded with key=WriteData, CLID=8000, containing data object @0x1596cad0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dd50, recorded with key=, CLID=2101, containing data object @0x15a8c550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6de30, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x158da060, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6df10, recorded with key=dobj2, CLID=8000, containing data object @0x1596c3f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x158d9490, recorded with key=, CLID=9967, containing data object @0x158d9d50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dea0, recorded with key=, CLID=9983, containing data object @0x15a67020  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6df80, recorded with key=WriteData, CLID=9984, containing data object @0x1596a550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dce0, recorded with key=, CLID=193758082, containing data object @0x1596c940  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dc70, recorded with key=, CLID=202242136, containing data object @0x1596bf90  ... -> DONE
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
 WriteData            INFO in execute()
-StoreGateSvc        DEBUG Recorded object @0xd796870 with key  of type MyDataObj(CLID 8000)
- in DataObject @0xdd324e0
+StoreGateSvc        DEBUG Recorded object @0x12ded7e0 with key  of type MyDataObj(CLID 8000)
+ in DataObject @0x1596c940
  object not modifiable when retrieved
-WriteData         WARNING we expect  an error message here
-StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key  and clid 8000
- Pre-existing valid DataProxy @0xde2fcd0 found in Store for key  with clid 8000
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xd796700
- recorded with key  of type MyDataObj (CLID 8000) in DataObject @0xdd1a260
-WriteData         WARNING end of error message
-StoreGateSvc        DEBUG Recorded object @0xd796890 with key WriteData of type MyDataObj(CLID 8000)
- in DataObject @0xdd23b10
+WriteData         WARNING we expect  an error message here
+StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key  and clid 8000
+ Pre-existing valid DataProxy @0x15a6de30 found in Store for key  with clid 8000
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x12dedd50
+ recorded with key  of type MyDataObj (CLID 8000) in DataObject @0x1596a550
+WriteData         WARNING end of error message
+StoreGateSvc        DEBUG Recorded object @0x12ded940 with key WriteData of type MyDataObj(CLID 8000)
+ in DataObject @0x15a67020
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd43bd40 with key  of type DataVector<MyContObj>(CLID 9967)
- in DataObject @0xdd70f50
+StoreGateSvc        DEBUG Recorded object @0x151214e0 with key  of type DataVector<MyContObj>(CLID 9967)
+ in DataObject @0x15a6ddc0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xdd586a0 with key  of type std::vector<float>(CLID 202242136)
- in DataObject @0xdd458b0
+StoreGateSvc        DEBUG Recorded object @0x155fe420 with key  of type std::vector<float>(CLID 202242136)
+ in DataObject @0x1596cc10
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xdd5ff60 with key  of type std::map<std::string,float>(CLID 193758082)
- in DataObject @0xdd42670
+StoreGateSvc        DEBUG Recorded object @0x1599b380 with key  of type std::map<std::string,float>(CLID 193758082)
+ in DataObject @0x1596c3f0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd796540 with key dobj2 of type MyDataObj(CLID 8000)
- in DataObject @0xdd238e0
+StoreGateSvc        DEBUG Recorded object @0x12deded0 with key dobj2 of type MyDataObj(CLID 8000)
+ in DataObject @0x15a8c550
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd796810 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
- in DataObject @0xdd1d950
+StoreGateSvc        DEBUG Recorded object @0x12dec330 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
+ in DataObject @0x1596cad0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xde29520 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
- in DataObject @0xdd20820
+StoreGateSvc        DEBUG Recorded object @0x15a709a0 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
+ in DataObject @0x15a8cf50
  object not modifiable when retrieved
 WriteData            INFO  registered all data objects
 WriteData            INFO  StoreGate structure before returning from execute 
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 2 proxies for ClassID 1434 (BaseClass): 
- flags: (  valid,   locked,  reset) --- data:  0xdd324e0 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd23b10 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data: 0x1596c940 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15a67020 --- key: WriteData
 Found 1 proxy for ClassID 2101 (EventInfo): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd2b610 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x1596bf90 --- key: 
 Found 3 proxies for ClassID 8000 (MyDataObj): 
- flags: (  valid,   locked,  reset) --- data:  0xdd324e0 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd23b10 --- key: WriteData
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd238e0 --- key: dobj2
+ flags: (  valid,   locked,  reset) --- data: 0x1596c940 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15a67020 --- key: WriteData
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15a8c550 --- key: dobj2
 Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
- flags: (  valid,   locked,  reset) --- data:  0xdd70f50 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x15a6ddc0 --- key: 
 Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
- flags: (  valid,   locked,  reset) --- data:  0xdd20820 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x15a8cf50 --- key: 
 Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
- flags: (  valid,   locked,  reset) --- data:  0xdd1d950 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data: 0x1596cad0 --- key: WriteData
 Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
- flags: (  valid,   locked,  reset) --- data:  0xdd42670 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x1596c3f0 --- key: 
 Found 1 proxy for ClassID 202242136 (std::vector<float>): 
- flags: (  valid,   locked,  reset) --- data:  0xdd458b0 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x1596cc10 --- key: 
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 ReadData             INFO in execute()
 ReadData             INFO Get the MyDataObj recorded by WriteData
 StoreGateSvc        DEBUG Retrieved non-const handle to object WriteData  of type MyDataObj(CLID 8000)
-ReadData          WARNING FIXME loop of ConstIterator bombs
+ReadData          WARNING FIXME loop of ConstIterator bombs
 StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
  of type DataVector<MyContObj>(CLID 9967)
 ReadData             INFO Retrieved DataVector of MyContObj using a const pointer
@@ -237,91 +230,86 @@ ReadData             INFO ListVecLinks::linked element 3
 StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
 ReadData             INFO Retrieved vector of links
-ReadData             INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0xdd20074
-ReadData             INFO VectorMapLinks::linked element: key due - value 2 - stored as 0xdd2009c
+ReadData             INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0x15a8d014
+ReadData             INFO VectorMapLinks::linked element: key due - value 2 - stored as 0x15a8d03c
 ReadData             INFO  retrieve as BaseClass, print its address: 
 ReadData             INFO 0
-ReadData             INFO 0xd796890
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
+ReadData             INFO 0x12ded940
 ReadData             INFO  EventInfo :  event: 2 run: 1
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2fcd0, recorded with key=, CLID=8000, containing data object @0xdd324e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdd70cb0, recorded with key=WriteData, CLID=8000, containing data object @0xdd23b10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2eae0, recorded with key=, CLID=2101, containing data object @0xdd2b610  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2fcd0, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdd70cb0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f720, recorded with key=dobj2, CLID=8000, containing data object @0xdd238e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdd70930, recorded with key=, CLID=9967, containing data object @0xdd70f50  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f090, recorded with key=, CLID=9983, containing data object @0xdd20820  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2ee60, recorded with key=WriteData, CLID=9984, containing data object @0xdd1d950  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f560, recorded with key=, CLID=193758082, containing data object @0xdd42670  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f020, recorded with key=, CLID=202242136, containing data object @0xdd458b0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0xdde3580 with key  of type EventInfo(CLID 2101)
- in DataObject @0xdd458b0
- object modifiable when retrieved
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6de30, recorded with key=, CLID=8000, containing data object @0x1596c940  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x158da060, recorded with key=WriteData, CLID=8000, containing data object @0x15a67020  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dd50, recorded with key=, CLID=2101, containing data object @0x1596bf90  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6de30, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x158da060, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6df10, recorded with key=dobj2, CLID=8000, containing data object @0x15a8c550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x158d9490, recorded with key=, CLID=9967, containing data object @0x15a6ddc0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dea0, recorded with key=, CLID=9983, containing data object @0x15a8cf50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6df80, recorded with key=WriteData, CLID=9984, containing data object @0x1596cad0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dce0, recorded with key=, CLID=193758082, containing data object @0x1596c3f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dc70, recorded with key=, CLID=202242136, containing data object @0x1596cc10  ... -> DONE
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #3, run #1 2 events processed so far  <<<===
 WriteData            INFO in execute()
-StoreGateSvc        DEBUG Recorded object @0xd7967d0 with key  of type MyDataObj(CLID 8000)
- in DataObject @0xdd42670
+StoreGateSvc        DEBUG Recorded object @0x12deddc0 with key  of type MyDataObj(CLID 8000)
+ in DataObject @0x1596c3f0
  object not modifiable when retrieved
-WriteData         WARNING we expect  an error message here
-StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key  and clid 8000
- Pre-existing valid DataProxy @0xde2fcd0 found in Store for key  with clid 8000
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xd796810
- recorded with key  of type MyDataObj (CLID 8000) in DataObject @0xdd1d950
-WriteData         WARNING end of error message
-StoreGateSvc        DEBUG Recorded object @0xd796540 with key WriteData of type MyDataObj(CLID 8000)
- in DataObject @0xdd20820
+WriteData         WARNING we expect  an error message here
+StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key  and clid 8000
+ Pre-existing valid DataProxy @0x15a6de30 found in Store for key  with clid 8000
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x12dec330
+ recorded with key  of type MyDataObj (CLID 8000) in DataObject @0x1596cad0
+WriteData         WARNING end of error message
+StoreGateSvc        DEBUG Recorded object @0x12deded0 with key WriteData of type MyDataObj(CLID 8000)
+ in DataObject @0x15a8cf50
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd43bd40 with key  of type DataVector<MyContObj>(CLID 9967)
- in DataObject @0xdd70f50
+StoreGateSvc        DEBUG Recorded object @0x151214e0 with key  of type DataVector<MyContObj>(CLID 9967)
+ in DataObject @0x158d9d50
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd48b9a0 with key  of type std::vector<float>(CLID 202242136)
- in DataObject @0xdd20410
+StoreGateSvc        DEBUG Recorded object @0x15a0ac00 with key  of type std::vector<float>(CLID 202242136)
+ in DataObject @0x15a67160
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xdd5ff90 with key  of type std::map<std::string,float>(CLID 193758082)
- in DataObject @0xdd238e0
+StoreGateSvc        DEBUG Recorded object @0x159cbe90 with key  of type std::map<std::string,float>(CLID 193758082)
+ in DataObject @0x15a8c550
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd796870 with key dobj2 of type MyDataObj(CLID 8000)
- in DataObject @0xdd2b610
+StoreGateSvc        DEBUG Recorded object @0x12ded7e0 with key dobj2 of type MyDataObj(CLID 8000)
+ in DataObject @0x1596bf90
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xd796700 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
- in DataObject @0xdd23b10
+StoreGateSvc        DEBUG Recorded object @0x12dedd50 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
+ in DataObject @0x15a67020
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xde29d00 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
- in DataObject @0xdd1a260
+StoreGateSvc        DEBUG Recorded object @0x155fe5c0 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
+ in DataObject @0x1596a550
  object not modifiable when retrieved
 WriteData            INFO  registered all data objects
 WriteData            INFO  StoreGate structure before returning from execute 
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 2 proxies for ClassID 1434 (BaseClass): 
- flags: (  valid,   locked,  reset) --- data:  0xdd42670 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd20820 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data: 0x1596c3f0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15a8cf50 --- key: WriteData
 Found 1 proxy for ClassID 2101 (EventInfo): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd458b0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x1596cc10 --- key: 
 Found 3 proxies for ClassID 8000 (MyDataObj): 
- flags: (  valid,   locked,  reset) --- data:  0xdd42670 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd20820 --- key: WriteData
- flags: (  valid, UNLOCKED,  reset) --- data:  0xdd2b610 --- key: dobj2
+ flags: (  valid,   locked,  reset) --- data: 0x1596c3f0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15a8cf50 --- key: WriteData
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x1596bf90 --- key: dobj2
 Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
- flags: (  valid,   locked,  reset) --- data:  0xdd70f50 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x158d9d50 --- key: 
 Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
- flags: (  valid,   locked,  reset) --- data:  0xdd1a260 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x1596a550 --- key: 
 Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
- flags: (  valid,   locked,  reset) --- data:  0xdd23b10 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data: 0x15a67020 --- key: WriteData
 Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
- flags: (  valid,   locked,  reset) --- data:  0xdd238e0 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x15a8c550 --- key: 
 Found 1 proxy for ClassID 202242136 (std::vector<float>): 
- flags: (  valid,   locked,  reset) --- data:  0xdd20410 --- key: 
+ flags: (  valid,   locked,  reset) --- data: 0x15a67160 --- key: 
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 ReadData             INFO in execute()
 ReadData             INFO Get the MyDataObj recorded by WriteData
 StoreGateSvc        DEBUG Retrieved non-const handle to object WriteData  of type MyDataObj(CLID 8000)
-ReadData          WARNING FIXME loop of ConstIterator bombs
+ReadData          WARNING FIXME loop of ConstIterator bombs
 StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
  of type DataVector<MyContObj>(CLID 9967)
 ReadData             INFO Retrieved DataVector of MyContObj using a const pointer
@@ -341,29 +329,27 @@ ReadData             INFO ListVecLinks::linked element 3
 StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
 ReadData             INFO Retrieved vector of links
-ReadData             INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0xdd32504
-ReadData             INFO VectorMapLinks::linked element: key due - value 2 - stored as 0xdd3252c
+ReadData             INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0x1596c964
+ReadData             INFO VectorMapLinks::linked element: key due - value 2 - stored as 0x1596c98c
 ReadData             INFO  retrieve as BaseClass, print its address: 
 ReadData             INFO 0
-ReadData             INFO 0xd796540
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
+ReadData             INFO 0x12deded0
 ReadData             INFO  EventInfo :  event: 3 run: 1
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #3, run #1 3 events processed so far  <<<===
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2fcd0, recorded with key=, CLID=8000, containing data object @0xdd42670  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdd70cb0, recorded with key=WriteData, CLID=8000, containing data object @0xdd20820  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2eae0, recorded with key=, CLID=2101, containing data object @0xdd458b0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2fcd0, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdd70cb0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f720, recorded with key=dobj2, CLID=8000, containing data object @0xdd2b610  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdd70930, recorded with key=, CLID=9967, containing data object @0xdd70f50  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f090, recorded with key=, CLID=9983, containing data object @0xdd1a260  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2ee60, recorded with key=WriteData, CLID=9984, containing data object @0xdd23b10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f560, recorded with key=, CLID=193758082, containing data object @0xdd238e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde2f020, recorded with key=, CLID=202242136, containing data object @0xdd20410  ... -> DONE
-StoreGateSvc         INFO Stop StoreGateSvc
-StoreGateSvc         INFO stop: setting service priority to 101 so that event stores get finalized and cleared before other stores
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6de30, recorded with key=, CLID=8000, containing data object @0x1596c3f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x158da060, recorded with key=WriteData, CLID=8000, containing data object @0x15a8cf50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dd50, recorded with key=, CLID=2101, containing data object @0x1596cc10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6de30, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x158da060, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6df10, recorded with key=dobj2, CLID=8000, containing data object @0x1596bf90  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x158d9490, recorded with key=, CLID=9967, containing data object @0x158d9d50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dea0, recorded with key=, CLID=9983, containing data object @0x1596a550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6df80, recorded with key=WriteData, CLID=9984, containing data object @0x15a67020  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dce0, recorded with key=, CLID=193758082, containing data object @0x15a8c550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15a6dc70, recorded with key=, CLID=202242136, containing data object @0x15a67160  ... -> DONE
+StoreGateSvc      VERBOSE Stop StoreGateSvc
+StoreGateSvc      VERBOSE stop: setting service priority to 101 so that event stores get finalized and cleared before other stores
 ApplicationMgr       INFO Application Manager Stopped successfully
 WriteData            INFO in finalize()
 ReadData             INFO in finalize()
@@ -371,25 +357,25 @@ AthAlgSeq            INFO Finalizing AthAlgSeq...
 AthOutSeq            INFO Finalizing AthOutSeq...
 AthRegSeq            INFO Finalizing AthRegSeq...
 AthMasterSeq         INFO Finalizing AthMasterSeq...
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-03-06-31
+StoreGateSvc      VERBOSE Finalizing StoreGateSvc - package version StoreGate-03-09-00
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde2fcd0, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdd70cb0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde2eae0, recorded with key=, CLID=2101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde2fcd0, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdd70cb0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde2f720, recorded with key=dobj2, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdd70930, recorded with key=, CLID=9967, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde2f090, recorded with key=, CLID=9983, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde2ee60, recorded with key=WriteData, CLID=9984, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde2f560, recorded with key=, CLID=193758082, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde2f020, recorded with key=, CLID=202242136, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15a6de30, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x158da060, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15a6dd50, recorded with key=, CLID=2101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15a6de30, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x158da060, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15a6df10, recorded with key=dobj2, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x158d9490, recorded with key=, CLID=9967, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15a6dea0, recorded with key=, CLID=9983, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15a6df80, recorded with key=WriteData, CLID=9984, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15a6dce0, recorded with key=, CLID=193758082, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15a6dc70, recorded with key=, CLID=202242136, containing data object @0  ... -> DONE
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-ChronoStatSvc        INFO Time User   : Tot=  133 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  120 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/AtlasTest/ControlTest/share/StoreGateReentrant.ref b/AtlasTest/ControlTest/share/StoreGateReentrant.ref
index bde2b3e5a9c..3ba2ff444c1 100644
--- a/AtlasTest/ControlTest/share/StoreGateReentrant.ref
+++ b/AtlasTest/ControlTest/share/StoreGateReentrant.ref
@@ -1,89 +1,90 @@
-Mon Apr 25 10:31:42 EDT 2016
-WARNING: TCMALLOCDIR not defined, will use libc malloc
+Fri Dec 23 05:48:30 CET 2016
+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.0] [x86_64-slc6-gcc49-opt] [private/private] -- built on [2016-12-23 05:01]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Warning in <TInterpreter::ReadRootmapFile>: class  Event found in libG4AtlasControlDict.so  is already in libzzllqq_matelemDict.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  xAOD::TReturnCode found in libxAODRootAccessDict.so  is already in libxAODRootAccess.so 
 Py:Athena            INFO executing ROOT6Setup
-Py:Athena            INFO including file "AthenaCommon/Execution.py"
-Py:Athena            INFO including file "/home/sss/atlas/rootaccess/build/joboptions/AthExStoreGateExample/StoreGateExample_Reentrant_jobOptions.py"
-Py:ConfigurableDb    INFO Read module info for 3965 configurables from 4 genConfDb files
-Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+[?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
+Py:Athena            INFO including file "AthExStoreGateExample/StoreGateExample_Reentrant_jobOptions.py"
+Py:ConfigurableDb    INFO Read module info for 4734 configurables from 51 genConfDb files
+Py:ConfigurableDb WARNING Found 3 duplicates among the 51 genConfDb files :
+Py:ConfigurableDb WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
+Py:ConfigurableDb WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -TrigEFRazorAllTE: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf', 'TrigJetHypo.TrigJetHypoConf']
+Py:ConfigurableDb WARNING   -TrigL2JetHypo: TrigJetHypo.TrigJetHypoConf - ['TrigCaloHypo.TrigCaloHypoConf']
+Py:ConfigurableDb WARNING   -TrigEFDPhiMetJetAllTE: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf', 'TrigJetHypo.TrigJetHypoConf']
+Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-# setting LC_ALL to "C"
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
-                                          running on karma on Mon Apr 25 10:32:06 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v28r0)
+                                          running on lxplus032.cern.ch on Fri Dec 23 05:48:40 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+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 Initializing ClassIDSvc - package version CLIDComps-00-00-00
-ClassIDSvc           INFO  getRegistryEntries: read 2109 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2297 CLIDRegistry entries for module ALL
 ChronoStatSvc        INFO  Number of skipped events for MemStat-1
 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) 
-AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-45-01
 AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
-ClassIDSvc           INFO  getRegistryEntries: read 1036 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 768 CLIDRegistry entries for module ALL
 AthAlgSeq            INFO Member list: WriteDataReentrant, ReadDataReentrant
 WriteDataReentrant   INFO in initialize()
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-00-00-00
+StoreGateSvc        DEBUG Property update for OutputLevel : new value = 1
+StoreGateSvc      VERBOSE Initializing StoreGateSvc - package version StoreGate-03-09-00
 StoreGateSvc        DEBUG Service base class initialized successfully
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
 ReadDataReentrant    INFO in initialize()
-HistogramPersis...WARNING Histograms saving not required.
-ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-00-00-00
+HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
-StoreGateSvc         INFO Start StoreGateSvc
+StoreGateSvc      VERBOSE Start StoreGateSvc
 ApplicationMgr       INFO Application Manager Started successfully
-StoreGateSvc        DEBUG Recorded object @0xaf24550 with key  of type EventInfo(CLID 2101)
- in DataObject @0xaf586a0
- object modifiable when retrieved
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 WriteDataReentrant   INFO in execute()
-WriteDataReentrantWARNING we expect  an error message here
-StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key dobj and clid 8000
- Pre-existing valid DataProxy @0xaf647d0 found in Store for key dobj with clid 8000
-ClassIDSvc           INFO  getRegistryEntries: read 345 CLIDRegistry entries for module ALL
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xaf47220
- recorded with key dobj of type MyDataObj (CLID 8000) in DataObject @0xaf229c0
-VarHandle(Store...  ERROR Control/StoreGate/src/VarHandleBase.cxx:603 (StatusCode SG::VarHandleBase::record_impl(std::unique_ptr<DataObject>, void*, bool, bool)): code 0: recordObject failed
-WriteDataReentrantWARNING end of error message
+WriteDataReentrantWARNING we expect  an error message here
+StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key dobj and clid 8000
+ Pre-existing valid DataProxy @0x15965e30 found in Store for key dobj with clid 8000
+ClassIDSvc           INFO  getRegistryEntries: read 359 CLIDRegistry entries for module ALL
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x12cc8330
+ recorded with key dobj of type MyDataObj (CLID 8000) in DataObject @0x15986eb0
+VarHandle(Store...  ERROR /build2/atnight/localbuilds/nightlies/22.0.X-VAL/AtlasCore/rel_nightly/Control/StoreGate/src/VarHandleBase.cxx:603 (StatusCode SG::VarHandleBase::record_impl(std::unique_ptr<DataObject>, void*, bool, bool)): code 0: recordObject failed
+WriteDataReentrantWARNING end of error message
 WriteDataReentrant   INFO  registered all data objects
 WriteDataReentrant   INFO  StoreGate structure before returning from execute 
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 2 proxies for ClassID 1434 (BaseClass): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xac6da90 --- key: WriteDataReentrant
- flags: (  valid, UNLOCKED,  reset) --- data:  0xafaf980 --- key: dobj
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x1584cc10 --- key: WriteDataReentrant
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15986f50 --- key: dobj
 Found 1 proxy for ClassID 2101 (EventInfo): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf586a0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x159864b0 --- key: 
 Found 3 proxies for ClassID 8000 (MyDataObj): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xac6da90 --- key: WriteDataReentrant
- flags: (  valid, UNLOCKED,  reset) --- data:  0xafaf980 --- key: dobj
- flags: (  valid, UNLOCKED,  reset) --- data:  0x9eff850 --- key: dobj2
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x1584cc10 --- key: WriteDataReentrant
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15986f50 --- key: dobj
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15963e80 --- key: dobj2
 Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
- flags: (  valid,   locked,  reset) --- data:  0xaa7b7a0 --- key: cobj
+ flags: (  valid,   locked,  reset) --- data: 0x15965f10 --- key: cobj
 Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf65590 --- key: linkvec
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x159863c0 --- key: linkvec
 Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf65210 --- key: WriteDataReentrant
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15986280 --- key: WriteDataReentrant
 Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
- flags: (  valid,   locked,  reset) --- data:  0xaedd030 --- key: mkey
+ flags: (  valid,   locked,  reset) --- data: 0x159862d0 --- key: mkey
 Found 1 proxy for ClassID 202242136 (std::vector<float>): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf0a2a0 --- key: vFloat
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15960eb0 --- key: vFloat
 Found 1 proxy for ClassID 289238765 (TestDataObject): 
- flags: (  valid,   locked,  reset) --- data:  0xac918a0 --- key: testobj
+ flags: (  valid,   locked,  reset) --- data: 0x15963020 --- key: testobj
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 ReadDataReentrant    INFO in execute()
@@ -94,59 +95,56 @@ ReadDataReentrant    INFO pVec [1] = 2
 ReadDataReentrant    INFO pVec [2] = 3
 ReadDataReentrant    INFO ListVecLinks::linked element 1
 ReadDataReentrant    INFO ListVecLinks::linked element 3
-ReadDataReentrant    INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0xaf658bc
-ReadDataReentrant    INFO VectorMapLinks::linked element: key due - value 2 - stored as 0xaf658fc
+ReadDataReentrant    INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0x15961c44
+ReadDataReentrant    INFO VectorMapLinks::linked element: key due - value 2 - stored as 0x15961c6c
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf22bd0, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0xac6da90  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf647d0, recorded with key=dobj, CLID=8000, containing data object @0xafaf980  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xafaf8b0, recorded with key=, CLID=2101, containing data object @0xaf586a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf22bd0, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf647d0, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x9eff960, recorded with key=dobj2, CLID=8000, containing data object @0x9eff850  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xac65f50, recorded with key=cobj, CLID=9967, containing data object @0xaa7b7a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf656a0, recorded with key=linkvec, CLID=9983, containing data object @0xaf65590  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf65360, recorded with key=WriteDataReentrant, CLID=9984, containing data object @0xaf65210  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x9eff570, recorded with key=mkey, CLID=193758082, containing data object @0xaedd030  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x9efef00, recorded with key=vFloat, CLID=202242136, containing data object @0xaf0a2a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xa6e4bd0, recorded with key=testobj, CLID=289238765, containing data object @0xac918a0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0xaf24550 with key  of type EventInfo(CLID 2101)
- in DataObject @0xac918a0
- object modifiable when retrieved
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965c70, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0x1584cc10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965e30, recorded with key=dobj, CLID=8000, containing data object @0x15986f50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965d50, recorded with key=, CLID=2101, containing data object @0x159864b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965c70, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965e30, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15966060, recorded with key=dobj2, CLID=8000, containing data object @0x15963e80  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965f80, recorded with key=cobj, CLID=9967, containing data object @0x15965f10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15966140, recorded with key=linkvec, CLID=9983, containing data object @0x159863c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x159660d0, recorded with key=WriteDataReentrant, CLID=9984, containing data object @0x15986280  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965ff0, recorded with key=mkey, CLID=193758082, containing data object @0x159862d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965ea0, recorded with key=vFloat, CLID=202242136, containing data object @0x15960eb0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965ce0, recorded with key=testobj, CLID=289238765, containing data object @0x15963020  ... -> DONE
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
 WriteDataReentrant   INFO in execute()
-WriteDataReentrantWARNING we expect  an error message here
-StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key dobj and clid 8000
- Pre-existing valid DataProxy @0xaf647d0 found in Store for key dobj with clid 8000
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xaedcfb0
- recorded with key dobj of type MyDataObj (CLID 8000) in DataObject @0xaedd030
-VarHandle(Store...  ERROR Control/StoreGate/src/VarHandleBase.cxx:603 (StatusCode SG::VarHandleBase::record_impl(std::unique_ptr<DataObject>, void*, bool, bool)): code 0: recordObject failed
-WriteDataReentrantWARNING end of error message
+WriteDataReentrantWARNING we expect  an error message here
+StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key dobj and clid 8000
+ Pre-existing valid DataProxy @0x15965e30 found in Store for key dobj with clid 8000
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x12cc9870
+ recorded with key dobj of type MyDataObj (CLID 8000) in DataObject @0x159862d0
+VarHandle(Store...  ERROR /build2/atnight/localbuilds/nightlies/22.0.X-VAL/AtlasCore/rel_nightly/Control/StoreGate/src/VarHandleBase.cxx:603 (StatusCode SG::VarHandleBase::record_impl(std::unique_ptr<DataObject>, void*, bool, bool)): code 0: recordObject failed
+WriteDataReentrantWARNING end of error message
 WriteDataReentrant   INFO  registered all data objects
 WriteDataReentrant   INFO  StoreGate structure before returning from execute 
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 2 proxies for ClassID 1434 (BaseClass): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x9eff760 --- key: WriteDataReentrant
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf265d0 --- key: dobj
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15986280 --- key: WriteDataReentrant
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15963020 --- key: dobj
 Found 1 proxy for ClassID 2101 (EventInfo): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xac918a0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15960eb0 --- key: 
 Found 3 proxies for ClassID 8000 (MyDataObj): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x9eff760 --- key: WriteDataReentrant
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf265d0 --- key: dobj
- flags: (  valid, UNLOCKED,  reset) --- data:  0xafaf980 --- key: dobj2
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15986280 --- key: WriteDataReentrant
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15963020 --- key: dobj
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x159864b0 --- key: dobj2
 Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
- flags: (  valid,   locked,  reset) --- data:  0xaf65c20 --- key: cobj
+ flags: (  valid,   locked,  reset) --- data: 0x15965dc0 --- key: cobj
 Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xac6da90 --- key: linkvec
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x1584cc10 --- key: linkvec
 Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf22920 --- key: WriteDataReentrant
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15986f50 --- key: WriteDataReentrant
 Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
- flags: (  valid,   locked,  reset) --- data:  0xaf65590 --- key: mkey
+ flags: (  valid,   locked,  reset) --- data: 0x15963e80 --- key: mkey
 Found 1 proxy for ClassID 202242136 (std::vector<float>): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf65210 --- key: vFloat
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15962530 --- key: vFloat
 Found 1 proxy for ClassID 289238765 (TestDataObject): 
- flags: (  valid,   locked,  reset) --- data:  0x9eff710 --- key: testobj
+ flags: (  valid,   locked,  reset) --- data: 0x159863c0 --- key: testobj
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 ReadDataReentrant    INFO in execute()
@@ -157,59 +155,56 @@ ReadDataReentrant    INFO pVec [1] = 2
 ReadDataReentrant    INFO pVec [2] = 3
 ReadDataReentrant    INFO ListVecLinks::linked element 1
 ReadDataReentrant    INFO ListVecLinks::linked element 3
-ReadDataReentrant    INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0xaf0c49c
-ReadDataReentrant    INFO VectorMapLinks::linked element: key due - value 2 - stored as 0xaf0c4dc
+ReadDataReentrant    INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0x15986ed4
+ReadDataReentrant    INFO VectorMapLinks::linked element: key due - value 2 - stored as 0x15986efc
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf22bd0, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0x9eff760  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf647d0, recorded with key=dobj, CLID=8000, containing data object @0xaf265d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xafaf8b0, recorded with key=, CLID=2101, containing data object @0xac918a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf22bd0, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf647d0, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x9eff960, recorded with key=dobj2, CLID=8000, containing data object @0xafaf980  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xac65f50, recorded with key=cobj, CLID=9967, containing data object @0xaf65c20  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf656a0, recorded with key=linkvec, CLID=9983, containing data object @0xac6da90  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf65360, recorded with key=WriteDataReentrant, CLID=9984, containing data object @0xaf22920  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x9eff570, recorded with key=mkey, CLID=193758082, containing data object @0xaf65590  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x9efef00, recorded with key=vFloat, CLID=202242136, containing data object @0xaf65210  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xa6e4bd0, recorded with key=testobj, CLID=289238765, containing data object @0x9eff710  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0xaf24550 with key  of type EventInfo(CLID 2101)
- in DataObject @0x9eff710
- object modifiable when retrieved
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965c70, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0x15986280  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965e30, recorded with key=dobj, CLID=8000, containing data object @0x15963020  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965d50, recorded with key=, CLID=2101, containing data object @0x15960eb0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965c70, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965e30, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15966060, recorded with key=dobj2, CLID=8000, containing data object @0x159864b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965f80, recorded with key=cobj, CLID=9967, containing data object @0x15965dc0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15966140, recorded with key=linkvec, CLID=9983, containing data object @0x1584cc10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x159660d0, recorded with key=WriteDataReentrant, CLID=9984, containing data object @0x15986f50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965ff0, recorded with key=mkey, CLID=193758082, containing data object @0x15963e80  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965ea0, recorded with key=vFloat, CLID=202242136, containing data object @0x15962530  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965ce0, recorded with key=testobj, CLID=289238765, containing data object @0x159863c0  ... -> DONE
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #3, run #1 2 events processed so far  <<<===
 WriteDataReentrant   INFO in execute()
-WriteDataReentrantWARNING we expect  an error message here
-StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key dobj and clid 8000
- Pre-existing valid DataProxy @0xaf647d0 found in Store for key dobj with clid 8000
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xaf654d0
- recorded with key dobj of type MyDataObj (CLID 8000) in DataObject @0xaf65590
-VarHandle(Store...  ERROR Control/StoreGate/src/VarHandleBase.cxx:603 (StatusCode SG::VarHandleBase::record_impl(std::unique_ptr<DataObject>, void*, bool, bool)): code 0: recordObject failed
-WriteDataReentrantWARNING end of error message
+WriteDataReentrantWARNING we expect  an error message here
+StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key dobj and clid 8000
+ Pre-existing valid DataProxy @0x15965e30 found in Store for key dobj with clid 8000
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x12cc8330
+ recorded with key dobj of type MyDataObj (CLID 8000) in DataObject @0x15963e80
+VarHandle(Store...  ERROR /build2/atnight/localbuilds/nightlies/22.0.X-VAL/AtlasCore/rel_nightly/Control/StoreGate/src/VarHandleBase.cxx:603 (StatusCode SG::VarHandleBase::record_impl(std::unique_ptr<DataObject>, void*, bool, bool)): code 0: recordObject failed
+WriteDataReentrantWARNING end of error message
 WriteDataReentrant   INFO  registered all data objects
 WriteDataReentrant   INFO  StoreGate structure before returning from execute 
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 2 proxies for ClassID 1434 (BaseClass): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf586a0 --- key: WriteDataReentrant
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf229c0 --- key: dobj
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15986f50 --- key: WriteDataReentrant
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x159863c0 --- key: dobj
 Found 1 proxy for ClassID 2101 (EventInfo): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x9eff710 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15962530 --- key: 
 Found 3 proxies for ClassID 8000 (MyDataObj): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf586a0 --- key: WriteDataReentrant
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf229c0 --- key: dobj
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf0a2a0 --- key: dobj2
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15986f50 --- key: WriteDataReentrant
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x159863c0 --- key: dobj
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15960eb0 --- key: dobj2
 Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
- flags: (  valid,   locked,  reset) --- data:  0xaa7b7a0 --- key: cobj
+ flags: (  valid,   locked,  reset) --- data: 0x15965f10 --- key: cobj
 Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x9eff760 --- key: linkvec
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15986280 --- key: linkvec
 Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf265d0 --- key: WriteDataReentrant
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15963020 --- key: WriteDataReentrant
 Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
- flags: (  valid,   locked,  reset) --- data:  0xac6da90 --- key: mkey
+ flags: (  valid,   locked,  reset) --- data: 0x159864b0 --- key: mkey
 Found 1 proxy for ClassID 202242136 (std::vector<float>): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0xaf22920 --- key: vFloat
+ flags: (  valid, UNLOCKED,  reset) --- data: 0x15961c20 --- key: vFloat
 Found 1 proxy for ClassID 289238765 (TestDataObject): 
- flags: (  valid,   locked,  reset) --- data:  0x9eff850 --- key: testobj
+ flags: (  valid,   locked,  reset) --- data: 0x1584cc10 --- key: testobj
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 ReadDataReentrant    INFO in execute()
@@ -220,24 +215,24 @@ ReadDataReentrant    INFO pVec [1] = 2
 ReadDataReentrant    INFO pVec [2] = 3
 ReadDataReentrant    INFO ListVecLinks::linked element 1
 ReadDataReentrant    INFO ListVecLinks::linked element 3
-ReadDataReentrant    INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0xaf0c49c
-ReadDataReentrant    INFO VectorMapLinks::linked element: key due - value 2 - stored as 0xaf0c4dc
+ReadDataReentrant    INFO VectorMapLinks::linked element: key uno - value 1 - stored as 0x159862f4
+ReadDataReentrant    INFO VectorMapLinks::linked element: key due - value 2 - stored as 0x1598631c
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #3, run #1 3 events processed so far  <<<===
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf22bd0, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0xaf586a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf647d0, recorded with key=dobj, CLID=8000, containing data object @0xaf229c0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xafaf8b0, recorded with key=, CLID=2101, containing data object @0x9eff710  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf22bd0, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf647d0, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x9eff960, recorded with key=dobj2, CLID=8000, containing data object @0xaf0a2a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xac65f50, recorded with key=cobj, CLID=9967, containing data object @0xaa7b7a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf656a0, recorded with key=linkvec, CLID=9983, containing data object @0x9eff760  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xaf65360, recorded with key=WriteDataReentrant, CLID=9984, containing data object @0xaf265d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x9eff570, recorded with key=mkey, CLID=193758082, containing data object @0xac6da90  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x9efef00, recorded with key=vFloat, CLID=202242136, containing data object @0xaf22920  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xa6e4bd0, recorded with key=testobj, CLID=289238765, containing data object @0x9eff850  ... -> DONE
-StoreGateSvc         INFO Stop StoreGateSvc
-StoreGateSvc         INFO stop: setting service priority to 101 so that event stores get finalized and cleared before other stores
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965c70, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0x15986f50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965e30, recorded with key=dobj, CLID=8000, containing data object @0x159863c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965d50, recorded with key=, CLID=2101, containing data object @0x15962530  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965c70, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965e30, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15966060, recorded with key=dobj2, CLID=8000, containing data object @0x15960eb0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965f80, recorded with key=cobj, CLID=9967, containing data object @0x15965f10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15966140, recorded with key=linkvec, CLID=9983, containing data object @0x15986280  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x159660d0, recorded with key=WriteDataReentrant, CLID=9984, containing data object @0x15963020  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965ff0, recorded with key=mkey, CLID=193758082, containing data object @0x159864b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965ea0, recorded with key=vFloat, CLID=202242136, containing data object @0x15961c20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15965ce0, recorded with key=testobj, CLID=289238765, containing data object @0x1584cc10  ... -> DONE
+StoreGateSvc      VERBOSE Stop StoreGateSvc
+StoreGateSvc      VERBOSE stop: setting service priority to 101 so that event stores get finalized and cleared before other stores
 ApplicationMgr       INFO Application Manager Stopped successfully
 WriteDataReentrant   INFO in finalize()
 ReadDataReentrant    INFO in finalize()
@@ -245,26 +240,26 @@ AthAlgSeq            INFO Finalizing AthAlgSeq...
 AthOutSeq            INFO Finalizing AthOutSeq...
 AthRegSeq            INFO Finalizing AthRegSeq...
 AthMasterSeq         INFO Finalizing AthMasterSeq...
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-00-00-00
+StoreGateSvc      VERBOSE Finalizing StoreGateSvc - package version StoreGate-03-09-00
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xaf22bd0, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xaf647d0, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xafaf8b0, recorded with key=, CLID=2101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xaf22bd0, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xaf647d0, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x9eff960, recorded with key=dobj2, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xac65f50, recorded with key=cobj, CLID=9967, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xaf656a0, recorded with key=linkvec, CLID=9983, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xaf65360, recorded with key=WriteDataReentrant, CLID=9984, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x9eff570, recorded with key=mkey, CLID=193758082, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x9efef00, recorded with key=vFloat, CLID=202242136, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xa6e4bd0, recorded with key=testobj, CLID=289238765, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15965c70, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15965e30, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15965d50, recorded with key=, CLID=2101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15965c70, recorded with key=WriteDataReentrant, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15965e30, recorded with key=dobj, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15966060, recorded with key=dobj2, CLID=8000, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15965f80, recorded with key=cobj, CLID=9967, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15966140, recorded with key=linkvec, CLID=9983, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x159660d0, recorded with key=WriteDataReentrant, CLID=9984, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15965ff0, recorded with key=mkey, CLID=193758082, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15965ea0, recorded with key=vFloat, CLID=202242136, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15965ce0, recorded with key=testobj, CLID=289238765, containing data object @0  ... -> DONE
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-ChronoStatSvc        INFO Time User   : Tot=  125 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  120 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
index beebb642110..e03744dc207 100644
--- a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
+++ b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
@@ -1,7 +1,7 @@
 
 
 Initializing Gaudi ApplicationMgr using job opts ../share/StoreGateSvcClient_test.txt
-JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/ControlTest/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ControlTest/StoreGateTestCommon.txt
 JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
@@ -12,12 +12,10 @@ JobOptionsSvc        INFO Job options successfully read in from ../share/StoreGa
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Mon Jun 20 11:32:32 2016
+                                          running on karma on Tue Dec 13 22:18:59 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
-ClassIDSvc           INFO  getRegistryEntries: read 1007 CLIDRegistry entries for module ALL
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 1216 CLIDRegistry entries for module ALL
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
 HistogramPersis...WARNING Histograms saving not required.
@@ -28,100 +26,100 @@ StoreGateSvc        DEBUG Service base class initialized successfully
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
 *** StoreGateSvcClient_test record BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0xc8a740 with key pFoo1 of type Foo(CLID 8101)
- in DataObject @0xcabaa0
+StoreGateSvc        DEBUG Recorded object @0x1121730 with key pFoo1 of type Foo(CLID 8101)
+ in DataObject @0x11245b0
  object modifiable when retrieved
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key pFoo1 and clid 8101
- Pre-existing valid DataProxy @0xf63000 found in Store for key pFoo1 with clid 8101
-ClassIDSvc           INFO  getRegistryEntries: read 343 CLIDRegistry entries for module ALL
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xcab400
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0xca3d60
+ Pre-existing valid DataProxy @0x11244e0 found in Store for key pFoo1 with clid 8101
+ClassIDSvc           INFO  getRegistryEntries: read 357 CLIDRegistry entries for module ALL
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1124a30
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x1124690
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING record_impl: failed for key=pFoo2, type Foo (CLID 8101)
- object @0xc8a740 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0x1121730 already in store with key=pFoo1. Will not record a duplicate! 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0xf57d10 with key pFoo2 of type Foo(CLID 8101)
- in DataObject @0xf70a90
+StoreGateSvc        DEBUG Recorded object @0x10dfb70 with key pFoo2 of type Foo(CLID 8101)
+ in DataObject @0x10f0b50
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xcaac20 with key cpFoo of type Foo(CLID 8101)
- in DataObject @0xca0c20
+StoreGateSvc        DEBUG Recorded object @0x10eee50 with key cpFoo of type Foo(CLID 8101)
+ in DataObject @0x10e6650
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf70ae0 with key silly of type Foo(CLID 8101)
- in DataObject @0xf63fa0
+StoreGateSvc        DEBUG Recorded object @0x10ca3b0 with key silly of type Foo(CLID 8101)
+ in DataObject @0x1125980
  object modifiable when retrieved
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xff0770 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xfcd4e0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0xfcd450
+ Pre-existing valid DataProxy @0x10eb590 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x10e6d50
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x10e6da0
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xff0770 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xcab020
- recorded with key silly of type Foo (CLID 8101) in DataObject @0xf5d370
+ Pre-existing valid DataProxy @0x10eb590 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1124c30
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x10e6200
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xff0770 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf6f6c0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0xf5d3c0
+ Pre-existing valid DataProxy @0x10eb590 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x10e6250
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1124d80
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0xca8d70 with key UnLocked of type Foo(CLID 8101)
- in DataObject @0xfcfd70
+StoreGateSvc        DEBUG Recorded object @0x10e6290 with key UnLocked of type Foo(CLID 8101)
+ in DataObject @0x1124e50
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xca8950 with key Locked of type Foo(CLID 8101)
- in DataObject @0xf752e0
+StoreGateSvc        DEBUG Recorded object @0x1125310 with key Locked of type Foo(CLID 8101)
+ in DataObject @0x102d780
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xca27d0 with key LockedReset of type Foo(CLID 8101)
- in DataObject @0xf60b80
+StoreGateSvc        DEBUG Recorded object @0x1125d10 with key LockedReset of type Foo(CLID 8101)
+ in DataObject @0x1125c80
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf70680 with key UnLockedReset of type Foo(CLID 8101)
- in DataObject @0xf705d0
+StoreGateSvc        DEBUG Recorded object @0x11261d0 with key UnLockedReset of type Foo(CLID 8101)
+ in DataObject @0x10ee2b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf64810 with key LockedDelete of type Foo(CLID 8101)
- in DataObject @0xf64760
+StoreGateSvc        DEBUG Recorded object @0x1126430 with key LockedDelete of type Foo(CLID 8101)
+ in DataObject @0x1126380
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xcb13b0 with key UnLockedDelete of type Foo(CLID 8101)
- in DataObject @0xf648b0
+StoreGateSvc        DEBUG Recorded object @0x1126730 with key UnLockedDelete of type Foo(CLID 8101)
+ in DataObject @0x1126680
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf5cb30 with key Const of type Foo(CLID 8101)
- in DataObject @0xf5b700
+StoreGateSvc        DEBUG Recorded object @0x1126a30 with key Const of type Foo(CLID 8101)
+ in DataObject @0x1126980
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xca5f20 with key Const2 of type Foo(CLID 8101)
- in DataObject @0xca5e70
+StoreGateSvc        DEBUG Recorded object @0x1126d30 with key Const2 of type Foo(CLID 8101)
+ in DataObject @0x1126c80
  object not modifiable when retrieved
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key Const and clid 8101
- Pre-existing valid DataProxy @0xf60380 found in Store for key Const with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf5d8f0
- recorded with key Const of type Foo (CLID 8101) in DataObject @0xf5d820
+ Pre-existing valid DataProxy @0x1126b60 found in Store for key Const with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1127030
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x1126f80
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0xf757b0 with key ow of type Foo(CLID 8101)
- in DataObject @0xf5d910
+StoreGateSvc        DEBUG Recorded object @0x1127110 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1127050
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0xca4360 with key ow of type Foo(CLID 8101)
- in DataObject @0xca4430
+StoreGateSvc        DEBUG overwrite: Recorded object @0x11273f0 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1127340
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0xca4480 with key ow of type Foo(CLID 8101)
- in DataObject @0xf5d910
+StoreGateSvc        DEBUG overwrite: Recorded object @0x1127550 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1127050
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xca4340 with key ow2 of type Foo(CLID 8101)
- in DataObject @0xca4430
+StoreGateSvc        DEBUG Recorded object @0x11273f0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x11274d0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0xf64010 with key ow2 of type Foo(CLID 8101)
- in DataObject @0xf63760
+StoreGateSvc        DEBUG overwrite: Recorded object @0x1127720 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x1127670
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0xf63ff0 with key ow2 of type Foo(CLID 8101)
- in DataObject @0xca4430
+StoreGateSvc        DEBUG overwrite: Recorded object @0x11273f0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x1127570
  object not modifiable when retrieved
 *** StoreGateSvcClient_test records OK ***
 
@@ -223,47 +221,47 @@ Now we expect to see an error message:
 StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object   of type Foo(CLID 8101) 
  Try to use a const DataHandle
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0xf63910 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0xf63fa0
+StoreGateSvc        DEBUG Recorded object @0x1127370 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x1127aa0
  object modifiable when retrieved
  Now we expect to see an error for invalid proxy >>> 
 StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object pFooKey  of type Foo(CLID 8101) 
  Try to use a const DataHandle
  end of error >>>>>>>>>>>>> 
-StoreGateSvc        DEBUG Recorded object @0xca4340 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0xf63fa0
+StoreGateSvc        DEBUG Recorded object @0x10ca3b0 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x1127aa0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xca4340 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0xf63fa0
+StoreGateSvc        DEBUG Recorded object @0x10ca3b0 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x1127aa0
  object modifiable when retrieved
 *** StoreGateSvcClient_test removes OK ***
 
 
 
 *** StoreGateSvcClient_test testCreate BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0xca4340 with key pCreateFooDefault of type Foo(CLID 8101)
- in DataObject @0xf63fa0
+StoreGateSvc        DEBUG Recorded object @0x1127370 with key pCreateFooDefault of type Foo(CLID 8101)
+ in DataObject @0x1127aa0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf645a0 with key pCreateFoo1 of type Foo(CLID 8101)
- in DataObject @0xf72cb0
+StoreGateSvc        DEBUG Recorded object @0x10ca3b0 with key pCreateFoo1 of type Foo(CLID 8101)
+ in DataObject @0x1127dc0
  object modifiable when retrieved
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key pCreateFoo1 and clid 8101
- Pre-existing valid DataProxy @0xf6fb40 found in Store for key pCreateFoo1 with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf72d00
- recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0xf72f00
-StoreGateSvc        ERROR create: problem recording created object @0xf72d00 using key pCreateFoo1
+ Pre-existing valid DataProxy @0x1127fc0 found in Store for key pCreateFoo1 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1127d70
+ recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0x1126000
+StoreGateSvc        ERROR create: problem recording created object @0x1127d70 using key pCreateFoo1
 <<---Error Message Ends-------
 StoreGateSvc        DEBUG Retrieved non-const handle to object pCreateFoo1  of type Foo(CLID 8101)
 *** StoreGateSvcClient_test testCreate OK ***
 
 
 *** StoreGateSvcClient_test bind BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0xca9160 with key fooKey of type Foo(CLID 8101)
- in DataObject @0xf79970
+StoreGateSvc        DEBUG Recorded object @0x1127e40 with key fooKey of type Foo(CLID 8101)
+ in DataObject @0x11283b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG  Bound handle 0x7fff1094f1e0 to proxy 0xf79b40
+StoreGateSvc        DEBUG  Bound handle 0x7ffdb61b13a0 to proxy 0x1128540
 *** StoreGateSvcClient_test bind OK ***
 
 
@@ -272,57 +270,57 @@ Testing dump:
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 1 proxy for ClassID 8100 (Base): 
- flags: (  valid, UNLOCKED,  reset) --- data:   0xfcfd70 --- key: UnLocked
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x1124e50 --- key: UnLocked
 Found 17 proxies for ClassID 8101 (Foo): 
- flags: (  valid,   locked,  reset) --- data:   0xf5b700 --- key: Const
- flags: (  valid,   locked,  reset) --- data:   0xca5e70 --- key: Const2
- flags: (  valid,   locked,  reset) --- data:   0xf752e0 --- key: Locked
- flags: (  valid,   locked, DELETE) --- data:   0xf64760 --- key: LockedDelete
- flags: (  valid,   locked,  reset) --- data:   0xf60b80 --- key: LockedReset
- flags: (  valid, UNLOCKED,  reset) --- data:   0xfcfd70 --- key: UnLocked
- flags: (  valid, UNLOCKED, DELETE) --- data:   0xf648b0 --- key: UnLockedDelete
- flags: (  valid, UNLOCKED,  reset) --- data:   0xf705d0 --- key: UnLockedReset
- flags: (  valid,   locked,  reset) --- data:   0xca0c20 --- key: cpFoo
- flags: (  valid, UNLOCKED,  reset) --- data:   0xf79970 --- key: fooKey
- flags: (  valid, UNLOCKED, DELETE) --- data:   0xf5d910 --- key: ow
- flags: (  valid,   locked, DELETE) --- data:   0xca4430 --- key: ow2
- flags: (  valid, UNLOCKED,  reset) --- data:   0xf72cb0 --- key: pCreateFoo1
- flags: (  valid, UNLOCKED,  reset) --- data:   0xf63fa0 --- key: pCreateFooDefault
- flags: (  valid, UNLOCKED,  reset) --- data:   0xcabaa0 --- key: pFoo1
- flags: (  valid, UNLOCKED,  reset) --- data:   0xf70a90 --- key: pFoo2
+ flags: (  valid,   locked,  reset) --- data:  0x1126980 --- key: Const
+ flags: (  valid,   locked,  reset) --- data:  0x1126c80 --- key: Const2
+ flags: (  valid,   locked,  reset) --- data:  0x102d780 --- key: Locked
+ flags: (  valid,   locked, DELETE) --- data:  0x1126380 --- key: LockedDelete
+ flags: (  valid,   locked,  reset) --- data:  0x1125c80 --- key: LockedReset
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x1124e50 --- key: UnLocked
+ flags: (  valid, UNLOCKED, DELETE) --- data:  0x1126680 --- key: UnLockedDelete
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x10ee2b0 --- key: UnLockedReset
+ flags: (  valid,   locked,  reset) --- data:  0x10e6650 --- key: cpFoo
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x11283b0 --- key: fooKey
+ flags: (  valid, UNLOCKED, DELETE) --- data:  0x1127050 --- key: ow
+ flags: (  valid,   locked, DELETE) --- data:  0x1127570 --- key: ow2
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x1127dc0 --- key: pCreateFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x1127aa0 --- key: pCreateFooDefault
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x11245b0 --- key: pFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x10f0b50 --- key: pFoo2
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: silly
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 <<--------
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfe8810, recorded with key=UnLocked, CLID=8101, containing data object @0xfcfd70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf60380, recorded with key=Const, CLID=8101, containing data object @0xf5b700  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca38c0, recorded with key=Const2, CLID=8101, containing data object @0xca5e70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf60ab0, recorded with key=Locked, CLID=8101, containing data object @0xf752e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca4ad0, recorded with key=LockedDelete, CLID=8101, containing data object @0xf64760  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfef5b0, recorded with key=LockedReset, CLID=8101, containing data object @0xf60b80  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfe8810, recorded with key=UnLocked, CLID=8101, containing data object @0xfcfd70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5b610, recorded with key=UnLockedDelete, CLID=8101, containing data object @0xf648b0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf64670, recorded with key=UnLockedReset, CLID=8101, containing data object @0xf705d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfe3b80, recorded with key=cpFoo, CLID=8101, containing data object @0xca0c20  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79b40, recorded with key=fooKey, CLID=8101, containing data object @0xf79970  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca41f0, recorded with key=ow, CLID=8101, containing data object @0xf5d910  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca42c0, recorded with key=ow2, CLID=8101, containing data object @0xca4430  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf6fb40, recorded with key=pCreateFoo1, CLID=8101, containing data object @0xf72cb0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca43b0, recorded with key=pCreateFooDefault, CLID=8101, containing data object @0xf63fa0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=pFoo1, CLID=8101, containing data object @0xcabaa0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xc9ff20, recorded with key=pFoo2, CLID=8101, containing data object @0xf70a90  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xff0770, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0xfee4a0 with key d1 of type D1(CLID 8112)
- in DataObject @0xff2600
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1125180, recorded with key=UnLocked, CLID=8101, containing data object @0x1124e50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1126b60, recorded with key=Const, CLID=8101, containing data object @0x1126980  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1126e60, recorded with key=Const2, CLID=8101, containing data object @0x1126c80  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1125280, recorded with key=Locked, CLID=8101, containing data object @0x102d780  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1126560, recorded with key=LockedDelete, CLID=8101, containing data object @0x1126380  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1125f00, recorded with key=LockedReset, CLID=8101, containing data object @0x1125c80  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1125180, recorded with key=UnLocked, CLID=8101, containing data object @0x1124e50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1126860, recorded with key=UnLockedDelete, CLID=8101, containing data object @0x1126680  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11262b0, recorded with key=UnLockedReset, CLID=8101, containing data object @0x10ee2b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x10e4e70, recorded with key=cpFoo, CLID=8101, containing data object @0x10e6650  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1128540, recorded with key=fooKey, CLID=8101, containing data object @0x11283b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1127220, recorded with key=ow, CLID=8101, containing data object @0x1127050  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11272f0, recorded with key=ow2, CLID=8101, containing data object @0x1127570  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1127fc0, recorded with key=pCreateFoo1, CLID=8101, containing data object @0x1127dc0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1127be0, recorded with key=pCreateFooDefault, CLID=8101, containing data object @0x1127aa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11244e0, recorded with key=pFoo1, CLID=8101, containing data object @0x11245b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1124a50, recorded with key=pFoo2, CLID=8101, containing data object @0x10f0b50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x10eb590, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x1125c50 with key d1 of type D1(CLID 8112)
+ in DataObject @0x10f23f0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1  of type B1(CLID 8111)
-0xf74cc0
-0xf74ab0StoreGateSvc
+0x1122cb0
+0x1122aa0StoreGateSvc
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1Alias  of type D1(CLID 8112)
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1AnotherAlias  of type D1(CLID 8112)
-StoreGateSvc        DEBUG Recorded object @0xc8ecc0 with key d2 of type D1(CLID 8112)
- in DataObject @0xff7550
+StoreGateSvc        DEBUG Recorded object @0x1128610 with key d2 of type D1(CLID 8112)
+ in DataObject @0x11272a0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object d2  of type D1(CLID 8112)
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1Alias  of type D1(CLID 8112)
@@ -331,21 +329,21 @@ Found key = d2 for object D1 in StoreGate
 StoreGateSvc        DEBUG Retrieved non-const handle to object dd  of type D1(CLID 8112)
 StoreGateSvc        DEBUG Retrieved non-const handle to object dd  of type B1(CLID 8111)
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=d2, CLID=8112, containing data object @0xff7550  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=dd, CLID=8112, containing data object @0xff8280  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=d2, CLID=8112, containing data object @0xff7550  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=d2, CLID=8112, containing data object @0xff7550  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xc9ff20, recorded with key=dd, CLID=8112, containing data object @0xf70a90  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1126f80, recorded with key=d2, CLID=8112, containing data object @0x11272a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=dd, CLID=8112, containing data object @0x11275f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1126f80, recorded with key=d2, CLID=8112, containing data object @0x11272a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1126f80, recorded with key=d2, CLID=8112, containing data object @0x11272a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1124a50, recorded with key=dd, CLID=8112, containing data object @0x10f0b50  ... -> DONE
 StoreGateSvc        DEBUG Retrieved non-const handle to object dd  of type D1(CLID 8112)
 StoreGateSvc        DEBUG Retrieved non-const handle to object dd  of type B1(CLID 8111)
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 
 *** StoreGateSvcClient_test transientSwap BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0xf645a0 with key pSwapFoo1 of type Foo(CLID 8101)
- in DataObject @0xf5d9b0
+StoreGateSvc        DEBUG Recorded object @0x10dfb70 with key pSwapFoo1 of type Foo(CLID 8101)
+ in DataObject @0x10e27d0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf72f90 with key pSwapFoo2 of type Foo(CLID 8101)
- in DataObject @0xf6fc10
+StoreGateSvc        DEBUG Recorded object @0x1127550 with key pSwapFoo2 of type Foo(CLID 8101)
+ in DataObject @0x10f0b50
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object pSwapFoo1  of type Foo(CLID 8101)
 StoreGateSvc        DEBUG Retrieved non-const handle to object pSwapFoo2  of type Foo(CLID 8101)
@@ -354,81 +352,81 @@ StoreGateSvc        DEBUG Retrieved non-const handle to object pSwapFoo2  of typ
 
 
 *** StoreGateSvcClient_test VersionedKey BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0xca0580 with key aVersObj of type Foo(CLID 8101)
- in DataObject @0xf78df0
+StoreGateSvc        DEBUG Recorded object @0x1127460 with key aVersObj of type Foo(CLID 8101)
+ in DataObject @0x1128250
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object aVersObj  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0xca9b00 with key ;77;aVersObj of type Foo(CLID 8101)
- in DataObject @0xf5bc40
+StoreGateSvc        DEBUG Recorded object @0x104d070 with key ;77;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x11275c0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object ;77;aVersObj  of type Foo(CLID 8101)
 StoreGateSvc        DEBUG Retrieved non-const handle to object aVersObj  of type Foo(CLID 8101)
 StoreGateSvc        DEBUG Retrieved non-const handle to object ;00;aVersObj  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0xcaac20 with key ;88;aVersObj of type Foo(CLID 8101)
- in DataObject @0xcab300
+StoreGateSvc        DEBUG Recorded object @0x11282a0 with key ;88;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x1127000
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object ;88;aVersObj  of type Foo(CLID 8101)
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key ;88;aVersObj and clid 8101
- Pre-existing valid DataProxy @0xca3910 found in Store for key ;88;aVersObj with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf77d60
- recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0xf5d3c0
+ Pre-existing valid DataProxy @0x11279f0 found in Store for key ;88;aVersObj with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1125640
+ recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0x11255b0
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0xca4c60 with key ;66;aVersObj of type Foo(CLID 8101)
- in DataObject @0xf5d410
+StoreGateSvc        DEBUG Recorded object @0x10ca3b0 with key ;66;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x1127fd0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object aVersObj  of type Foo(CLID 8101)
 *** StoreGateSvcClient_test VersionedKey OK ***
 
 
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=aVersObj, CLID=8101, containing data object @0xf78df0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5d820, recorded with key=;66;aVersObj, CLID=8101, containing data object @0xf5d410  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=;77;aVersObj, CLID=8101, containing data object @0xf5bc40  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=;88;aVersObj, CLID=8101, containing data object @0xcab300  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5d820, recorded with key=;66;aVersObj, CLID=8101, containing data object @0xf5d410  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=pSwapFoo1, CLID=8101, containing data object @0xf6fc10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xc9ff20, recorded with key=pSwapFoo2, CLID=8101, containing data object @0xf5d9b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1127be0, recorded with key=aVersObj, CLID=8101, containing data object @0x1128250  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1126e90, recorded with key=;66;aVersObj, CLID=8101, containing data object @0x1127fd0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1124980, recorded with key=;77;aVersObj, CLID=8101, containing data object @0x11275c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11279f0, recorded with key=;88;aVersObj, CLID=8101, containing data object @0x1127000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1126e90, recorded with key=;66;aVersObj, CLID=8101, containing data object @0x1127fd0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11244e0, recorded with key=pSwapFoo1, CLID=8101, containing data object @0x10f0b50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1124a50, recorded with key=pSwapFoo2, CLID=8101, containing data object @0x10e27d0  ... -> DONE
 *** test_DVL_conversions
-StoreGateSvc        DEBUG Recorded object @0xf70560 with key contd of type CV(CLID 82734625)
- in DataObject @0xc9ff20
+StoreGateSvc        DEBUG Recorded object @0x1125d80 with key contd of type CV(CLID 82734625)
+ in DataObject @0x1124a50
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataVector<C>(CLID 82734623)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataVector<B>(CLID 82734621)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataVector<A>(CLID 82734619)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataVector<A>(CLID 82734619)
-StoreGateSvc        DEBUG Recorded object @0xfc13b0 with key contd of type CL(CLID 82734626)
- in DataObject @0xf5d820
+StoreGateSvc        DEBUG Recorded object @0x1126050 with key contd of type CL(CLID 82734626)
+ in DataObject @0x1126e90
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataList<C>(CLID 82734624)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataList<B>(CLID 82734622)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataList<A>(CLID 82734620)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataList<A>(CLID 82734620)
 *** test_const_DVL
-StoreGateSvc        DEBUG Recorded object @0xca8f50 with key dvl of type CV(CLID 82734625)
- in DataObject @0xf63000
+StoreGateSvc        DEBUG Recorded object @0x1125090 with key dvl of type CV(CLID 82734625)
+ in DataObject @0x1124980
  object not modifiable when retrieved
 StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object dvl  of type CV(CLID 82734625) 
  Try to use a const DataHandle
 StoreGateSvc        DEBUG Retrieved const handle to object dvl  of type CV(CLID 82734625)
-StoreGateSvc        DEBUG Recorded object @0xf79a20 with key dvl2 of type CV(CLID 82734625)
- in DataObject @0xf64740
+StoreGateSvc        DEBUG Recorded object @0x1128690 with key dvl2 of type CV(CLID 82734625)
+ in DataObject @0x1128590
  object not modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object dvl2  of type CV(CLID 82734625)
-StoreGateSvc        DEBUG Recorded object @0xf5d8f0 with key dvl of type CL(CLID 82734626)
- in DataObject @0xca42e0
+StoreGateSvc        DEBUG Recorded object @0x1128a20 with key dvl of type CL(CLID 82734626)
+ in DataObject @0x1128e60
  object not modifiable when retrieved
 StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object dvl  of type CL(CLID 82734626) 
  Try to use a const DataHandle
 StoreGateSvc        DEBUG Retrieved const handle to object dvl  of type CL(CLID 82734626)
-StoreGateSvc        DEBUG Recorded object @0xf57df0 with key dvl2 of type CL(CLID 82734626)
- in DataObject @0xcabc20
+StoreGateSvc        DEBUG Recorded object @0x1129350 with key dvl2 of type CL(CLID 82734626)
+ in DataObject @0x11293d0
  object not modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object dvl2  of type CL(CLID 82734626)
 *** test_copy_conversions
-StoreGateSvc        DEBUG Recorded object @0xf65610 with key x of type Athena_test::X(CLID 82734627)
- in DataObject @0xf5eaa0
+StoreGateSvc        DEBUG Recorded object @0x11299f0 with key x of type Athena_test::X(CLID 82734627)
+ in DataObject @0x1129960
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object x  of type Athena_test::Y(CLID 82734628)
 SG::DataProxy_castWARNING Request for a non-const object via copying conversion; requested CLID = 82734628, proxy primary ID is 82734627
@@ -437,135 +435,135 @@ StoreGateSvc        DEBUG Retrieved const handle to object x  of type Athena_tes
 
 *** StoreGateSvcClient_test Keys BEGINS ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0xc9ff20  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0xf5d820  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0xf63000  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0xf64740  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0xca42e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0xcabc20  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0xf5eaa0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0xcabbe0 with key LockReset of type Foo(CLID 8101)
- in DataObject @0xf5eaa0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0x1124a50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0x1126e90  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127be0, recorded with key=dvl, CLID=82734625, containing data object @0x1124980  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128610, recorded with key=dvl2, CLID=82734625, containing data object @0x1128590  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=dvl, CLID=82734626, containing data object @0x1128e60  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=dvl2, CLID=82734626, containing data object @0x11293d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127be0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128610, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127be0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128610, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129b50, recorded with key=x, CLID=82734627, containing data object @0x1129960  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129b50, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x11299f0 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0x1129960
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf5b220 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0xf5b520
+StoreGateSvc        DEBUG Recorded object @0x1129940 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0x1128a80
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xcb13b0 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0xf63370
+StoreGateSvc        DEBUG Recorded object @0x1129870 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0x1126af0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf65890 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0xca39e0
+StoreGateSvc        DEBUG Recorded object @0x1129830 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0x112a020
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf64740, recorded with key=LockDelete, CLID=8101, containing data object @0xf63370  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabc20, recorded with key=LockReset, CLID=8101, containing data object @0xf5eaa0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=UnLockDelete, CLID=8101, containing data object @0xca39e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca42e0, recorded with key=UnLockReset, CLID=8101, containing data object @0xf5b520  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=UnLockDelete, CLID=8101, containing data object @0xca39e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128590, recorded with key=LockDelete, CLID=8101, containing data object @0x1126af0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11293d0, recorded with key=LockReset, CLID=8101, containing data object @0x1129960  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1124980, recorded with key=UnLockDelete, CLID=8101, containing data object @0x112a020  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128e60, recorded with key=UnLockReset, CLID=8101, containing data object @0x1128a80  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1124980, recorded with key=UnLockDelete, CLID=8101, containing data object @0x112a020  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127be0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128610, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127be0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128610, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127be0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128610, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129b50, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129b50, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabc20, recorded with key=LockReset, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca42e0, recorded with key=UnLockReset, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0xf655f0 with key LockReset of type Foo(CLID 8101)
- in DataObject @0xca53b0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11293d0, recorded with key=LockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1128e60, recorded with key=UnLockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1127be0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1128610, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129000, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129590, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1127be0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1128610, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129000, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129590, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11244e0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1127be0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1128610, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11279f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129000, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129590, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129b50, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129b50, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x11299d0 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0x1129df0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xfef610 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0xcabca0
+StoreGateSvc        DEBUG Recorded object @0x1125640 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0x1129450
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf5e870 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0xf5da50
+StoreGateSvc        DEBUG Recorded object @0x11251f0 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0x11275c0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf602a0 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0xf5d8a0
+StoreGateSvc        DEBUG Recorded object @0x11293b0 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0x10e27d0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=LockDelete, CLID=8101, containing data object @0xf5da50  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=LockReset, CLID=8101, containing data object @0xca53b0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=UnLockDelete, CLID=8101, containing data object @0xf5d8a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=UnLockReset, CLID=8101, containing data object @0xcabca0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=LockDelete, CLID=8101, containing data object @0x11275c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129b50, recorded with key=LockReset, CLID=8101, containing data object @0x1129df0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=UnLockDelete, CLID=8101, containing data object @0x10e27d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=UnLockReset, CLID=8101, containing data object @0x1129450  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 
 *** StoreGateSvcClient_test Keys ENDS ***
 
 *** StoreGateSvcClient_test retrieveAux BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0xcabdb0 with key BVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0xf5b620
+StoreGateSvc        DEBUG Recorded object @0x1129710 with key BVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x1128b10
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf65900 with key BVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0xf5d8a0
+StoreGateSvc        DEBUG Recorded object @0x1129e40 with key BVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x10e27d0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf5ea50 with key CVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0xf647c0
+StoreGateSvc        DEBUG Recorded object @0x1124480 with key CVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x11272d0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf9d7a0 with key CVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0xf74000
+StoreGateSvc        DEBUG Recorded object @0x1125f10 with key CVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x1126000
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xf79c20 with key ErrorVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0xca4a30
+StoreGateSvc        DEBUG Recorded object @0x11284f0 with key ErrorVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x10f0b50
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xfef5e0 with key BBVec of type TestVector<BBX>(CLID 125040193)
- in DataObject @0xf740f0
+StoreGateSvc        DEBUG Recorded object @0x1127ac0 with key BBVec of type TestVector<BBX>(CLID 125040193)
+ in DataObject @0x11255b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xfeca80 with key BBVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0xca4b20
+StoreGateSvc        DEBUG Recorded object @0x1127240 with key BBVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x1126fb0
  object modifiable when retrieved
 StoreGateSvc      VERBOSE called associateAux_impl non const for key BVec
 StoreGateSvc        DEBUG Retrieved non-const handle to object BVec  of type TestVector<BX>(CLID 82735621)
@@ -584,11 +582,11 @@ StoreGateSvc      VERBOSE called associateAux_impl const for key ErrorVec
  to object of type TestVector<BX>(CLID 82735621) with key ErrorVec
 StoreGateSvc      WARNING 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0xff07f0 with key BStand of type BX(CLID 82835621)
- in DataObject @0xca8ff0
+StoreGateSvc        DEBUG Recorded object @0x1124620 with key BStand of type BX(CLID 82835621)
+ in DataObject @0x11292b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0xcab020 with key BStandAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0xf5b520
+StoreGateSvc        DEBUG Recorded object @0x1129350 with key BStandAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x112a020
  object modifiable when retrieved
 StoreGateSvc      VERBOSE called associateAux_impl non const for key BStand
 StoreGateSvc        DEBUG Retrieved non-const handle to object BStand  of type BX(CLID 82835621)
@@ -597,8 +595,8 @@ StoreGateSvc        DEBUG Retrieved non-const handle to object BStand  of type B
 
 
 *** StoreGateSvcClient_test testBoundReset BEGINS ***
-StoreGateSvc        DEBUG overwrite: Recorded object @0xf5e9c0 with key testBoundReset of type int(CLID 244260744)
- in DataObject @0xcabd60
+StoreGateSvc        DEBUG overwrite: Recorded object @0x104d070 with key testBoundReset of type int(CLID 244260744)
+ in DataObject @0x11267a0
  object modifiable when retrieved
 
 *** StoreGateSvcClient_test testBoundReset OK ***
@@ -608,28 +606,41 @@ StoreGateSvc        DEBUG overwrite: Recorded object @0xf5e9c0 with key testBoun
 *** StoreGateSvcClient_test testRecordObject BEGINS ***
 >>> test duplicate record1
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key obj101 and clid 8101
- Pre-existing valid DataProxy @0xf63000 found in Store for key obj101 with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf5e9a0
- recorded with key obj101 of type Foo (CLID 8101) in DataObject @0xf72a60
+ Pre-existing valid DataProxy @0x1128570 found in Store for key obj101 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x10e7f60
+ recorded with key obj101 of type Foo (CLID 8101) in DataObject @0x1126c10
 <<< test duplicate record1
 >>> test duplicate record2
 StoreGateSvc      WARNING record_impl: failed for key=obj999, type Foo (CLID 8101)
- object @0xf73f40 already in store with key=obj101. Will not record a duplicate! 
+ object @0x1127460 already in store with key=obj101. Will not record a duplicate! 
 <<< test duplicate record2
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0xf63370  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf5d820, recorded with key=obj102, CLID=8101, containing data object @0xca50c0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=BVec, CLID=82735621, containing data object @0xf5b620  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=CVec, CLID=82735621, containing data object @0xf647c0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=ErrorVec, CLID=82735621, containing data object @0xca4a30  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca42e0, recorded with key=BStand, CLID=82835621, containing data object @0xca8ff0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=BBVecAux., CLID=125030194, containing data object @0xca4b20  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabc20, recorded with key=BStandAux., CLID=125030194, containing data object @0xf5b520  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=BVecAux., CLID=125030194, containing data object @0xf5d8a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=CVecAux., CLID=125030194, containing data object @0xf74000  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=BBVec, CLID=125040193, containing data object @0xf740f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf64740, recorded with key=testBoundReset, CLID=244260744, containing data object @0xcabd60  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128570, recorded with key=obj101, CLID=8101, containing data object @0x1124980  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1125090, recorded with key=obj102, CLID=8101, containing data object @0x1125dd0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128570, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=BVec, CLID=82735621, containing data object @0x1128b10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129b50, recorded with key=CVec, CLID=82735621, containing data object @0x11272d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128610, recorded with key=ErrorVec, CLID=82735621, containing data object @0x10f0b50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129ea0, recorded with key=BStand, CLID=82835621, containing data object @0x11292b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=BBVecAux., CLID=125030194, containing data object @0x1126fb0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11293d0, recorded with key=BStandAux., CLID=125030194, containing data object @0x112a020  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=BVecAux., CLID=125030194, containing data object @0x10e27d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=CVecAux., CLID=125030194, containing data object @0x1126000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127be0, recorded with key=BBVec, CLID=125040193, containing data object @0x11255b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127140, recorded with key=testBoundReset, CLID=244260744, containing data object @0x11267a0  ... -> DONE
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128570, recorded with key=obj101, CLID=8101, containing data object @0x1124980  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1125090, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128570, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129b50, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128610, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129ea0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11293d0, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127be0, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
 
 *** StoreGateSvcClient_test testRecordObject OK ***
 
@@ -637,89 +648,89 @@ StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProx
 
 *** StoreGateSvcClient_test testWriteAux OK ***
 *** test_lock
-StoreGateSvc        DEBUG Recorded object @0xf70ae0 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0xf74000
+StoreGateSvc        DEBUG Recorded object @0x11251a0 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0x1126000
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf5d820, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf633f0, recorded with key=lockable1, CLID=82734636, containing data object @0xf74000  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca42e0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf64740, recorded with key=testWriteAux, CLID=82835621, containing data object @0xf63370  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabc20, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xc9ff20, recorded with key=testWriteAuxAux., CLID=125030194, containing data object @0xf70760  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0xf5e9a0 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0xf70760
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128570, recorded with key=obj101, CLID=8101, containing data object @0x1124980  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1125090, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128570, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11269d0, recorded with key=lockable1, CLID=82734636, containing data object @0x1126000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129590, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129b50, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1128610, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129ea0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127140, recorded with key=testWriteAux, CLID=82835621, containing data object @0x1125dd0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11244e0, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11293d0, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x11279f0, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1129000, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1126950, recorded with key=testWriteAuxAux., CLID=125030194, containing data object @0x1125ca0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1127be0, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x1127460 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0x1125ca0
  object modifiable when retrieved
 StoreGateSvc      VERBOSE Finalizing StoreGateSvc - package version StoreGate-00-00-00
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5d820, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf633f0, recorded with key=lockable1, CLID=82734636, containing data object @0xf70760  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf65760, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca42e0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf64740, recorded with key=testWriteAux, CLID=82835621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabc20, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xc9ff20, recorded with key=testWriteAuxAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1128570, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1125090, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1128570, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11269d0, recorded with key=lockable1, CLID=82734636, containing data object @0x1125ca0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129590, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129b50, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1128610, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129ea0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1127140, recorded with key=testWriteAux, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11244e0, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11293d0, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x11279f0, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1129000, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1126950, recorded with key=testWriteAuxAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1127be0, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
 *** StoreGateSvcClient_test record BEGINS ***
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key pFoo1 and clid 8101
- Pre-existing valid DataProxy @0xf79940 found in Store for key pFoo1 with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xca4480
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0xf72d70
+ Pre-existing valid DataProxy @0x1127be0 found in Store for key pFoo1 with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1127790
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x1127500
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING record_impl: failed for key=pFoo2, type Foo (CLID 8101)
- object @0xf64700 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0x1125c30 already in store with key=pFoo1. Will not record a duplicate! 
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xca3910 found in Store for key silly with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5e9a0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0xcabaa0
+ Pre-existing valid DataProxy @0x11279f0 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x11291c0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x11284a0
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xca3910 found in Store for key silly with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5e870
- recorded with key silly of type Foo (CLID 8101) in DataObject @0xf5da00
+ Pre-existing valid DataProxy @0x11279f0 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x11282a0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1127350
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xca3910 found in Store for key silly with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5ea10
- recorded with key silly of type Foo (CLID 8101) in DataObject @0xcab370
+ Pre-existing valid DataProxy @0x11279f0 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1127550
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1125b90
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key Const and clid 8101
- Pre-existing valid DataProxy @0xcabde0 found in Store for key Const with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5b5b0
- recorded with key Const of type Foo (CLID 8101) in DataObject @0xf5e7d0
+ Pre-existing valid DataProxy @0x1129590 found in Store for key Const with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1126e80
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x1126a50
 <<---Error Message Ends-------
 IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
 IOVSvcTool           INFO IOVRanges will be checked at every Event
-ClassIDSvc           INFO  getRegistryEntries: read 246 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 256 CLIDRegistry entries for module ALL
 *** StoreGateSvcClient_test records OK ***
 
 
diff --git a/AtlasTest/ControlTest/test/ClearStore_test.cxx b/AtlasTest/ControlTest/test/ClearStore_test.cxx
index b978b6ba7e1..491a1939623 100644
--- a/AtlasTest/ControlTest/test/ClearStore_test.cxx
+++ b/AtlasTest/ControlTest/test/ClearStore_test.cxx
@@ -32,7 +32,7 @@ int main() {
   }  
   assert(pSvcLoc);
 
-  StoreGateSvc* pStore(0);
+  StoreGateSvc* pStore(nullptr);
   static const bool CREATE(true);
   assert((pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess());
   assert(pStore);
diff --git a/AtlasTest/ControlTest/test/DataProxy_test.cxx b/AtlasTest/ControlTest/test/DataProxy_test.cxx
index b77e56ad870..36009fe2472 100644
--- a/AtlasTest/ControlTest/test/DataProxy_test.cxx
+++ b/AtlasTest/ControlTest/test/DataProxy_test.cxx
@@ -96,7 +96,7 @@ int main() {
   assert( (DataProxy_cast<Bla>(transientProxy)).i == 77 );
 
 
-  IConversionSvc* pIConvSvc(0);
+  IConversionSvc* pIConvSvc(nullptr);
   StatusCode cs((pSvcLoc->service("EventPersistencySvc", pIConvSvc, CREATEIF)));
   assert(cs.isSuccess());
   assert(pIConvSvc);
@@ -126,7 +126,7 @@ int main() {
   fRef.doNothing(); //remove warning
 
 
-  IProxyProviderSvc* pIPPSvc(0);
+  IProxyProviderSvc* pIPPSvc(nullptr);
   StatusCode psc(pSvcLoc->service("ProxyProviderSvc", pIPPSvc, CREATEIF));
   assert( psc.isSuccess() );
   assert( pIPPSvc );
diff --git a/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx b/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
index c68bfe124fc..aafecca759c 100644
--- a/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
+++ b/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
@@ -66,16 +66,16 @@ CLASS_DEF(FooBar, 8109, 0)
 template <typename PROXIED>
 class TestProvider : public IAddressProvider {
 public:
-  TestProvider(string key) :
+  TestProvider(const std::string& key) :
     m_ID(ClassID_traits<PROXIED>::ID()), m_key(key)
   {  }
-  virtual ~TestProvider() {}
+  ~TestProvider() override {}
   ///get all addresses that the provider wants to preload in SG maps
 
-  virtual StatusCode loadAddresses(StoreID::type /*id*/, tadList& /* tList */) 
+  StatusCode loadAddresses(StoreID::type /*id*/, tadList& /* tList */) override 
   {return StatusCode::SUCCESS;}
 
-  virtual StatusCode preLoadAddresses(StoreID::type /*id*/, tadList& tList) 
+  StatusCode preLoadAddresses(StoreID::type /*id*/, tadList& tList) override 
   {
     TransientAddress* tad = new TransientAddress(m_ID, m_key, new GenericAddress(ToyConversionSvc::storageType(), m_ID,m_key));
     tList.push_back(tad);
@@ -83,7 +83,7 @@ public:
   }
 
   ///get a specific address, plus all others  the provider wants to load in SG maps
-  virtual StatusCode updateAddress(StoreID::type /*sID*/, TransientAddress* tad)
+  StatusCode updateAddress(StoreID::type /*sID*/, TransientAddress* tad) override
   { 
     StatusCode sc;
     if ((tad->clID() != m_ID) || (tad->name() != m_key)) {
@@ -105,9 +105,9 @@ private:
 
 void testRecordBeforeRead(StoreGateSvc& rSG, IProxyProviderSvc& rPPS) {
   cout << "*** ProxyProviderSvc_test RecordBeforeRead BEGINS ***" <<endl;
-  rSG.clearStore().isSuccess();
+  rSG.clearStore().ignore();
   rPPS.addProvider(new TestProvider<Foo>("existingFoo"));
-  const Foo *pFoo(0);
+  const Foo *pFoo(nullptr);
   //NOT YET SGASSERTERROR(rSG.record(new Foo(6.28), "existingFoo").isSuccess());
   assert(rSG.record(new Foo(6.28), "existingFoo").isSuccess());
   assert(rSG.retrieve(pFoo, "existingFoo").isSuccess());
@@ -119,10 +119,10 @@ void testReadPrivate(StoreGateSvc& rSG) {
   cout << "*** ProxyProviderSvc_test readPrivate BEGINS ***" <<endl;
   
   std::unique_ptr<Foo> apFoo;
-  SGASSERTERROR((rSG.readPrivateCopy<Foo>("NotThere")).get() != 0);
+  SGASSERTERROR((rSG.readPrivateCopy<Foo>("NotThere")).get() != nullptr);
   
   apFoo=rSG.readUniquePrivateCopy<Foo>("diskFoo");
-  assert(0 != apFoo.get());
+  assert(nullptr != apFoo.get());
   assert(floatEQ(0, static_cast<float>(apFoo->a()))); //check that our Foo is the def constr one
 
   //now test the situation in which we have a transient obj in the way
@@ -132,16 +132,16 @@ void testReadPrivate(StoreGateSvc& rSG) {
   assert(rSG.overwrite(CxxUtils::make_unique<Foo>(6.28), "privFoo").isSuccess());
   
   apFoo=rSG.readUniquePrivateCopy<Foo>("privFoo");
-  assert(0 != apFoo.get());
+  assert(nullptr != apFoo.get());
   assert(floatNEQ(6.28f, static_cast<float>(apFoo->a()))); //check that our Foo is a different one
   apFoo->setA(3.14);
   std::unique_ptr<Foo> bpFoo(rSG.readUniquePrivateCopy<Foo>("privFoo"));
-  assert(0 != bpFoo.get());
+  assert(nullptr != bpFoo.get());
   assert(&*bpFoo != &*apFoo); //two independent instances
   assert(floatNEQ(6.28f, static_cast<float>(bpFoo->a()))); 
   assert(floatNEQ(3.14f, static_cast<float>(bpFoo->a()))); 
   assert(floatEQ(3.14f, static_cast<float>(apFoo->a()))); 
-  const Foo* plainFoo(0);
+  const Foo* plainFoo(nullptr);
   assert(plainFoo = rSG.retrieve<Foo>("privFoo"));
   assert(floatEQ(6.28f, static_cast<float>(plainFoo->a()))); //this is the old guy!
   assert(plainFoo != &*apFoo); //yet another instance
@@ -152,16 +152,16 @@ void testReadPrivate(StoreGateSvc& rSG) {
   const Foo* pFoo33Orig = apFoo.get();
   assert(rSG.record(std::move(apFoo), "silly33").isSuccess());
   const Foo *pFoo33(rSG.retrieve<Foo>("silly33"));
-  assert(0 != pFoo33);
+  assert(nullptr != pFoo33);
   assert(floatEQ(3.14f, static_cast<float>(pFoo33->a())));
   assert(pFoo33 == pFoo33Orig); //the private copy we recorded.
   assert(pFoo33 != &*bpFoo); //not one of the private copies
-  SGASSERTERROR((rSG.readPrivateCopy<Foo>("silly33")).get() != 0);
+  SGASSERTERROR((rSG.readPrivateCopy<Foo>("silly33")).get() != nullptr);
   assert(rSG.retrieve<Foo>("silly33"));
   std::unique_ptr<Foo> aptrFoo33(rSG.retrieveUniquePrivateCopy<Foo>("silly33"));
   assert(aptrFoo33.get() == pFoo33);
   assert(floatEQ(3.14f, static_cast<float>(aptrFoo33->a())));
-  SGASSERTERROR((pFoo33 = rSG.retrieve<Foo>("silly33")) != 0);
+  SGASSERTERROR((pFoo33 = rSG.retrieve<Foo>("silly33")) != nullptr);
   
   
   cout << "*** ProxyProviderSvc_test readPrivate OK ***\n\n" <<endl;
@@ -229,14 +229,14 @@ void testOverwrite(StoreGateSvc& rSG, IProxyProviderSvc& rPPS) {
 }
 
 int main() {
-  ISvcLocator* pSvcLoc(0);
+  ISvcLocator* pSvcLoc(nullptr);
   if (!initGaudi("ProxyProviderSvc_test.txt", pSvcLoc)) {
     cerr << "This test can not be run" << endl;
     return 0;
   }  
   assert( pSvcLoc );
 
-  StoreGateSvc* pStore(0);
+  StoreGateSvc* pStore(nullptr);
   static const bool CREATE(true);
   assert( (pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess() );
   assert( pStore );
@@ -263,14 +263,14 @@ int main() {
   assert( !(pStore->transientContains<Foo>("aFoo")) );
   assert( pStore->contains<Foo>("aFoo") );
 
-  const Foo* pFoo(0);
+  const Foo* pFoo(nullptr);
   assert( (pStore->retrieve(pFoo, "aFoo")).isSuccess() );
   assert( pFoo );
 
 
-  const FooBar* pFooBar(0);
+  const FooBar* pFooBar(nullptr);
   SGASSERTERROR( (pStore->retrieve(pFooBar, "aFooBar")).isSuccess() );
-  assert( 0 == pFooBar );
+  assert( nullptr == pFooBar );
 
   cout << "*** ProxyProviderSvc_test OK ***" <<endl;
 
diff --git a/AtlasTest/ControlTest/test/SGDataLink_test.cxx b/AtlasTest/ControlTest/test/SGDataLink_test.cxx
index 7c9e2add222..b1658cd220b 100644
--- a/AtlasTest/ControlTest/test/SGDataLink_test.cxx
+++ b/AtlasTest/ControlTest/test/SGDataLink_test.cxx
@@ -90,7 +90,7 @@ namespace Athena_test
 
     cerr << "Now we expect to see an error message:" << endl \
               << "----Error Message Starts--->>" << endl;
-    DataLink<int> badI((int*)0);
+    DataLink<int> badI((int*)nullptr);
     cerr << "<<----Error Message Ends-----" << endl;
     assert(!badI.isValid());
 
diff --git a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
index d669a54d4f8..ffeb36953fb 100644
--- a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
+++ b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
@@ -110,7 +110,7 @@ struct Lockable
   : public ILockable
 {
   Lockable() : m_locked (false) {}
-  virtual void lock() { m_locked = true; }
+  void lock() override { m_locked = true; }
   bool m_locked;
 };
 CLASS_DEF(Lockable, 82734636, 1)
@@ -137,7 +137,7 @@ class XCopyConversion
   : public SG::CopyConversion<X, Y>
 {
 public:
-  void convert (const X& src, Y& dst) const
+  void convert (const X& src, Y& dst) const override
   {
     dst.a = src.a+10;
     dst.b = src.a+20;
@@ -162,15 +162,15 @@ void test_DVL_conversions1 (StoreGateSvc& sg)
 
   assert (sg.record (contd, "contd").isSuccess());
 
-  CONTC* contc = 0;
+  CONTC* contc = nullptr;
   assert (sg.retrieve (contc, "contd").isSuccess());
   assert (contc == contd);
 
-  CONTB* contb = 0;
+  CONTB* contb = nullptr;
   assert (sg.retrieve (contb, "contd").isSuccess());
   assert (contb == contd);
 
-  CONTA* conta = 0;
+  CONTA* conta = nullptr;
   assert (sg.symLink (contd, conta).isSuccess());
   assert (sg.retrieve (conta, "contd").isSuccess());
   assert (conta->size() == 10);
@@ -218,12 +218,12 @@ void test_const_DVL1 (StoreGateSvc& sg)
 
   // This should give an error.
   {
-    DVL* dvl0 = 0;
+    DVL* dvl0 = nullptr;
     assert (sg.retrieve (dvl0, "dvl").isFailure());
   }
 
   // But this shold work.
-  const DVL* dvl1 = 0;
+  const DVL* dvl1 = nullptr;
   assert (sg.retrieve (dvl1, "dvl").isSuccess());
 
   ConstContainer* cdvl2 = new ConstContainer (SG::VIEW_ELEMENTS);
@@ -237,7 +237,7 @@ void test_const_DVL1 (StoreGateSvc& sg)
     cdvl2->push_back (*it);
   }
 
-  const DVL* dvl2 = 0;
+  const DVL* dvl2 = nullptr;
   assert (sg.retrieve (dvl2, "dvl2").isSuccess());
   i = 0;
   for (typename DVL::const_iterator it = dvl2->begin();
@@ -264,18 +264,18 @@ void test_copy_conversions (StoreGateSvc& sg)
   x->a = 10;
   assert (sg.record (x, "x").isSuccess());
 
-  Athena_test::Y* y = 0;
+  Athena_test::Y* y = nullptr;
   assert (sg.retrieve (y, "x").isFailure());
 
   assert (sg.setConst (x).isSuccess());
 
-  const Athena_test::Y* cy = 0;
+  const Athena_test::Y* cy = nullptr;
   assert (sg.retrieve (cy, "x").isSuccess());
   assert ((char*)cy != (char*)x);
   assert (cy->a == 20);
   assert (cy->b == 30);
 
-  const Athena_test::A* ca = 0;
+  const Athena_test::A* ca = nullptr;
   assert (sg.retrieve (ca, "x").isFailure());
 }
 
@@ -304,7 +304,7 @@ int main() {
   }  
   assert(pSvcLoc);
 
-  StoreGateSvc* pStore(0);
+  StoreGateSvc* pStore(nullptr);
   static const bool CREATE(true);
   assert((pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess());
   assert(pStore);
@@ -358,7 +358,7 @@ int main() {
 
   ///////
 
-  StoreGateSvc* detStore(0);
+  StoreGateSvc* detStore(nullptr);
   assert((pSvcLoc->service("DetectorStore", detStore, CREATE)).isSuccess());
   assert(detStore);
 
diff --git a/AtlasTest/ControlTest/test/StoreID_test.cxx b/AtlasTest/ControlTest/test/StoreID_test.cxx
index c5d52e7eccd..f958619acc3 100644
--- a/AtlasTest/ControlTest/test/StoreID_test.cxx
+++ b/AtlasTest/ControlTest/test/StoreID_test.cxx
@@ -8,7 +8,7 @@
  ATLAS Collaboration
  ***************************************************************************/
 
-// $Id: StoreID_test.cxx 753911 2016-06-09 13:40:32Z calaf $
+// $Id: StoreID_test.cxx 770224 2016-08-26 01:59:31Z ssnyder $
 
 #include <iostream>
 
@@ -32,7 +32,7 @@ int main() {
   }  
   assert(pSvcLoc);
 
-  StoreGateSvc* pStore(0);
+  StoreGateSvc* pStore(nullptr);
   static const bool CREATE(true);
   assert((pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess());
   assert(pStore);
-- 
GitLab