From da5e18d561aa835cceb4d5966cbbec700a65d4b1 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 5 May 2016 05:21:27 +0200
Subject: [PATCH] 'Update reference files for StoreGate-03-06-41.'
 (ControlTest-00-02-56)

2016-05-05  scott snyder  <snyder@bnl.gov>

	* Tagging ControlTest-00-02-56.
	* Update reference files for StoreGate-03-06-41.

2016-03-27  scott snyder  <snyder@bnl.gov>

	* Tagging ControlTest-00-02-55.
	* share/StoreGateDFlow.ref: Updated.

2016-03-25  scott snyder  <snyder@bnl.gov>

	* Tagging ControlTest-00-02-54.
	* share/StoreGateReentrant.ref: Updated.

2016-03-16 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* Fixed a remaining mistake in the CMakeLists.txt file that was only
	  discovered by ATN's log mining.
	* Tagging as ControlTest-00-02-53

...
(Long ChangeLog diff - truncated)
---
 AtlasTest/ControlTest/CMakeLists.txt          | 122 ++++
 AtlasTest/ControlTest/cmt/requirements        |  30 +-
 .../ControlTest/share/CircularDep_test.ref    |  27 +-
 .../ControlTest/share/ClearStore_test.ref     | 323 ++++-----
 AtlasTest/ControlTest/share/DataLink_test.ref | Bin
 AtlasTest/ControlTest/share/DataLink_test.txt |   0
 .../ControlTest/share/DataProxy_test.ref      |   0
 .../ControlTest/share/DataProxy_test.txt      |   0
 .../share/ElementLinkVector_test.ref          |  29 +-
 .../share/ElementLinkVector_test.txt          |   0
 .../ControlTest/share/ElementLink_test.ref    |  34 +-
 .../ControlTest/share/ElementLink_test.txt    |   0
 .../ControlTest/share/FortranAlgorithm.ref    |  48 +-
 AtlasTest/ControlTest/share/HelloWorld.ref    |   0
 AtlasTest/ControlTest/share/HistNtup.ref      |   0
 .../share/ProxyProviderSvc_test.ref           | 156 ++--
 .../share/ProxyProviderSvc_test.txt           |   0
 .../ControlTest/share/SGDataLink_test.ref     |  64 +-
 .../ControlTest/share/StoreGateDFlow.ref      | 285 ++++----
 AtlasTest/ControlTest/share/StoreGateGen.ref  | 376 +++++-----
 .../ControlTest/share/StoreGatePileUp.ref     |   0
 .../ControlTest/share/StoreGateReentrant.ref  | 272 +++++++
 .../share/StoreGateSvcClient_test.ref         | 679 +++++++++---------
 .../share/StoreGateSvcClient_test.txt         |   0
 .../ControlTest/share/StoreGateTestCommon.txt |   0
 AtlasTest/ControlTest/share/SubAlg.ref        |   0
 .../share/test_interactive_athena.py          |   6 +-
 .../share/test_interactive_athena.ref         |  96 +--
 .../ControlTest/test/CircularDep_test.cxx     |  12 +-
 .../ControlTest/test/ClearStore_test.cxx      |   0
 AtlasTest/ControlTest/test/DataProxy_test.cxx |   0
 .../test/ElementLinkVector_test.cxx           |  11 +-
 .../ControlTest/test/ElementLink_test.cxx     |  10 +-
 .../ControlTest/test/FortranAlgorithm.sh      |  15 +
 .../test/ProxyProviderSvc_test.cxx            |  70 +-
 .../ControlTest/test/SGDataLink_test.cxx      |  12 +-
 AtlasTest/ControlTest/test/StoreGateDFlow.sh  |  12 +
 AtlasTest/ControlTest/test/StoreGateGen.sh    |  12 +
 .../ControlTest/test/StoreGateReentrant.sh    |  12 +
 .../test/StoreGateSvcClient_test.cxx          |  12 +-
 AtlasTest/ControlTest/test/TestControl.xml    |   0
 .../test/test_interactive_athena.sh           |  12 +
 42 files changed, 1638 insertions(+), 1099 deletions(-)
 create mode 100644 AtlasTest/ControlTest/CMakeLists.txt
 mode change 100755 => 100644 AtlasTest/ControlTest/cmt/requirements
 mode change 100755 => 100644 AtlasTest/ControlTest/share/CircularDep_test.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/ClearStore_test.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/DataLink_test.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/DataLink_test.txt
 mode change 100755 => 100644 AtlasTest/ControlTest/share/DataProxy_test.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/DataProxy_test.txt
 mode change 100755 => 100644 AtlasTest/ControlTest/share/ElementLinkVector_test.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/ElementLinkVector_test.txt
 mode change 100755 => 100644 AtlasTest/ControlTest/share/ElementLink_test.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/ElementLink_test.txt
 mode change 100755 => 100644 AtlasTest/ControlTest/share/FortranAlgorithm.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/HelloWorld.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/HistNtup.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
 mode change 100755 => 100644 AtlasTest/ControlTest/share/SGDataLink_test.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/StoreGateGen.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/StoreGatePileUp.ref
 create mode 100644 AtlasTest/ControlTest/share/StoreGateReentrant.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/share/StoreGateSvcClient_test.txt
 mode change 100755 => 100644 AtlasTest/ControlTest/share/StoreGateTestCommon.txt
 mode change 100755 => 100644 AtlasTest/ControlTest/share/SubAlg.ref
 mode change 100755 => 100644 AtlasTest/ControlTest/test/CircularDep_test.cxx
 mode change 100755 => 100644 AtlasTest/ControlTest/test/ClearStore_test.cxx
 mode change 100755 => 100644 AtlasTest/ControlTest/test/DataProxy_test.cxx
 mode change 100755 => 100644 AtlasTest/ControlTest/test/ElementLinkVector_test.cxx
 mode change 100755 => 100644 AtlasTest/ControlTest/test/ElementLink_test.cxx
 create mode 100755 AtlasTest/ControlTest/test/FortranAlgorithm.sh
 mode change 100755 => 100644 AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
 mode change 100755 => 100644 AtlasTest/ControlTest/test/SGDataLink_test.cxx
 create mode 100755 AtlasTest/ControlTest/test/StoreGateDFlow.sh
 create mode 100755 AtlasTest/ControlTest/test/StoreGateGen.sh
 create mode 100755 AtlasTest/ControlTest/test/StoreGateReentrant.sh
 mode change 100755 => 100644 AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
 mode change 100755 => 100644 AtlasTest/ControlTest/test/TestControl.xml
 create mode 100755 AtlasTest/ControlTest/test/test_interactive_athena.sh

diff --git a/AtlasTest/ControlTest/CMakeLists.txt b/AtlasTest/ControlTest/CMakeLists.txt
new file mode 100644
index 00000000000..2cbb3e908d7
--- /dev/null
+++ b/AtlasTest/ControlTest/CMakeLists.txt
@@ -0,0 +1,122 @@
+# $Id: CMakeLists.txt 730270 2016-03-16 07:57:19Z krasznaa $
+################################################################################
+# Package: ControlTest
+################################################################################
+
+# Declare the package name:
+atlas_subdir( ControlTest )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs(
+   PUBLIC
+   AtlasTest/TestTools
+   Control/AthenaExamples/AthExFortranAlgorithm
+   Control/AthenaExamples/AthExStoreGateExample
+   Control/AthenaPython
+   Control/MinimalRunTime
+   TestPolicy
+   PRIVATE
+   Control/CxxUtils
+   Control/AthContainers
+   Control/AthLinks
+   Control/AthenaExamples/ToyConversion
+   Control/AthenaKernel
+   Control/SGTools
+   Control/StoreGate
+   GaudiKernel )
+
+# Helper variable(s):
+set( _jobOPath
+   "${CMAKE_CURRENT_SOURCE_DIR}/share:${CMAKE_JOBOPT_OUTPUT_DIRECTORY}" )
+set( _jobOPath "${_jobOPath}:$ENV{JOBOPTSEARCHPATH}" )
+
+# Test(s) in the package:
+atlas_add_test( DataProxy_test
+   SOURCES test/DataProxy_test.cxx
+   LINK_LIBRARIES TestTools ToyConversionLib AthenaKernel SGTools GaudiKernel
+   EXTRA_PATTERNS "HistogramPersis.* +INFO|EventPersistenc.*INFO|^JobOptionsSvc +INFO|IConversionSvc ptr not set"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
+if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
+      "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
+   set( PPSoptignore "requestRelease|" )
+else()
+   set( PPSoptignore )
+endif()
+
+atlas_add_test( ProxyProviderSvc_test
+   SOURCES test/ProxyProviderSvc_test.cxx
+   LINK_LIBRARIES TestTools ToyConversionLib AthenaKernel SGTools StoreGateLib
+   GaudiKernel
+   EXTRA_PATTERNS "${PPSoptignore}^ClassIDSvc +DEBUG|Histogram.* (DEBUG|INFO)|DetectorStore +DEBUG|ToyConversionSvc +DEBUG|EventDataSvc +DEBUG|EventPersis.* +(DEBUG|INFO)|HistoryStore +DEBUG|^JobOptionsSvc +INFO|^DataProxy +VERBOSE|^ProxyProviderSvc +DEBUG|^ServiceManager +DEBUG|Service base class initialized successfully|found service|DEBUG Property update for OutputLevel"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
+atlas_add_test( CircularDep_test
+   SOURCES test/CircularDep_test.cxx
+   LINK_LIBRARIES TestTools AthContainers SGTools StoreGateLib GaudiKernel
+   EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
+atlas_add_test( SGDataLink_test
+   SOURCES test/SGDataLink_test.cxx
+   LINK_LIBRARIES TestTools AthLinks AthenaKernel AthContainers SGTools StoreGateLib
+   GaudiKernel
+   EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
+atlas_add_test( ElementLink_test
+   SOURCES test/ElementLink_test.cxx
+   LINK_LIBRARIES TestTools AthLinks AthContainers SGTools StoreGateLib
+   EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
+atlas_add_test( ElementLinkVector_test
+   SOURCES test/ElementLinkVector_test.cxx
+   LINK_LIBRARIES TestTools AthLinks AthContainers SGTools StoreGateLib GaudiKernel
+   EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
+atlas_add_test( StoreGateSvcClient_test
+   SOURCES test/StoreGateSvcClient_test.cxx
+   LINK_LIBRARIES TestTools AthContainers AthenaKernel SGTools SGtests
+   StoreGateLib
+   EXTRA_PATTERNS "modifiable when retrieved|HistogramPersis.* +INFO|^JobOptionsSvc +INFO|Service base class initialized successfully|VERBOSE committing dataObj|DetectorStore.*error setting up proxy|DetectorStore.*record_impl: failed|DEBUG Property update for OutputLevel"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
+atlas_add_test( ClearStore_test
+   SOURCES test/ClearStore_test.cxx
+   LINK_LIBRARIES TestTools StoreGateLib SGtests
+   EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
+atlas_add_test( FortranAlgorithm
+   SCRIPT test/FortranAlgorithm.sh
+   EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc" )
+
+if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
+      "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
+   set( SGGoptignore
+      "|Retrieved const handle to default object|of type EventInfo|object not modifiable when retrieved|requestRelease" )
+else()
+   set( SGGoptignore )
+endif()
+
+atlas_add_test( StoreGateReentrant
+   SCRIPT test/StoreGateReentrant.sh
+   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" )
+
+atlas_add_test( StoreGateGen
+   SCRIPT test/StoreGateGen.sh
+   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" )
+
+atlas_add_test( StoreGateDFlow
+   SCRIPT test/StoreGateDFlow.sh
+   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|WARNING could not get proxy for key|Start StoreGateSvc" )
+
+atlas_add_test( test_interactive_athena
+   SCRIPT test/test_interactive_athena.sh
+   EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc|already in TClassTable" )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/StoreGateTestCommon.txt share/*.py )
diff --git a/AtlasTest/ControlTest/cmt/requirements b/AtlasTest/ControlTest/cmt/requirements
old mode 100755
new mode 100644
index 395853948a2..290f44c4e99
--- a/AtlasTest/ControlTest/cmt/requirements
+++ b/AtlasTest/ControlTest/cmt/requirements
@@ -19,10 +19,10 @@ use AthenaPython    AthenaPython-*       Control -no_auto_imports
 
 private
 use GaudiInterface  GaudiInterface-*     External
+use CxxUtils        CxxUtils-*           Control
 use AthenaKernel    AthenaKernel-*       Control
 use AthContainers   AthContainers-*      Control
 use AthLinks        AthLinks-*           Control
-use DataModel       DataModel-*          Control		 
 use SGTools         SGTools-*            Control
 use StoreGate       StoreGate-*          Control
 use ToyConversion   ToyConversion-*      Control/AthenaExamples
@@ -35,25 +35,25 @@ macro PPSoptignore "" \
 apply_pattern UnitTest_run unit_test=DataProxy \
   extrapatterns="HistogramPersis.* +INFO|EventPersistenc.*INFO|^JobOptionsSvc +INFO|IConversionSvc ptr not set"
 apply_pattern UnitTest_run unit_test=ProxyProviderSvc \
-              extrapatterns="$(PPSoptignore)^ClassIDSvc +DEBUG|Histogram.* (DEBUG|INFO)|DetectorStore +DEBUG|ToyConversionSvc +DEBUG|EventDataSvc +DEBUG|EventPersis.* +(DEBUG|INFO)|HistoryStore +DEBUG|^JobOptionsSvc +INFO|^DataProxy +VERBOSE|^ProxyProviderSvc +DEBUG|^ServiceManager +DEBUG"
+              extrapatterns="$(PPSoptignore)^ClassIDSvc +DEBUG|Histogram.* (DEBUG|INFO)|DetectorStore +DEBUG|ToyConversionSvc +DEBUG|EventDataSvc +DEBUG|EventPersis.* +(DEBUG|INFO)|HistoryStore +DEBUG|^JobOptionsSvc +INFO|^DataProxy +VERBOSE|^ProxyProviderSvc +DEBUG|^ServiceManager +DEBUG|Service base class initialized successfully|found service"
 
 #DataModel tests that can't be run there due to StoreGate dep
 apply_pattern UnitTest_run unit_test=CircularDep \
-  extrapatterns="^JobOptionsSvc +INFO"
+  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
 apply_pattern UnitTest_run unit_test=SGDataLink \
-  extrapatterns="^JobOptionsSvc +INFO"
+  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
 apply_pattern UnitTest_run unit_test=ElementLink \
-  extrapatterns="^JobOptionsSvc +INFO"
+  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
 apply_pattern UnitTest_run unit_test=ElementLinkVector \
-  extrapatterns="^JobOptionsSvc +INFO"
+  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
 
 #StoreGate tests that are better run here due to the SGComps (PPS) run-time dependency
 apply_pattern declare_joboptions files="StoreGateTestCommon.txt *.py"
 
-apply_pattern UnitTest_run unit_test=StoreGateSvcClient extrapatterns="modifiable when retrieved|HistogramPersis.* +INFO|^JobOptionsSvc +INFO"
+apply_pattern UnitTest_run unit_test=StoreGateSvcClient extrapatterns="modifiable when retrieved|HistogramPersis.* +INFO|^JobOptionsSvc +INFO|Service base class initialized successfully|VERBOSE committing dataObj|DetectorStore.*error setting up proxy|DetectorStore.*record_impl: failed"
 macro_append StoreGateSvcClient_testlinkopts " -lSGtests"
 apply_pattern UnitTest_run unit_test=ClearStore \
-  extrapatterns="^JobOptionsSvc +INFO"
+  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
 macro_append ClearStore_testlinkopts " -lSGtests"
 #macro ClearStore_test_cppflags " -D __PROXYDEBUG"
 
@@ -73,25 +73,31 @@ use AthExFortranAlgorithm AthExFortranAlgorithm-*   Control/AthenaExamples -no_a
 apply_pattern athenarun_test name="FortranAlgorithm" \
 	      pre_script="preFortAlgEx.sh"	\	      
 	      options="AthExFortranAlgorithm/FortranAlgorithmOptions.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh FortranAlgorithm $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO$(q)"
+	      post_script="${TESTTOOLSROOT}/share/post.sh FortranAlgorithm $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc$(q)"
 
 macro SGGoptignore "" \
       optimized "|Retrieved const handle to default object|of type EventInfo|object not modifiable when retrieved|requestRelease"
 use AthExStoreGateExample AthExStoreGateExample-*   Control/AthenaExamples -no_auto_imports
+
+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)"
+
 apply_pattern athenarun_test name="StoreGateGen" \
 	      pre_script="../cmt/setup.sh"	\	      
 	      options="AthExStoreGateExample/StoreGateExample_Gen_jobOptions.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh StoreGateGen $(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$(q)"
+	      post_script="${TESTTOOLSROOT}/share/post.sh StoreGateGen $(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)"
 
 apply_pattern athenarun_test name="StoreGateDFlow" \
 	      pre_script="../cmt/setup.sh"	\	      
 	      options="AthExStoreGateExample/dflow_jobo.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh StoreGateDFlow $(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$(q)"
+	      post_script="${TESTTOOLSROOT}/share/post.sh StoreGateDFlow $(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|WARNING could not get proxy for key|Start StoreGateSvc$(q)"
 
 apply_pattern athenarun_test name="test_interactive_athena" \
 	      pre_script="../cmt/setup.sh"	\	      
 	      options="ControlTest/test_interactive_athena.py" \
-	      post_script="${TESTTOOLSROOT}/share/post.sh test_interactive_athena $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO$(q)"
+	      post_script="${TESTTOOLSROOT}/share/post.sh test_interactive_athena $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc|already in TClassTable$(q)"
 
 ## AthenaCommon/python unit-test
 apply_pattern declare_python_modules files="*.py"
diff --git a/AtlasTest/ControlTest/share/CircularDep_test.ref b/AtlasTest/ControlTest/share/CircularDep_test.ref
old mode 100755
new mode 100644
index e73ab85654b..4cfee401ce7
--- a/AtlasTest/ControlTest/share/CircularDep_test.ref
+++ b/AtlasTest/ControlTest/share/CircularDep_test.ref
@@ -14,31 +14,28 @@ JobOptionsSvc        INFO # (2,1): MessageSvc.setVerbose += ["ElementLink"]
 JobOptionsSvc        INFO Job options successfully read in from ../share/DataLink_test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v2r0p3)
-                                          running on lxplus0555 on Mon Nov 18 19:51:05 2013
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r3)
+                                          running on lxplus0006.cern.ch on Tue Mar 10 18:57:41 2015
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-39-14
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-10
-ClassIDSvc           INFO  getRegistryEntries: read 168 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 168 CLIDRegistry entries for module ALL
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-06
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-02-39-14
+DetectorStore        INFO Initializing DetectorStore - package version StoreGate-03-01-06
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-18
+ClassIDSvc           INFO  getRegistryEntries: read 176 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
+HistoryStore         INFO Initializing HistoryStore - package version StoreGate-03-01-06
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-39-14
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-01-06
 StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
-StoreGateSvc        DEBUG Recorded object @0x2589a40 with key circVector of type CircularVector(CLID 218202856)
- in DataObject @0x25892c0
+StoreGateSvc        DEBUG Recorded object @0x1134470 with key circVector of type CircularVector(CLID 218202856)
+ in DataObject @0x1134400
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x2589af0 with key derCircVector of type DerivedCircularVector(CLID 254054940)
- in DataObject @0x25899d0
+StoreGateSvc        DEBUG Recorded object @0x1134710 with key derCircVector of type DerivedCircularVector(CLID 254054940)
+ in DataObject @0x1134620
  object modifiable when retrieved
 *** CircularDep_test OK ***
diff --git a/AtlasTest/ControlTest/share/ClearStore_test.ref b/AtlasTest/ControlTest/share/ClearStore_test.ref
old mode 100755
new mode 100644
index 63d70f7b899..7a9daea24c4
--- a/AtlasTest/ControlTest/share/ClearStore_test.ref
+++ b/AtlasTest/ControlTest/share/ClearStore_test.ref
@@ -1,8 +1,9 @@
+Warning in <TEnvRec::ChangeValue>: duplicate entry <Root.ErrorIgnoreLevel=Print> for level 1; ignored
 *** ClearStore_test BEGINS ***
 
 
 Initializing Gaudi ApplicationMgr using job opts ../share/StoreGateTestCommon.txt
-JobOptionsSvc        INFO # =======> /home/sss/atlas/dvtest/build/../tests/../share/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # =======> /afs/cern.ch/work/c/calaf/public/fixOverwrite/AtlasTest/ControlTest/run/../share/StoreGateTestCommon.txt
 JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
@@ -12,147 +13,145 @@ JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
 JobOptionsSvc        INFO Job options successfully read in from ../share/StoreGateTestCommon.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
-                                          running on karma on Fri Jun  6 21:48:37 2014
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r3)
+                                          running on lxplus0045.cern.ch on Wed Mar 18 02:25:46 2015
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-00-00-00
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
-ClassIDSvc           INFO  getRegistryEntries: read 769 CLIDRegistry entries for module ALL
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-00-00-00
+DetectorStore        INFO Initializing DetectorStore - package version StoreGate-03-01-09
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-18
+ClassIDSvc           INFO  getRegistryEntries: read 210 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
+HistoryStore         INFO Initializing HistoryStore - package version StoreGate-03-01-09
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-00-00-00
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-01-09
 StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
 *** ClearStore_test run standard testRecord a first time ***
 *** StoreGateSvcClient_test record BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x1e4b410 with key pFoo1 of type Foo(CLID 8101)
- in DataObject @0x1e62190
+StoreGateSvc        DEBUG Recorded object @0x117d300 with key pFoo1 of type Foo(CLID 8101)
+ in DataObject @0x1539d10
  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 @0x1e7f8f0 found in Store for key pFoo1 with clid 8101
-ClassIDSvc           INFO  getRegistryEntries: read 194 CLIDRegistry entries for module ALL
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e60b50
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x1e7f8a0
+ Pre-existing valid DataProxy @0x153a370 found in Store for key pFoo1 with clid 8101
+ClassIDSvc           INFO  getRegistryEntries: read 720 CLIDRegistry entries for module ALL
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x151b280
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x153a1e0
 <<---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 @0x1e4b410 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0x117d300 already in store with key=pFoo1. Will not record a duplicate! 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1e7a7c0 with key pFoo2 of type Foo(CLID 8101)
- in DataObject @0x1e6c940
+StoreGateSvc        DEBUG Recorded object @0x1510790 with key pFoo2 of type Foo(CLID 8101)
+ in DataObject @0x14fc8b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6ab00 with key cpFoo of type Foo(CLID 8101)
- in DataObject @0x1e6b300
+StoreGateSvc        DEBUG Recorded object @0x1525d20 with key cpFoo of type Foo(CLID 8101)
+ in DataObject @0x14fc900
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e68f40 with key silly of type Foo(CLID 8101)
- in DataObject @0x1e68d90
+StoreGateSvc        DEBUG Recorded object @0x1526bb0 with key silly of type Foo(CLID 8101)
+ in DataObject @0x1461870
  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 @0x1e69720 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e6cd10
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1e60cc0
+ Pre-existing valid DataProxy @0x14fe0b0 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x15267c0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x14f0460
 <<---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 @0x1e69720 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e6cd50
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1e6a100
+ Pre-existing valid DataProxy @0x14fe0b0 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x117cf10
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x14587f0
 <<---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 @0x1e69720 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e6d460
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1e7fa30
+ Pre-existing valid DataProxy @0x14fe0b0 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x152aec0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x14618c0
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1e6ed40 with key UnLocked of type Foo(CLID 8101)
- in DataObject @0x1e6d480
+StoreGateSvc        DEBUG Recorded object @0x117e8e0 with key UnLocked of type Foo(CLID 8101)
+ in DataObject @0x14f37f0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6b9d0 with key Locked of type Foo(CLID 8101)
- in DataObject @0x1e6b9f0
+StoreGateSvc        DEBUG Recorded object @0x152cdc0 with key Locked of type Foo(CLID 8101)
+ in DataObject @0x14f3840
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6d3c0 with key LockedReset of type Foo(CLID 8101)
- in DataObject @0x1e6ef00
+StoreGateSvc        DEBUG Recorded object @0x152f340 with key LockedReset of type Foo(CLID 8101)
+ in DataObject @0x1500d80
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6b050 with key UnLockedReset of type Foo(CLID 8101)
- in DataObject @0x1e6ef50
+StoreGateSvc        DEBUG Recorded object @0x15304a0 with key UnLockedReset of type Foo(CLID 8101)
+ in DataObject @0x15006e0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6b640 with key LockedDelete of type Foo(CLID 8101)
- in DataObject @0x1e6b660
+StoreGateSvc        DEBUG Recorded object @0x15333c0 with key LockedDelete of type Foo(CLID 8101)
+ in DataObject @0x14fb460
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6eaf0 with key UnLockedDelete of type Foo(CLID 8101)
- in DataObject @0x1e6daf0
+StoreGateSvc        DEBUG Recorded object @0x15300b0 with key UnLockedDelete of type Foo(CLID 8101)
+ in DataObject @0x15014b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6eb10 with key Const of type Foo(CLID 8101)
- in DataObject @0x1e7fcb0
+StoreGateSvc        DEBUG Recorded object @0x150e320 with key Const of type Foo(CLID 8101)
+ in DataObject @0x14ef8f0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e7fd90 with key Const2 of type Foo(CLID 8101)
- in DataObject @0x1e7fea0
+StoreGateSvc        DEBUG Recorded object @0x1449fc0 with key Const2 of type Foo(CLID 8101)
+ in DataObject @0x14f4b50
  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 @0x1e7fd00 found in Store for key Const with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e801a0
- recorded with key Const of type Foo (CLID 8101) in DataObject @0x1e802b0
+ Pre-existing valid DataProxy @0x1500a00 found in Store for key Const with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x146a6b0
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x14ed940
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1e80230 with key ow of type Foo(CLID 8101)
- in DataObject @0x1e801c0
+StoreGateSvc        DEBUG Recorded object @0x1468f10 with key ow of type Foo(CLID 8101)
+ in DataObject @0x14fd650
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1e803c0 with key ow of type Foo(CLID 8101)
- in DataObject @0x1e804c0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x14f5290 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1491e00
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1e803a0 with key ow of type Foo(CLID 8101)
- in DataObject @0x1e801c0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x1464b70 with key ow of type Foo(CLID 8101)
+ in DataObject @0x14fd650
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e80250 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x1e804c0
+StoreGateSvc        DEBUG Recorded object @0x153a3e0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x1491e00
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1e80550 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x1e80650
+StoreGateSvc        DEBUG overwrite: Recorded object @0x14f54d0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x153a820
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1e80530 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x1e804c0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x146adb0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x1491e00
  object not modifiable when retrieved
 *** StoreGateSvcClient_test records OK ***
 
 
 *** ClearStore_test clear the store ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7fd00, recorded with key=Const, CLID=8101, containing data object @0x1e7fcb0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7ec80, recorded with key=Const2, CLID=8101, containing data object @0x1e7fea0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6d330, recorded with key=Locked, CLID=8101, containing data object @0x1e6b9f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6ea40, recorded with key=LockedDelete, CLID=8101, containing data object @0x1e6b660  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6afc0, recorded with key=LockedReset, CLID=8101, containing data object @0x1e6ef00  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6ed60, recorded with key=UnLocked, CLID=8101, containing data object @0x1e6d480  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6db40, recorded with key=UnLockedDelete, CLID=8101, containing data object @0x1e6daf0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6b590, recorded with key=UnLockedReset, CLID=8101, containing data object @0x1e6ef50  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6ba90, recorded with key=cpFoo, CLID=8101, containing data object @0x1e6b300  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7ebd0, recorded with key=ow, CLID=8101, containing data object @0x1e801c0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7eb60, recorded with key=ow2, CLID=8101, containing data object @0x1e804c0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7f8f0, recorded with key=pFoo1, CLID=8101, containing data object @0x1e62190  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6eb90, recorded with key=pFoo2, CLID=8101, containing data object @0x1e6c940  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e69720, recorded with key=silly, CLID=8101, containing data object @0x1e68d90  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1500a00, recorded with key=Const, CLID=8101, containing data object @0x14ef8f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153a230, recorded with key=Const2, CLID=8101, containing data object @0x14f4b50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14fdf80, recorded with key=Locked, CLID=8101, containing data object @0x14f3840  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14fb4b0, recorded with key=LockedDelete, CLID=8101, containing data object @0x14fb460  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1500670, recorded with key=LockedReset, CLID=8101, containing data object @0x1500d80  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14f7440, recorded with key=UnLocked, CLID=8101, containing data object @0x14f37f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14ef880, recorded with key=UnLockedDelete, CLID=8101, containing data object @0x15014b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14f5cd0, recorded with key=UnLockedReset, CLID=8101, containing data object @0x15006e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14fcee0, recorded with key=cpFoo, CLID=8101, containing data object @0x14fc900  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14f84d0, recorded with key=ow, CLID=8101, containing data object @0x14fd650  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153a870, recorded with key=ow2, CLID=8101, containing data object @0x1491e00  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153a370, recorded with key=pFoo1, CLID=8101, containing data object @0x1539d10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1500750, recorded with key=pFoo2, CLID=8101, containing data object @0x14fc8b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14fe0b0, recorded with key=silly, CLID=8101, containing data object @0x1461870  ... -> DONE
 Testing dump: store should contain no data now 
  -------->>
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
-StoreGateSvc(StoreGateSvc)::dump():
-Found 12 proxies for ClassID 8101 (Foo): 
+SGImplSvc(StoreGateSvc)::dump():
+Found 10 proxies for ClassID 8101 (Foo): 
  flags: (INVALID,   locked,  reset) --- data:          0 --- key: Const
  flags: (INVALID,   locked,  reset) --- data:          0 --- key: Const2
  flags: (INVALID,   locked,  reset) --- data:          0 --- key: Locked
@@ -160,8 +159,6 @@ Found 12 proxies for ClassID 8101 (Foo):
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: UnLocked
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: UnLockedReset
  flags: (INVALID,   locked,  reset) --- data:          0 --- key: cpFoo
- flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: ow
- flags: (INVALID,   locked,  reset) --- data:          0 --- key: ow2
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: pFoo1
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: pFoo2
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: silly
@@ -173,124 +170,124 @@ Found 12 proxies for ClassID 8101 (Foo):
 
 *** ClearStore_test run standard testRecord a second time ***
 *** StoreGateSvcClient_test record BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x1e4ed30 with key pFoo1 of type Foo(CLID 8101)
- in DataObject @0x1e68d90
+StoreGateSvc        DEBUG Recorded object @0x150e320 with key pFoo1 of type Foo(CLID 8101)
+ in DataObject @0x14587f0
  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 @0x1e7f8f0 found in Store for key pFoo1 with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e6ab40
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x1e6c940
+ Pre-existing valid DataProxy @0x153a370 found in Store for key pFoo1 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x146a6b0
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x153a1e0
 <<---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 @0x1e4ed30 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0x150e320 already in store with key=pFoo1. Will not record a duplicate! 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1e803a0 with key pFoo2 of type Foo(CLID 8101)
- in DataObject @0x1e6b300
+StoreGateSvc        DEBUG Recorded object @0x1529bc0 with key pFoo2 of type Foo(CLID 8101)
+ in DataObject @0x148fcc0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e7d340 with key cpFoo of type Foo(CLID 8101)
- in DataObject @0x1e7fea0
+StoreGateSvc        DEBUG Recorded object @0x15290c0 with key cpFoo of type Foo(CLID 8101)
+ in DataObject @0x15006e0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e60b50 with key silly of type Foo(CLID 8101)
- in DataObject @0x1e7fcb0
+StoreGateSvc        DEBUG Recorded object @0x15104b0 with key silly of type Foo(CLID 8101)
+ in DataObject @0x14f0460
  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 @0x1e69720 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e5d7e0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1e802b0
+ Pre-existing valid DataProxy @0x14fe0b0 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1527eb0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x14f4b50
 <<---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 @0x1e69720 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e7f960
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1e7fa30
+ Pre-existing valid DataProxy @0x14fe0b0 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x152cdc0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x14fd650
 <<---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 @0x1e69720 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e61820
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1e6a100
+ Pre-existing valid DataProxy @0x14fe0b0 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x15333c0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x14fffe0
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1e6b8a0 with key UnLocked of type Foo(CLID 8101)
- in DataObject @0x1e60cc0
+StoreGateSvc        DEBUG Recorded object @0x117e8e0 with key UnLocked of type Foo(CLID 8101)
+ in DataObject @0x1539d10
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6a380 with key Locked of type Foo(CLID 8101)
- in DataObject @0x1e6cb70
+StoreGateSvc        DEBUG Recorded object @0x15300b0 with key Locked of type Foo(CLID 8101)
+ in DataObject @0x14f84d0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6c4a0 with key LockedReset of type Foo(CLID 8101)
- in DataObject @0x1e7f8a0
+StoreGateSvc        DEBUG Recorded object @0x1535080 with key LockedReset of type Foo(CLID 8101)
+ in DataObject @0x1500b40
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6ac20 with key UnLockedReset of type Foo(CLID 8101)
- in DataObject @0x1e696c0
+StoreGateSvc        DEBUG Recorded object @0x152cae0 with key UnLockedReset of type Foo(CLID 8101)
+ in DataObject @0x14f2080
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e69000 with key LockedDelete of type Foo(CLID 8101)
- in DataObject @0x1e6dc00
+StoreGateSvc        DEBUG Recorded object @0x1531a80 with key LockedDelete of type Foo(CLID 8101)
+ in DataObject @0x14f20d0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e68f40 with key UnLockedDelete of type Foo(CLID 8101)
- in DataObject @0x1e6ece0
+StoreGateSvc        DEBUG Recorded object @0x1525a40 with key UnLockedDelete of type Foo(CLID 8101)
+ in DataObject @0x14f37f0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6cd60 with key Const of type Foo(CLID 8101)
- in DataObject @0x1e6cd10
+StoreGateSvc        DEBUG Recorded object @0x1526bb0 with key Const of type Foo(CLID 8101)
+ in DataObject @0x14f3840
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e6c230 with key Const2 of type Foo(CLID 8101)
- in DataObject @0x1e7faa0
+StoreGateSvc        DEBUG Recorded object @0x1525d20 with key Const2 of type Foo(CLID 8101)
+ in DataObject @0x1491e00
  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 @0x1e7fd00 found in Store for key Const with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1e7fb10
- recorded with key Const of type Foo (CLID 8101) in DataObject @0x1e6b620
+ Pre-existing valid DataProxy @0x1500a00 found in Store for key Const with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x14ef920
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x14fb4d0
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1e6b670 with key ow of type Foo(CLID 8101)
- in DataObject @0x1e6b9b0
+StoreGateSvc        DEBUG Recorded object @0x14fb520 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1539300
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1e6ba00 with key ow of type Foo(CLID 8101)
- in DataObject @0x1e6e890
+StoreGateSvc        DEBUG overwrite: Recorded object @0x14759f0 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1501550
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1e6b690 with key ow of type Foo(CLID 8101)
- in DataObject @0x1e6b9b0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x15393c0 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1539300
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1e803c0 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x1e6e890
+StoreGateSvc        DEBUG Recorded object @0x14844f0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x1501550
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1e6e8e0 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x1e6d010
+StoreGateSvc        DEBUG overwrite: Recorded object @0x1478260 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x14ed940
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1e6ba20 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x1e6e890
+StoreGateSvc        DEBUG overwrite: Recorded object @0x1492510 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x1501550
  object not modifiable when retrieved
 *** StoreGateSvcClient_test records OK ***
 
 
 *** ClearStore_test clear the store again ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7fd00, recorded with key=Const, CLID=8101, containing data object @0x1e6cd10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7ec80, recorded with key=Const2, CLID=8101, containing data object @0x1e7faa0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6d330, recorded with key=Locked, CLID=8101, containing data object @0x1e6cb70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6b030, recorded with key=LockedDelete, CLID=8101, containing data object @0x1e6dc00  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6afc0, recorded with key=LockedReset, CLID=8101, containing data object @0x1e7f8a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6ed60, recorded with key=UnLocked, CLID=8101, containing data object @0x1e60cc0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6e410, recorded with key=UnLockedDelete, CLID=8101, containing data object @0x1e6ece0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6b590, recorded with key=UnLockedReset, CLID=8101, containing data object @0x1e696c0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6ba90, recorded with key=cpFoo, CLID=8101, containing data object @0x1e7fea0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7ebd0, recorded with key=ow, CLID=8101, containing data object @0x1e6b9b0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7eb60, recorded with key=ow2, CLID=8101, containing data object @0x1e6e890  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e7f8f0, recorded with key=pFoo1, CLID=8101, containing data object @0x1e68d90  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e6eb90, recorded with key=pFoo2, CLID=8101, containing data object @0x1e6b300  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1e69720, recorded with key=silly, CLID=8101, containing data object @0x1e7fcb0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1500a00, recorded with key=Const, CLID=8101, containing data object @0x14f3840  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153a230, recorded with key=Const2, CLID=8101, containing data object @0x1491e00  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14fdf80, recorded with key=Locked, CLID=8101, containing data object @0x14f84d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14fc8b0, recorded with key=LockedDelete, CLID=8101, containing data object @0x14f20d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1500670, recorded with key=LockedReset, CLID=8101, containing data object @0x1500b40  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14f7440, recorded with key=UnLocked, CLID=8101, containing data object @0x1539d10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14fb460, recorded with key=UnLockedDelete, CLID=8101, containing data object @0x14f37f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14f5cd0, recorded with key=UnLockedReset, CLID=8101, containing data object @0x14f2080  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14fcee0, recorded with key=cpFoo, CLID=8101, containing data object @0x15006e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1539350, recorded with key=ow, CLID=8101, containing data object @0x1539300  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153a820, recorded with key=ow2, CLID=8101, containing data object @0x1501550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153a370, recorded with key=pFoo1, CLID=8101, containing data object @0x14587f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1500750, recorded with key=pFoo2, CLID=8101, containing data object @0x148fcc0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x14fe0b0, recorded with key=silly, CLID=8101, containing data object @0x14f0460  ... -> DONE
 Testing dump: store should contain no data now 
  -------->>
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
-StoreGateSvc(StoreGateSvc)::dump():
-Found 12 proxies for ClassID 8101 (Foo): 
+SGImplSvc(StoreGateSvc)::dump():
+Found 10 proxies for ClassID 8101 (Foo): 
  flags: (INVALID,   locked,  reset) --- data:          0 --- key: Const
  flags: (INVALID,   locked,  reset) --- data:          0 --- key: Const2
  flags: (INVALID,   locked,  reset) --- data:          0 --- key: Locked
@@ -298,8 +295,6 @@ Found 12 proxies for ClassID 8101 (Foo):
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: UnLocked
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: UnLockedReset
  flags: (INVALID,   locked,  reset) --- data:          0 --- key: cpFoo
- flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: ow
- flags: (INVALID,   locked,  reset) --- data:          0 --- key: ow2
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: pFoo1
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: pFoo2
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: silly
@@ -308,22 +303,20 @@ Found 12 proxies for ClassID 8101 (Foo):
 <<--------
 *** ClearStore_test clear the store one last time forcing proxy removal (the way we do in finalize()) ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e7fd00, recorded with key=Const, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e7ec80, recorded with key=Const2, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e6d330, recorded with key=Locked, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e6afc0, recorded with key=LockedReset, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e6ed60, recorded with key=UnLocked, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e6b590, recorded with key=UnLockedReset, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e6ba90, recorded with key=cpFoo, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e7ebd0, recorded with key=ow, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e7eb60, recorded with key=ow2, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e7f8f0, recorded with key=pFoo1, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e6eb90, recorded with key=pFoo2, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1e69720, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1500a00, recorded with key=Const, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x153a230, recorded with key=Const2, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x14fdf80, recorded with key=Locked, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1500670, recorded with key=LockedReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x14f7440, recorded with key=UnLocked, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x14f5cd0, recorded with key=UnLockedReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x14fcee0, recorded with key=cpFoo, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x153a370, recorded with key=pFoo1, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1500750, recorded with key=pFoo2, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x14fe0b0, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
 Testing dump: store should contain no proxy now 
  -------->>
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
-StoreGateSvc(StoreGateSvc)::dump():
+SGImplSvc(StoreGateSvc)::dump():
 Found 0 proxies for ClassID 8101 (Foo): 
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
diff --git a/AtlasTest/ControlTest/share/DataLink_test.ref b/AtlasTest/ControlTest/share/DataLink_test.ref
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/DataLink_test.txt b/AtlasTest/ControlTest/share/DataLink_test.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/DataProxy_test.ref b/AtlasTest/ControlTest/share/DataProxy_test.ref
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/DataProxy_test.txt b/AtlasTest/ControlTest/share/DataProxy_test.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/ElementLinkVector_test.ref b/AtlasTest/ControlTest/share/ElementLinkVector_test.ref
old mode 100755
new mode 100644
index 37bbec5a8ee..94f391f2fc5
--- a/AtlasTest/ControlTest/share/ElementLinkVector_test.ref
+++ b/AtlasTest/ControlTest/share/ElementLinkVector_test.ref
@@ -1,7 +1,7 @@
 
 
 Initializing Gaudi ApplicationMgr using job opts ../share/ElementLinkVector_test.txt
-JobOptionsSvc        INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/InstallArea/jobOptions/ControlTest/StoreGateTestCommon.txt)
+JobOptionsSvc        INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/InstallArea/jobOptions/ControlTest/StoreGateTestCommon.txt
 JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
@@ -11,35 +11,32 @@ JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
 JobOptionsSvc        INFO Job options successfully read in from ../share/ElementLinkVector_test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v1r3p3)
-                                          running on lxplus403.cern.ch on Mon Apr 22 16:04:30 2013
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r3)
+                                          running on lxplus0006.cern.ch on Tue Mar 10 18:59:08 2015
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-39-03
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-07
-ClassIDSvc           INFO  getRegistryEntries: read 137 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 137 CLIDRegistry entries for module ALL
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-03
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-02-39-03
+DetectorStore        INFO Initializing DetectorStore - package version StoreGate-03-01-06
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-18
+ClassIDSvc           INFO  getRegistryEntries: read 175 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
+HistoryStore         INFO Initializing HistoryStore - package version StoreGate-03-01-06
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-39-03
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-01-06
 StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
 *** ElementLinkVector_test vector starts ***
 
 
-StoreGateSvc        DEBUG Recorded object @0x18880ae0 with key a vector of type IntVector(CLID 7368883)
- in DataObject @0x18881f50
+StoreGateSvc        DEBUG Recorded object @0x1d0bf50 with key a vector of type IntVector(CLID 7368883)
+ in DataObject @0x1d0bee0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x18881fc0 with key another vector of type IntVector(CLID 7368883)
- in DataObject @0x188822d0
+StoreGateSvc        DEBUG Recorded object @0x1d0c1f0 with key another vector of type IntVector(CLID 7368883)
+ in DataObject @0x1d0c100
  object modifiable when retrieved
 *** ElementLinkVector_test vector OK ***
 
diff --git a/AtlasTest/ControlTest/share/ElementLinkVector_test.txt b/AtlasTest/ControlTest/share/ElementLinkVector_test.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/ElementLink_test.ref b/AtlasTest/ControlTest/share/ElementLink_test.ref
old mode 100755
new mode 100644
index cb31c492707..6655e73d455
--- a/AtlasTest/ControlTest/share/ElementLink_test.ref
+++ b/AtlasTest/ControlTest/share/ElementLink_test.ref
@@ -1,7 +1,7 @@
 
 
 Initializing Gaudi ApplicationMgr using job opts ../share/ElementLink_test.txt
-JobOptionsSvc        INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/InstallArea/jobOptions/ControlTest/StoreGateTestCommon.txt)
+JobOptionsSvc        INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/InstallArea/jobOptions/ControlTest/StoreGateTestCommon.txt
 JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
@@ -11,30 +11,27 @@ JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
 JobOptionsSvc        INFO Job options successfully read in from ../share/ElementLink_test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v1r3p3)
-                                          running on lxplus403.cern.ch on Mon Apr 22 16:15:28 2013
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r3)
+                                          running on lxplus0056.cern.ch on Tue Mar 10 19:27:41 2015
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-39-03
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-07
-ClassIDSvc           INFO  getRegistryEntries: read 161 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 161 CLIDRegistry entries for module ALL
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-03
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-02-39-03
+DetectorStore        INFO Initializing DetectorStore - package version StoreGate-03-01-06
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-18
+ClassIDSvc           INFO  getRegistryEntries: read 200 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
+HistoryStore         INFO Initializing HistoryStore - package version StoreGate-03-01-06
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-39-03
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-01-06
 StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
  ************* Starting Test 1 
-StoreGateSvc        DEBUG Recorded object @0xbb1ae50 with key fooVec of type DataVector<Foo>(CLID 1234)
- in DataObject @0xbb1c2c0
+StoreGateSvc        DEBUG Recorded object @0x15c61d0 with key fooVec of type DataVector<Foo>(CLID 1234)
+ in DataObject @0x15c6160
  object modifiable when retrieved
  Test1: test of contained Element 
  Test1: test of indexed Element 
@@ -44,19 +41,18 @@ StoreGateSvc        DEBUG Recorded object @0xbb1ae50 with key fooVec of type Dat
  Test: test of ElementLink setElement, setStorable
 Now we expect to see an error message:
 ----Error Message Starts--->>
-ElementLink         ERROR toPersistent: the internal state of link @0x7fff45970200 to the collection [] of type [DataVector<Foo>] is INVALID. Looks like you forgot to invoke setStorableObject. This link can not be written
 <<---Error Message Ends-------
  >>>>>>>>> Passed Test 1 <<<<<<<<<<< 
  ************* Starting Test 2 
-StoreGateSvc        DEBUG Recorded object @0x7fff45970360 with key  key of type std::vector<std::string>(CLID 25884436)
- in DataObject @0xbb17700
+StoreGateSvc        DEBUG Recorded object @0x7fff6e8df9f0 with key  key of type std::vector<std::string>(CLID 25884436)
+ in DataObject @0x15c6110
  object modifiable when retrieved
  Test2: test of contained Element 
  Test2: test of indexed Element 
  >>>>>>>>> Passed Test 2 <<<<<<<<<<< 
  Starting Test 3 
-StoreGateSvc        DEBUG Recorded object @0xbb1cc40 with key fooVec2 of type std::vector<Foo>(CLID 2233)
- in DataObject @0xbb1ce90
+StoreGateSvc        DEBUG Recorded object @0x15b3d80 with key fooVec2 of type std::vector<Foo>(CLID 2233)
+ in DataObject @0x15c6740
  object modifiable when retrieved
  Test3: test of contained Element 
  Test3: test of indexed Element 
diff --git a/AtlasTest/ControlTest/share/ElementLink_test.txt b/AtlasTest/ControlTest/share/ElementLink_test.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/FortranAlgorithm.ref b/AtlasTest/ControlTest/share/FortranAlgorithm.ref
old mode 100755
new mode 100644
index bc3e9fc43a1..ff1dd2fed09
--- a/AtlasTest/ControlTest/share/FortranAlgorithm.ref
+++ b/AtlasTest/ControlTest/share/FortranAlgorithm.ref
@@ -1,45 +1,50 @@
-Mon Apr 22 16:03:22 CEST 2013
+Sat Mar 12 19:56:23 CET 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-17.8.0] [x86_64-slc5-gcc43-opt] [17.X.0-VAL/rel_1] -- built on [2013 04/21 22:04]
+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 including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Py:Athena            INFO including file "AthenaCommon/Execution.py"
+Py:Athena            INFO executing ROOT6Setup
+[?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthExFortranAlgorithm/FortranAlgorithmOptions.py"
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-Py:ConfigurableDb    INFO Read module info for 5385 configurables from 19 genConfDb files
-Py:ConfigurableDb    INFO No duplicates have been found: that's good !
-ApplicationMgr       INFO Updating ROOT::Reflex::PluginService::SetDebug(level) to level=0
+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 WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
+Py:ConfigurableDb WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigJetHypo.TrigJetHypoConf - ['TrigHLTJetHypo.TrigHLTJetHypoConf']
+Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v1r3p3)
-                                          running on lxplus403.cern.ch on Mon Apr 22 16:03:34 2013
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
+                                          running on lxplus031.cern.ch on Sat Mar 12 19:56:35 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating ROOT::Reflex::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-07
-ClassIDSvc           INFO  getRegistryEntries: read 1681 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 1681 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-19
+ClassIDSvc           INFO  getRegistryEntries: read 2109 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-57-09
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-02
 AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
 AthAlgSeq            INFO Member list: FortranAlgorithm
 FortranAlgorithm     INFO calling initialize_()
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-39-03
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-03
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-06-31
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-02-07
 HistogramPersis...WARNING Histograms saving not required.
-ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-02-39-03
+ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-03-06-31
 ApplicationMgr       INFO Application Manager Initialized successfully
 StoreGateSvc         INFO Start StoreGateSvc
 ApplicationMgr       INFO Application Manager Started successfully
-AthenaEventLoopMgr   INFO   ===>>>  start of run 0    <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #0 0 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 FortranAlgorithm     INFO calling execute_()
 Reading 1A
 Reading 2B
@@ -48,7 +53,7 @@ Reading 3A
 Before the backspace
 Reading 4A
 Reading 5B
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #0 1 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 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
@@ -57,14 +62,13 @@ AthAlgSeq            INFO Finalizing AthAlgSeq...
 AthOutSeq            INFO Finalizing AthOutSeq...
 AthRegSeq            INFO Finalizing AthRegSeq...
 AthMasterSeq         INFO Finalizing AthMasterSeq...
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-02-39-03
+StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-03-06-31
 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 ****************************************************************************************************
-AthenaSealSvc::...   INFO Time User   : Tot=    0 [us]                                             #=  1
-ChronoStatSvc        INFO Time User   : Tot=   27 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  107 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/AtlasTest/ControlTest/share/HelloWorld.ref b/AtlasTest/ControlTest/share/HelloWorld.ref
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/HistNtup.ref b/AtlasTest/ControlTest/share/HistNtup.ref
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref b/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
old mode 100755
new mode 100644
index 6367d53866a..d816a786781
--- a/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
+++ b/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
@@ -1,16 +1,17 @@
+Warning in <TEnvRec::ChangeValue>: duplicate entry <Root.ErrorIgnoreLevel=Print> for level 1; ignored
 
 
 Initializing Gaudi ApplicationMgr using job opts ../share/ProxyProviderSvc_test.txt
-JobOptionsSvc        INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3a/InstallArea/jobOptions/ControlTest/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # =======> /afs/cern.ch/work/c/calaf/public/fixOverwrite/InstallArea/jobOptions/ControlTest/StoreGateTestCommon.txt
 JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
 JobOptionsSvc        INFO # (8,1): StoreGateSvc.ActivateHistory = 0
 JobOptionsSvc        INFO # (9,1): CLIDSvc.OutputLevel = 2
 JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
-JobOptionsSvc        INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3a/InstallArea/jobOptions/ToyConversion/ToyConversionOpts.txt
+JobOptionsSvc        INFO # =======> /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasCore/rel_1/InstallArea/jobOptions/ToyConversion/ToyConversionOpts.txt
 JobOptionsSvc        INFO # (5,1): EventPersistencySvc.CnvServices += ["ToyConversionSvc"]
-JobOptionsSvc        INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3a/AtlasTest/ControlTest/run/../share/ProxyProviderSvc_test.txt
+JobOptionsSvc        INFO # =======> /afs/cern.ch/work/c/calaf/public/fixOverwrite/AtlasTest/ControlTest/run/../share/ProxyProviderSvc_test.txt
 JobOptionsSvc        INFO # (7,1): ProxyProviderSvc.OutputLevel = 1
 JobOptionsSvc        INFO # (9,1): ClassIDSvc.OutputLevel = 2
 JobOptionsSvc        INFO # (10,1): MessageSvc.setVerbose = ["DataProxy", "EventPersistencySvc", "ToyConversionSvc", "StoreGateSvc", "EventDataSvc", "HistogramDataSvc", "ServiceManager", "HistogramPersistencySvc", "HistoryStore", "DetectorStore", "ApplicationMgr", "ProxyProviderSvc"]
@@ -19,32 +20,36 @@ JobOptionsSvc        INFO Job options successfully read in from ../share/ProxyPr
 ApplicationMgr      DEBUG Getting my own properties
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r1)
-                                          running on lxplus0027.cern.ch on Wed Sep  3 17:32:29 2014
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r3)
+                                          running on lxplus0045.cern.ch on Wed Mar 18 02:12:43 2015
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 ServiceManager      DEBUG Initializing service DetectorStore
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-40-00
+DetectorStore        INFO Initializing DetectorStore - package version StoreGate-03-01-09
 DetectorStore       DEBUG Service base class initialized successfully
-DetectorStore     VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 EventPersistenc...  DEBUG  'CnvServices':[ 'ToyConversionSvc' ]
 EventPersistenc...  DEBUG Service base class initialized successfully
 DetectorStore     VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-12
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-18
 ClassIDSvc          DEBUG Service base class initialized successfully
-ClassIDSvc           INFO  getRegistryEntries: read 157 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 201 CLIDRegistry entries for module ALL
+ClassIDSvc          DEBUG processCLIDDB: read 1246 entries from CLIDDB file: /afs/cern.ch/work/c/calaf/public/fixOverwrite/InstallArea/share/clid.db
+ClassIDSvc          DEBUG processCLIDDB: read 1246 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasOffline/rel_1/InstallArea/share/clid.db
+ClassIDSvc          DEBUG processCLIDDB: read 1223 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasAnalysis/rel_1/InstallArea/share/clid.db
+ClassIDSvc          DEBUG processCLIDDB: read 1065 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasSimulation/rel_1/InstallArea/share/clid.db
+ClassIDSvc          DEBUG processCLIDDB: read 1204 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasTrigger/rel_1/InstallArea/share/clid.db
+ClassIDSvc          DEBUG processCLIDDB: read 1136 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasReconstruction/rel_1/InstallArea/share/clid.db
+ClassIDSvc          DEBUG processCLIDDB: read 1042 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasEvent/rel_1/InstallArea/share/clid.db
+ClassIDSvc          DEBUG processCLIDDB: read 251 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasConditions/rel_1/InstallArea/share/clid.db
+ClassIDSvc          DEBUG processCLIDDB: read 92 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasCore/rel_1/InstallArea/share/clid.db
 DetectorStore     VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-07
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
 ProxyProviderSvc  VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-ProxyProviderSvc    DEBUG Service base class initialized successfully
-DetectorStore     VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
 ServiceManager      DEBUG Initializing service HistoryStore
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-02-40-00
+HistoryStore         INFO Initializing HistoryStore - package version StoreGate-03-01-09
 HistoryStore        DEBUG Service base class initialized successfully
-HistoryStore      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 HistoryStore      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 HistoryStore      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-HistoryStore      VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
 ServiceManager      DEBUG Initializing service AppMgrRunable
 ServiceManager      DEBUG Initializing service EventLoopMgr
 EventDataSvc        DEBUG Service base class initialized successfully
@@ -58,21 +63,20 @@ HistogramPersis...  DEBUG Service base class initialized successfully
 HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-40-00
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-01-09
 StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
-building toy 0x10a74d0
+StoreGateSvc        DEBUG  Bound handle 0x7fff5f6e0000 to proxy 0xe352e0
+building toy 0xe35c80
 ToyConversionSvc    DEBUG Service base class initialized successfully
 EventPersistenc...VERBOSE ServiceLocatorHelper::service: found service ToyConversionSvc
 EventPersistenc...   INFO Added successfully Conversion service:ToyConversionSvc
-ClassIDSvc           INFO  getRegistryEntries: read 628 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 722 CLIDRegistry entries for module ALL
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
-StoreGateSvc(StoreGateSvc)::dump():
+SGImplSvc(StoreGateSvc)::dump():
 Found 1 proxy for ClassID 8107 (Bar): 
- flags: (  valid,   locked,  reset) --- data:  0x10a7f50 --- key: aBar
+ flags: (  valid,   locked,  reset) --- data:   0xe365b0 --- key: aBar
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 StoreGateSvc        DEBUG Retrieved const handle to object aFoo  of type Foo(CLID 8101)
@@ -82,18 +86,21 @@ StoreGateSvc        DEBUG Retrieved const handle to object aFooBar  of type FooB
 ToyConversionSvc     INFO No converter for object   CLID= 8109
 DataProxy         WARNING accessData: conversion failed for data object 8109/aFooBar
  Returning NULL DataObject pointer  
-SG::DataProxy_castWARNING this proxy 0x10213c0 has a NULL data object ptr
+SG::DataProxy_castWARNING this proxy 0xdf3a00 has a NULL data object ptr
 <<---Error Message Ends-------
 *** ProxyProviderSvc_test OK ***
 *** ProxyProviderSvc_test RecordBeforeRead BEGINS ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1022f20, recorded with key=aFoo, CLID=8101, containing data object @0xfc21d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x10a6030, recorded with key=aBar, CLID=8107, containing data object @0x10a7f50  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x10213c0, recorded with key=aFooBar, CLID=8109, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  reset object aFoo CLID 8101 address 0xd528d0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde50d0, recorded with key=aFoo, CLID=8101, containing data object @0xd528d0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  reset object aBar CLID 8107 address 0xe365b0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xe352e0, recorded with key=aBar, CLID=8107, containing data object @0xe365b0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  reset object aFooBar CLID 8109 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdf3a00, recorded with key=aFooBar, CLID=8109, containing data object @0  ... -> DONE
 StoreGateSvc      WARNING record_impl: you are recording an object with key existingFoo, type Foo (CLID 8101)
- There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated. Use StoreGateSvc::overwrite method instead
-StoreGateSvc        DEBUG Recorded object @0x109b770 with key existingFoo of type Foo(CLID 8101)
- in DataObject @0x10a7f50
+ There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated. Use SGImplSvc::overwrite method instead
+StoreGateSvc        DEBUG Recorded object @0xe2a140 with key existingFoo of type Foo(CLID 8101)
+ in DataObject @0xd89e10
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object existingFoo  of type Foo(CLID 8101)
 6.28
@@ -103,25 +110,25 @@ StoreGateSvc        DEBUG Retrieved const handle to object existingFoo  of type
 *** ProxyProviderSvc_test readPrivate BEGINS ***
 Now we expect to see an error message:
 ----Error Message Starts--->>
-StoreGateSvc      WARNING StoreGateSvc::typeless_readPrivateCopy: did not find object of type Foo with key NotThere
+StoreGateSvc      WARNING SGImplSvc::typeless_readPrivateCopy: did not find object of type Foo with key NotThere
 SG::fromStorable  WARNING null input pointer 
 <<---Error Message Ends-------
 StoreGateSvc      WARNING record_impl: you are recording an object with key privFoo, type Foo (CLID 8101)
- There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated. Use StoreGateSvc::overwrite method instead
-StoreGateSvc        DEBUG Recorded object @0x109fbb0 with key privFoo of type Foo(CLID 8101)
- in DataObject @0xf7ba40
+ There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated. Use SGImplSvc::overwrite method instead
+StoreGateSvc        DEBUG Recorded object @0xe293c0 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0xd8d500
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x107be00 with key privFoo of type Foo(CLID 8101)
- in DataObject @0x1034de0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xe0d840 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0xdf0170
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object privFoo  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0x10a36e0 with key silly33 of type Foo(CLID 8101)
- in DataObject @0x1022be0
+StoreGateSvc        DEBUG Recorded object @0xe2bb10 with key silly33 of type Foo(CLID 8101)
+ in DataObject @0xdf9950
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object silly33  of type Foo(CLID 8101)
 Now we expect to see an error message:
 ----Error Message Starts--->>
-StoreGateSvc      WARNING StoreGateSvc::typeless_readPrivateCopy: did not find object of type Foo with key silly33
+StoreGateSvc      WARNING SGImplSvc::typeless_readPrivateCopy: did not find object of type Foo with key silly33
 SG::fromStorable  WARNING null input pointer 
 <<---Error Message Ends-------
 StoreGateSvc        DEBUG Retrieved non-const handle to object silly33  of type Foo(CLID 8101)
@@ -136,21 +143,68 @@ Now we expect to see an error message:
 
 *** ProxyProviderSvc_test HLTAutoKeyReset BEGINS ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1022f20, recorded with key=aFoo, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x102a6f0, recorded with key=diskFoo, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x10a80a0, recorded with key=existingFoo, CLID=8101, containing data object @0x10a7f50  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x10252c0, recorded with key=privFoo, CLID=8101, containing data object @0x1034de0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1034470, recorded with key=silly33, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x10a6030, recorded with key=aBar, CLID=8107, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x10213c0, recorded with key=aFooBar, CLID=8109, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object aFoo CLID 8101 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde50d0, recorded with key=aFoo, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object diskFoo CLID 8101 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdf3420, recorded with key=diskFoo, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object existingFoo CLID 8101 address 0xd89e10
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde6d20, recorded with key=existingFoo, CLID=8101, containing data object @0xd89e10  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object privFoo CLID 8101 address 0xdf0170
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdf3cb0, recorded with key=privFoo, CLID=8101, containing data object @0xdf0170  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object silly33 CLID 8101 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xded920, recorded with key=silly33, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object aBar CLID 8107 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xe352e0, recorded with key=aBar, CLID=8107, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object aFooBar CLID 8109 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdf3a00, recorded with key=aFooBar, CLID=8109, containing data object @0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x10213c0, recorded with key=HLTAutoKey_1, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x10a80a0, recorded with key=HLTAutoKey_2, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x102a6f0, recorded with key=HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x10a58d0, recorded with key=NOT_HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_1 CLID 8101 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde50d0, recorded with key=HLTAutoKey_1, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_2 CLID 8101 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde6d20, recorded with key=HLTAutoKey_2, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_3 CLID 8101 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdf3a00, recorded with key=HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  reset object NOT_HLTAutoKey_3 CLID 8101 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xe350b0, recorded with key=NOT_HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
 *** ProxyProviderSvc_test HLTAutoKeyReset OK ***
 
 
+*** ProxyProviderSvc_test Overwrite starts ***
+
+
+StoreGateSvc        DEBUG Clearing store with forceRemove=1
+DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_1 CLID 8101 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdf3a00, recorded with key=HLTAutoKey_1, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object NOT_HLTAutoKey_3 CLID 8101 address 0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xe350b0, recorded with key=NOT_HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
+=============Event #0 starts
+StoreGateSvc        DEBUG overwrite: Recorded object @0xe26b60 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0xd528d0
+ object modifiable when retrieved
+Overwritten FooBar i=0
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
+DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0xd528d0
+FooBar i=0 deleted
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdf3a00, recorded with key=toOverwrite, CLID=8109, containing data object @0xd528d0  ... -> DONE
+=============Event #1 starts
+StoreGateSvc        DEBUG overwrite: Recorded object @0xd7c320 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0xd528d0
+ object modifiable when retrieved
+Overwritten FooBar i=1
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
+DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0xd528d0
+FooBar i=1 deleted
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde50d0, recorded with key=toOverwrite, CLID=8109, containing data object @0xd528d0  ... -> DONE
+=============Event #2 starts
+StoreGateSvc        DEBUG overwrite: Recorded object @0xe2bb10 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0xd528d0
+ object modifiable when retrieved
+Overwritten FooBar i=2
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
+DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0xd528d0
+FooBar i=2 deleted
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xe350b0, recorded with key=toOverwrite, CLID=8109, containing data object @0xd528d0  ... -> DONE
+*** ProxyProviderSvc_test Overwrite OK ***
+
+
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x102a6f0, recorded with key=HLTAutoKey_1, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x10a58d0, recorded with key=NOT_HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
diff --git a/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt b/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/SGDataLink_test.ref b/AtlasTest/ControlTest/share/SGDataLink_test.ref
old mode 100755
new mode 100644
index 05728c63812..305db09c84e
--- a/AtlasTest/ControlTest/share/SGDataLink_test.ref
+++ b/AtlasTest/ControlTest/share/SGDataLink_test.ref
@@ -13,48 +13,46 @@ JobOptionsSvc        INFO # (2,1): MessageSvc.setVerbose += ["ElementLink"]
 JobOptionsSvc        INFO Job options successfully read in from ../share/DataLink_test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v2r1)
-                                          running on lxplus0032.cern.ch on Mon Jun  2 16:16:30 2014
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r3)
+                                          running on lxplus0056.cern.ch on Tue Mar 10 19:24:25 2015
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-41-13
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-11
-ClassIDSvc           INFO  getRegistryEntries: read 183 CLIDRegistry entries for module ALL
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-07
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-02-41-13
+DetectorStore        INFO Initializing DetectorStore - package version StoreGate-03-01-06
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-18
+ClassIDSvc           INFO  getRegistryEntries: read 188 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
+HistoryStore         INFO Initializing HistoryStore - package version StoreGate-03-01-06
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-41-13
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-01-06
 StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
-StoreGateSvc        DEBUG Recorded object @0x2193fa0 with key foo2 of type Foo(CLID 8101)
- in DataObject @0x2230db0
+StoreGateSvc        DEBUG Recorded object @0xf43bb0 with key foo2 of type Foo(CLID 8101)
+ in DataObject @0xf724c0
  object modifiable when retrieved
 *** DataLink_test - testing DataProxyStorage ***
-StoreGateSvc        DEBUG Recorded object @0x208d680 with key pint of type int(CLID 244260744)
- in DataObject @0x22b85b0
+StoreGateSvc        DEBUG Recorded object @0xf46840 with key pint of type int(CLID 244260744)
+ in DataObject @0xf72990
  object modifiable when retrieved
 Now we expect to see an error message:
 ----Error Message Starts--->>
 <<----Error Message Ends-----
-StoreGateSvc        DEBUG Recorded object @0x22b3570 with key pFoo of type Foo(CLID 8101)
- in DataObject @0x22b8b60
+StoreGateSvc        DEBUG Recorded object @0xf43040 with key pFoo of type Foo(CLID 8101)
+ in DataObject @0xf72dd0
  object modifiable when retrieved
 *** IntVector test starts ***
-StoreGateSvc        DEBUG Recorded object @0x22b8ea0 with key vint of type IntVector(CLID 7368883)
- in DataObject @0x22b8f80
+StoreGateSvc        DEBUG Recorded object @0xf73060 with key vint of type IntVector(CLID 7368883)
+ in DataObject @0xf73170
  object modifiable when retrieved
-vector [1] = 0x22b8d00
+vector [1] = 0xf607c0
 *** IntVector test OK ***
 *** Map test starts ***
-StoreGateSvc        DEBUG Recorded object @0x22b8a90 with key pmint of type map<int,string>(CLID 231411637)
- in DataObject @0x22b8e50
+StoreGateSvc        DEBUG Recorded object @0xf73480 with key pmint of type map<int,string>(CLID 231411637)
+ in DataObject @0xf734c0
  object modifiable when retrieved
 map [20] = venti
 *** Map test OK ***
@@ -62,17 +60,17 @@ map [20] = venti
 venti has key 20
 found set element venti
 *** test reverse lookup static functions OK ***
-StoreGateSvc        DEBUG Recorded object @0x22b9460 with key novantanove of type int(CLID 244260744)
- in DataObject @0x22b9640
+StoreGateSvc        DEBUG Recorded object @0xbb5980 with key novantanove of type int(CLID 244260744)
+ in DataObject @0xf73b20
  object modifiable when retrieved
 *** DataLink_test DataProxyStorage OK ***
 
 
-StoreGateSvc        DEBUG Recorded object @0x22b9a30 with key a Bar of type Bar(CLID 8107)
- in DataObject @0x22b9c10
+StoreGateSvc        DEBUG Recorded object @0xf65d70 with key a Bar of type Bar(CLID 8107)
+ in DataObject @0xf73cf0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x22b9e80 with key a vector of type IntVector(CLID 7368883)
- in DataObject @0x22b9f60
+StoreGateSvc        DEBUG Recorded object @0xf73e10 with key a vector of type IntVector(CLID 7368883)
+ in DataObject @0xf73f20
  object modifiable when retrieved
 *** DataLink_test StoreGate OK ***
 
@@ -80,21 +78,21 @@ StoreGateSvc        DEBUG Recorded object @0x22b9e80 with key a vector of type I
 
 
 DataLink_test testing StateMachine
-StoreGateSvc        DEBUG Recorded object @0x22b9e10 with key pFoo3 of type Foo(CLID 8101)
- in DataObject @0x22b9e30
+StoreGateSvc        DEBUG Recorded object @0xf6acd0 with key pFoo3 of type Foo(CLID 8101)
+ in DataObject @0xf741a0
  object modifiable when retrieved
 transition invalid to Accessible OK
 transition Accessible to invalid OK
-StoreGateSvc        DEBUG Recorded object @0x22ba500 with key  of type Foo(CLID 8101)
- in DataObject @0x22ba440
+StoreGateSvc        DEBUG Recorded object @0xf54aa0 with key  of type Foo(CLID 8101)
+ in DataObject @0xf74580
  object modifiable when retrieved
 transition invalid to IdentifiedDefault OK
 transition IdentifiedDefault to Accessible OK
 transition Accessible to Persistable OK
 transition invalid to Identified OK
 foo Foo not yet registered. Caught exception -SG::ExcInvalidLink: Attempt to dereference invalid DataLink / ElementLink [8101/foo] (122152060)- as expected
-StoreGateSvc        DEBUG Recorded object @0x22ba760 with key foo of type Foo(CLID 8101)
- in DataObject @0x22ba6a0
+StoreGateSvc        DEBUG Recorded object @0xbb4f30 with key foo of type Foo(CLID 8101)
+ in DataObject @0xf747e0
  object modifiable when retrieved
 transition Identified to Accessible OK
 reset Accessible OK
diff --git a/AtlasTest/ControlTest/share/StoreGateDFlow.ref b/AtlasTest/ControlTest/share/StoreGateDFlow.ref
index 3659d72040c..83441933614 100644
--- a/AtlasTest/ControlTest/share/StoreGateDFlow.ref
+++ b/AtlasTest/ControlTest/share/StoreGateDFlow.ref
@@ -1,50 +1,53 @@
-Tue Feb  3 20:40:42 CET 2015
+Tue May  3 22:27:15 CEST 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-20.1.1] [x86_64-slc6-gcc48-dbg] [20.1.X-VAL/rel_4] -- built on [2015-01-28 22:40]
+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 including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Root.ErrorIgnoreLevel=Print> for level 1; ignored
-Py:Athena            INFO including file "AthenaCommon/Execution.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 4652 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 2 duplicates among the 10 genConfDb files :
+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   -RPCStandaloneTracksMon: MuonTrackMonitoring.MuonTrackMonitoringConf - ['RpcRawDataMonitoring.RpcRawDataMonitoringConf']
-Py:ConfigurableDb WARNING   -LArDigits2Ntuple: LArCalibTools.LArCalibToolsConf - ['LArEventTest.LArEventTestConf']
+Py:ConfigurableDb WARNING   -D3PD__TrigConfMetadataTool: TriggerD3PDMaker.TriggerD3PDMakerConf - ['TrigCostD3PDMaker.TrigCostD3PDMakerConf']
 Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-[?1034hApplicationMgr       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 v3r1)
-                                          running on lxplus0042.cern.ch on Tue Feb  3 20:40:47 2015
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
+                                          running on lxplus018.cern.ch on Tue May  3 22:27:21 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-16
-ClassIDSvc           INFO  getRegistryEntries: read 2069 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-19
+ClassIDSvc           INFO  getRegistryEntries: read 2109 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-r642438
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-08
 AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
+ClassIDSvc           INFO  getRegistryEntries: read 492 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-02-45-01-branch
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
+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-02-45-01-branch
+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
@@ -55,7 +58,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 0
@@ -63,26 +66,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: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 dflow_alg1           INFO val: 0
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 dflow_alg2           INFO val: 20
 dflow_alg2           INFO val: 120
-dflow_alg2           INFO cptr: 0x48e9d78
+dflow_alg2           INFO cptr: 0xffee950
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -92,19 +95,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: 0x48e9d78
+dflow_alg3           INFO ptr: 0xffee950
 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: 0x4a7c5e0
+dflow_alg3           INFO ptr: 0x10667220
 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
 dflow_alg3           INFO temporary r-handle[ints] - size: 4
 dflow_alg3           INFO compare pointers: ok=1
 dflow_alg3           INFO compare pointers: ok=1
@@ -117,9 +121,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -128,12 +132,12 @@ dflow_alg3           INFO temporary r/w-int: 120
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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 #0, run #0 1 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #0 1 events processed so far  <<<===
@@ -141,7 +145,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 1
@@ -149,26 +153,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: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 dflow_alg1           INFO val: 1
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 dflow_alg2           INFO val: 21
 dflow_alg2           INFO val: 121
-dflow_alg2           INFO cptr: 0x48e9d68
+dflow_alg2           INFO cptr: 0xffeeaf0
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -178,13 +182,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: 0x48e9d68
+dflow_alg3           INFO ptr: 0xffeeaf0
 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: 0x4a7c7e0
+dflow_alg3           INFO ptr: 0x10666300
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -203,9 +207,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -214,12 +218,12 @@ dflow_alg3           INFO temporary r/w-int: 121
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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 #1, run #0 2 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #0 2 events processed so far  <<<===
@@ -227,7 +231,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 2
@@ -235,26 +239,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: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 dflow_alg1           INFO val: 2
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 dflow_alg2           INFO val: 22
 dflow_alg2           INFO val: 122
-dflow_alg2           INFO cptr: 0x48e9d78
+dflow_alg2           INFO cptr: 0xffee950
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -264,13 +268,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: 0x48e9d78
+dflow_alg3           INFO ptr: 0xffee950
 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: 0x4a7c6c0
+dflow_alg3           INFO ptr: 0x10667100
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -289,9 +293,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -300,12 +304,12 @@ dflow_alg3           INFO temporary r/w-int: 122
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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 #2, run #0 3 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #3, run #0 3 events processed so far  <<<===
@@ -313,7 +317,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 3
@@ -321,26 +325,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: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 dflow_alg1           INFO val: 3
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 dflow_alg2           INFO val: 23
 dflow_alg2           INFO val: 123
-dflow_alg2           INFO cptr: 0x48e9d68
+dflow_alg2           INFO cptr: 0xffeeaf0
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -350,13 +354,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: 0x48e9d68
+dflow_alg3           INFO ptr: 0xffeeaf0
 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: 0x4a7c700
+dflow_alg3           INFO ptr: 0x106667e0
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -375,9 +379,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -386,12 +390,12 @@ dflow_alg3           INFO temporary r/w-int: 123
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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 #3, run #0 4 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #4, run #0 4 events processed so far  <<<===
@@ -399,7 +403,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 4
@@ -407,26 +411,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: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 dflow_alg1           INFO val: 4
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 dflow_alg2           INFO val: 24
 dflow_alg2           INFO val: 124
-dflow_alg2           INFO cptr: 0x48e9d78
+dflow_alg2           INFO cptr: 0xffee950
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -436,13 +440,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: 0x48e9d78
+dflow_alg3           INFO ptr: 0xffee950
 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: 0x4a7c5e0
+dflow_alg3           INFO ptr: 0x106671c0
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -461,9 +465,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -472,12 +476,12 @@ dflow_alg3           INFO temporary r/w-int: 124
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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 #4, run #0 5 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #5, run #0 5 events processed so far  <<<===
@@ -485,7 +489,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 5
@@ -493,26 +497,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: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 dflow_alg1           INFO val: 5
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 dflow_alg2           INFO val: 25
 dflow_alg2           INFO val: 125
-dflow_alg2           INFO cptr: 0x48e9d68
+dflow_alg2           INFO cptr: 0xffeeaf0
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -522,13 +526,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: 0x48e9d68
+dflow_alg3           INFO ptr: 0xffeeaf0
 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: 0x4a7c7e0
+dflow_alg3           INFO ptr: 0x106671a0
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -547,9 +551,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -558,12 +562,12 @@ dflow_alg3           INFO temporary r/w-int: 125
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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 #5, run #0 6 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #6, run #0 6 events processed so far  <<<===
@@ -571,7 +575,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 6
@@ -579,26 +583,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: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 dflow_alg1           INFO val: 6
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 dflow_alg2           INFO val: 26
 dflow_alg2           INFO val: 126
-dflow_alg2           INFO cptr: 0x48e9d78
+dflow_alg2           INFO cptr: 0xffee950
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -608,13 +612,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: 0x48e9d78
+dflow_alg3           INFO ptr: 0xffee950
 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: 0x4a7c6c0
+dflow_alg3           INFO ptr: 0x10666340
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -633,9 +637,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -644,12 +648,12 @@ dflow_alg3           INFO temporary r/w-int: 126
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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 #6, run #0 7 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #7, run #0 7 events processed so far  <<<===
@@ -657,7 +661,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 7
@@ -665,26 +669,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: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 dflow_alg1           INFO val: 7
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 dflow_alg2           INFO val: 27
 dflow_alg2           INFO val: 127
-dflow_alg2           INFO cptr: 0x48e9d68
+dflow_alg2           INFO cptr: 0xffeeaf0
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -694,13 +698,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: 0x48e9d68
+dflow_alg3           INFO ptr: 0xffeeaf0
 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: 0x4a7c700
+dflow_alg3           INFO ptr: 0x10666f00
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -719,9 +723,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -730,12 +734,12 @@ dflow_alg3           INFO temporary r/w-int: 127
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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 #7, run #0 8 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #8, run #0 8 events processed so far  <<<===
@@ -743,7 +747,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 8
@@ -751,26 +755,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: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 dflow_alg1           INFO val: 8
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d78
+dflow_alg1           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 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: 0x48e9d78
+dflow_alg2           INFO ptr: 0xffee950
 dflow_alg2           INFO val: 28
 dflow_alg2           INFO val: 128
-dflow_alg2           INFO cptr: 0x48e9d78
+dflow_alg2           INFO cptr: 0xffee950
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -780,13 +784,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: 0x48e9d78
+dflow_alg3           INFO ptr: 0xffee950
 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: 0x4a7c5e0
+dflow_alg3           INFO ptr: 0x106670c0
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -805,9 +809,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -816,12 +820,12 @@ dflow_alg3           INFO temporary r/w-int: 128
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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 #8, run #0 9 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #9, run #0 9 events processed so far  <<<===
@@ -829,7 +833,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: 0x4a67980
+dflow_alg1           INFO ei: 0x1068f040
 dflow_alg1           INFO retrieving event-info...
 dflow_alg1           INFO evt-info.runnbr: 0
 dflow_alg1           INFO evt-info.evtnbr: 9
@@ -837,26 +841,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: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 dflow_alg1           INFO val: 9
 dflow_alg1           INFO modify myint by value...
-dflow_alg1           INFO ptr: 0x48e9d68
+dflow_alg1           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 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: 0x48e9d68
+dflow_alg2           INFO ptr: 0xffeeaf0
 dflow_alg2           INFO val: 29
 dflow_alg2           INFO val: 129
-dflow_alg2           INFO cptr: 0x48e9d68
+dflow_alg2           INFO cptr: 0xffeeaf0
 dflow_alg2           INFO ints w-handle...
 dflow_alg2           INFO size:2
 dflow_alg2           INFO val[0]= 10
@@ -866,13 +870,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: 0x48e9d68
+dflow_alg3           INFO ptr: 0xffeeaf0
 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: 0x4a7c7e0
+dflow_alg3           INFO ptr: 0x10666320
 dflow_alg3           INFO ints rw-handle...
 dflow_alg3           INFO size:4
 dflow_alg3           INFO val[0]= 10
@@ -891,9 +895,9 @@ 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--
-SG::VarHandleBa...WARNING could not get proxy for key --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
-SG::VarHandleBa...WARNING could not get proxy for key --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 name: --w-not-there--
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO name: --rw-not-there--
@@ -902,12 +906,12 @@ dflow_alg3           INFO temporary r/w-int: 129
 dflow_alg3           INFO -- testing WVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [WriteHandle<T>::operator=(const T& data) called while invalid]
+dflow_alg3           INFO good, caught: [SG::ExcNullWriteHandle: Attempt to dereference write handle before record: StoreGateSvc/dflow_int[244260744]]
 dflow_alg3           INFO valid:0
 dflow_alg3           INFO -- testing RWVar<T> semantics...
 dflow_alg3           INFO name: dflow_int
 dflow_alg3           INFO valid:0
-dflow_alg3           INFO good, caught: [UpdateHandle<T>::operator=(const T& data) called while invalid]
+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
@@ -920,15 +924,14 @@ AthAlgSeq            INFO Finalizing AthAlgSeq...
 AthOutSeq            INFO Finalizing AthOutSeq...
 AthRegSeq            INFO Finalizing AthRegSeq...
 AthMasterSeq         INFO Finalizing AthMasterSeq...
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-02-45-01-branch
+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 ****************************************************************************************************
-AthenaSealSvc::...   INFO Time User   : Tot=   92 [ms]                                             #=  1
-ChronoStatSvc        INFO Time User   : Tot=  131 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  124 [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
old mode 100755
new mode 100644
index 0ad8f6b9bbb..12ca7df3824
--- a/AtlasTest/ControlTest/share/StoreGateGen.ref
+++ b/AtlasTest/ControlTest/share/StoreGateGen.ref
@@ -1,110 +1,113 @@
-Mon Nov 18 21:42:20 CET 2013
+Sat Mar 12 19:54:42 CET 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-19.0.0] [x86_64-slc6-gcc47-dbg] [19.X.0-VAL/rel_1] -- built on [2013-11-17 22:25]
+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 including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Py:Athena            INFO including file "AthenaCommon/Execution.py"
+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 5427 configurables from 18 genConfDb files
-Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+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 WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
+Py:ConfigurableDb WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigJetHypo.TrigJetHypoConf - ['TrigHLTJetHypo.TrigHLTJetHypoConf']
+Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-[?1034hApplicationMgr       INFO Updating ROOT::Reflex::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v2r0p3)
-                                          running on lxplus0555 on Mon Nov 18 21:42:32 2013
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
+                                          running on lxplus031.cern.ch on Sat Mar 12 19:54:53 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating ROOT::Reflex::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-10
-ClassIDSvc           INFO  getRegistryEntries: read 1859 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 1859 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-19
+ClassIDSvc           INFO  getRegistryEntries: read 2109 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-57-16
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-02
 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-02-39-14
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-06-31
 StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-06
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
+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-02-39-14
+ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-03-06-31
 ApplicationMgr       INFO Application Manager Initialized successfully
 StoreGateSvc         INFO Start StoreGateSvc
 ApplicationMgr       INFO Application Manager Started successfully
-StoreGateSvc        DEBUG Recorded object @0x5f8d540 with key  of type EventInfo(CLID 2101)
- in DataObject @0x6a28048
- object not modifiable when retrieved
-AthenaEventLoopMgr   INFO   ===>>>  start of run 0    <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #0 0 events processed so far  <<<===
+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 @0x65234f0 with key  of type MyDataObj(CLID 8000)
- in DataObject @0x6a32cf0
+StoreGateSvc        DEBUG Recorded object @0xd796540 with key  of type MyDataObj(CLID 8000)
+ in DataObject @0xdd20050
  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 @0x6b10b40 found in Store for key  with clid 8000
-ClassIDSvc           INFO  getRegistryEntries: read 2611 CLIDRegistry entries for module ALL
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x61889f0
- recorded with key  of type MyDataObj (CLID 8000) in DataObject @0x6a27b40
+ 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 @0x65234e0 with key WriteData of type MyDataObj(CLID 8000)
- in DataObject @0x6a393a8
+StoreGateSvc        DEBUG Recorded object @0xd7967d0 with key WriteData of type MyDataObj(CLID 8000)
+ in DataObject @0xdd1d950
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x6abb0e0 with key  of type DataVector<MyContObj>(CLID 9967)
- in DataObject @0x6b10a80
+StoreGateSvc        DEBUG Recorded object @0xd43bd40 with key  of type DataVector<MyContObj>(CLID 9967)
+ in DataObject @0xdd70f50
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x5f9d5b8 with key  of type std::vector<float>(CLID 202242136)
- in DataObject @0x6a14d38
+StoreGateSvc        DEBUG Recorded object @0xdd59780 with key  of type std::vector<float>(CLID 202242136)
+ in DataObject @0xdd2b610
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x6aa6b40 with key  of type std::map<std::string,float>(CLID 193758082)
- in DataObject @0x6a29360
+StoreGateSvc        DEBUG Recorded object @0xdd5f240 with key  of type std::map<std::string,float>(CLID 193758082)
+ in DataObject @0xdd324e0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x63ff910 with key dobj2 of type MyDataObj(CLID 8000)
- in DataObject @0x6a181f8
+StoreGateSvc        DEBUG Recorded object @0xd796890 with key dobj2 of type MyDataObj(CLID 8000)
+ in DataObject @0xdd42670
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x65403e0 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
- in DataObject @0x6a3d048
+StoreGateSvc        DEBUG Recorded object @0xd796700 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
+ in DataObject @0xdd1a260
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x5f9d540 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
- in DataObject @0x6a1bdc8
+StoreGateSvc        DEBUG Recorded object @0xdd58c40 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
+ in DataObject @0xdd23b10
  object not modifiable when retrieved
 WriteData            INFO  registered all data objects
 WriteData            INFO  StoreGate structure before returning from execute 
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
-StoreGateSvc(StoreGateSvc)::dump():
+SGImplSvc(StoreGateSvc)::dump():
 Found 2 proxies for ClassID 1434 (BaseClass): 
- flags: (  valid,   locked,  reset) --- data:  0x6a32cf0 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x6a393a8 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data:  0xdd20050 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd1d950 --- key: WriteData
 Found 1 proxy for ClassID 2101 (EventInfo): 
- flags: (  valid,   locked,  reset) --- data:  0x6a28048 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd238e0 --- key: 
 Found 3 proxies for ClassID 8000 (MyDataObj): 
- flags: (  valid,   locked,  reset) --- data:  0x6a32cf0 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x6a393a8 --- key: WriteData
- flags: (  valid, UNLOCKED,  reset) --- data:  0x6a181f8 --- key: dobj2
+ flags: (  valid,   locked,  reset) --- data:  0xdd20050 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd1d950 --- key: WriteData
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd42670 --- key: dobj2
 Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
- flags: (  valid,   locked,  reset) --- data:  0x6b10a80 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd70f50 --- key: 
 Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
- flags: (  valid,   locked,  reset) --- data:  0x6a1bdc8 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd23b10 --- key: 
 Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
- flags: (  valid,   locked,  reset) --- data:  0x6a3d048 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data:  0xdd1a260 --- key: WriteData
 Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
- flags: (  valid,   locked,  reset) --- data:  0x6a29360 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd324e0 --- key: 
 Found 1 proxy for ClassID 202242136 (std::vector<float>): 
- flags: (  valid,   locked,  reset) --- data:  0x6a14d38 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd2b610 --- key: 
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 ReadData             INFO in execute()
@@ -130,85 +133,85 @@ 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 0x5f962b4
-ReadData             INFO VectorMapLinks::linked element: key due - value 2 - stored as 0x5f962f4
+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  retrieve as BaseClass, print its address: 
 ReadData             INFO 0
-ReadData             INFO 0x65234e0
+ReadData             INFO 0xd7967d0
 StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
  of type EventInfo(CLID 2101)
-ReadData             INFO  EventInfo :  event: 1 run: 0
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #0 1 events processed so far  <<<===
+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 @0x6b10b40, recorded with key=, CLID=8000, containing data object @0x6a32cf0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10ae0, recorded with key=WriteData, CLID=8000, containing data object @0x6a393a8  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10ba0, recorded with key=, CLID=2101, containing data object @0x6a28048  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10b40, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10ae0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10900, recorded with key=dobj2, CLID=8000, containing data object @0x6a181f8  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10a20, recorded with key=, CLID=9967, containing data object @0x6b10a80  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10840, recorded with key=, CLID=9983, containing data object @0x6a1bdc8  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b108a0, recorded with key=WriteData, CLID=9984, containing data object @0x6a3d048  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10960, recorded with key=, CLID=193758082, containing data object @0x6a29360  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b109c0, recorded with key=, CLID=202242136, containing data object @0x6a14d38  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x5f8d658 with key  of type EventInfo(CLID 2101)
- in DataObject @0x6a14d38
- object not modifiable when retrieved
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #0 1 events processed so far  <<<===
+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
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
 WriteData            INFO in execute()
-StoreGateSvc        DEBUG Recorded object @0x652ebc0 with key  of type MyDataObj(CLID 8000)
- in DataObject @0x6a29360
+StoreGateSvc        DEBUG Recorded object @0xd796870 with key  of type MyDataObj(CLID 8000)
+ in DataObject @0xdd324e0
  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 @0x6b10b40 found in Store for key  with clid 8000
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x65403e0
- recorded with key  of type MyDataObj (CLID 8000) in DataObject @0x6a3d048
+ 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 @0x63ff910 with key WriteData of type MyDataObj(CLID 8000)
- in DataObject @0x6a28af8
+StoreGateSvc        DEBUG Recorded object @0xd796890 with key WriteData of type MyDataObj(CLID 8000)
+ in DataObject @0xdd23b10
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x6abb0e0 with key  of type DataVector<MyContObj>(CLID 9967)
- in DataObject @0x6a4fc00
+StoreGateSvc        DEBUG Recorded object @0xd43bd40 with key  of type DataVector<MyContObj>(CLID 9967)
+ in DataObject @0xdd70f50
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x5f9d570 with key  of type std::vector<float>(CLID 202242136)
- in DataObject @0x6a327e0
+StoreGateSvc        DEBUG Recorded object @0xdd586a0 with key  of type std::vector<float>(CLID 202242136)
+ in DataObject @0xdd458b0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x6a41540 with key  of type std::map<std::string,float>(CLID 193758082)
- in DataObject @0x6a1bdc8
+StoreGateSvc        DEBUG Recorded object @0xdd5ff60 with key  of type std::map<std::string,float>(CLID 193758082)
+ in DataObject @0xdd42670
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x65234f0 with key dobj2 of type MyDataObj(CLID 8000)
- in DataObject @0x6a181f8
+StoreGateSvc        DEBUG Recorded object @0xd796540 with key dobj2 of type MyDataObj(CLID 8000)
+ in DataObject @0xdd238e0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x61889f0 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
- in DataObject @0x6a32cf0
+StoreGateSvc        DEBUG Recorded object @0xd796810 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
+ in DataObject @0xdd1d950
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x5f9d5b8 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
- in DataObject @0x6a27b40
+StoreGateSvc        DEBUG Recorded object @0xde29520 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
+ in DataObject @0xdd20820
  object not modifiable when retrieved
 WriteData            INFO  registered all data objects
 WriteData            INFO  StoreGate structure before returning from execute 
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
-StoreGateSvc(StoreGateSvc)::dump():
+SGImplSvc(StoreGateSvc)::dump():
 Found 2 proxies for ClassID 1434 (BaseClass): 
- flags: (  valid,   locked,  reset) --- data:  0x6a29360 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x6a28af8 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data:  0xdd324e0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd23b10 --- key: WriteData
 Found 1 proxy for ClassID 2101 (EventInfo): 
- flags: (  valid,   locked,  reset) --- data:  0x6a14d38 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd2b610 --- key: 
 Found 3 proxies for ClassID 8000 (MyDataObj): 
- flags: (  valid,   locked,  reset) --- data:  0x6a29360 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x6a28af8 --- key: WriteData
- flags: (  valid, UNLOCKED,  reset) --- data:  0x6a181f8 --- key: dobj2
+ flags: (  valid,   locked,  reset) --- data:  0xdd324e0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd23b10 --- key: WriteData
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd238e0 --- key: dobj2
 Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
- flags: (  valid,   locked,  reset) --- data:  0x6a4fc00 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd70f50 --- key: 
 Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
- flags: (  valid,   locked,  reset) --- data:  0x6a27b40 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd20820 --- key: 
 Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
- flags: (  valid,   locked,  reset) --- data:  0x6a32cf0 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data:  0xdd1d950 --- key: WriteData
 Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
- flags: (  valid,   locked,  reset) --- data:  0x6a1bdc8 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd42670 --- key: 
 Found 1 proxy for ClassID 202242136 (std::vector<float>): 
- flags: (  valid,   locked,  reset) --- data:  0x6a327e0 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd458b0 --- key: 
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 ReadData             INFO in execute()
@@ -234,85 +237,85 @@ 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 0x5f962b4
-ReadData             INFO VectorMapLinks::linked element: key due - value 2 - stored as 0x5f962f4
+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  retrieve as BaseClass, print its address: 
 ReadData             INFO 0
-ReadData             INFO 0x63ff910
+ReadData             INFO 0xd796890
 StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
  of type EventInfo(CLID 2101)
-ReadData             INFO  EventInfo :  event: 2 run: 0
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #0 2 events processed so far  <<<===
+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 @0x6b10b40, recorded with key=, CLID=8000, containing data object @0x6a29360  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10ae0, recorded with key=WriteData, CLID=8000, containing data object @0x6a28af8  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10ba0, recorded with key=, CLID=2101, containing data object @0x6a14d38  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10b40, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10ae0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10900, recorded with key=dobj2, CLID=8000, containing data object @0x6a181f8  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10a20, recorded with key=, CLID=9967, containing data object @0x6a4fc00  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10840, recorded with key=, CLID=9983, containing data object @0x6a27b40  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b108a0, recorded with key=WriteData, CLID=9984, containing data object @0x6a32cf0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10960, recorded with key=, CLID=193758082, containing data object @0x6a1bdc8  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b109c0, recorded with key=, CLID=202242136, containing data object @0x6a327e0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x5f8d540 with key  of type EventInfo(CLID 2101)
- in DataObject @0x6a327e0
- object not modifiable when retrieved
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #3, run #0 2 events processed so far  <<<===
+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
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #3, run #1 2 events processed so far  <<<===
 WriteData            INFO in execute()
-StoreGateSvc        DEBUG Recorded object @0x65234e0 with key  of type MyDataObj(CLID 8000)
- in DataObject @0x6a1bdc8
+StoreGateSvc        DEBUG Recorded object @0xd7967d0 with key  of type MyDataObj(CLID 8000)
+ in DataObject @0xdd42670
  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 @0x6b10b40 found in Store for key  with clid 8000
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x61889f0
- recorded with key  of type MyDataObj (CLID 8000) in DataObject @0x6a32cf0
+ 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 @0x65234f0 with key WriteData of type MyDataObj(CLID 8000)
- in DataObject @0x6a393a8
+StoreGateSvc        DEBUG Recorded object @0xd796540 with key WriteData of type MyDataObj(CLID 8000)
+ in DataObject @0xdd20820
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x6abb0e0 with key  of type DataVector<MyContObj>(CLID 9967)
- in DataObject @0x6b10a80
+StoreGateSvc        DEBUG Recorded object @0xd43bd40 with key  of type DataVector<MyContObj>(CLID 9967)
+ in DataObject @0xdd70f50
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x5f9d5a0 with key  of type std::vector<float>(CLID 202242136)
- in DataObject @0x6a28048
+StoreGateSvc        DEBUG Recorded object @0xd48b9a0 with key  of type std::vector<float>(CLID 202242136)
+ in DataObject @0xdd20410
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x6a97210 with key  of type std::map<std::string,float>(CLID 193758082)
- in DataObject @0x6a27b40
+StoreGateSvc        DEBUG Recorded object @0xdd5ff90 with key  of type std::map<std::string,float>(CLID 193758082)
+ in DataObject @0xdd238e0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x652ebc0 with key dobj2 of type MyDataObj(CLID 8000)
- in DataObject @0x6a181f8
+StoreGateSvc        DEBUG Recorded object @0xd796870 with key dobj2 of type MyDataObj(CLID 8000)
+ in DataObject @0xdd2b610
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x65403e0 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
- in DataObject @0x6a29360
+StoreGateSvc        DEBUG Recorded object @0xd796700 with key WriteData of type std::list< ElementLink< std::vector<float> > >(CLID 9984)
+ in DataObject @0xdd23b10
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x5f9d5b8 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
- in DataObject @0x6a3d048
+StoreGateSvc        DEBUG Recorded object @0xde29d00 with key  of type std::vector< ElementLink<MapStringFloat> >(CLID 9983)
+ in DataObject @0xdd1a260
  object not modifiable when retrieved
 WriteData            INFO  registered all data objects
 WriteData            INFO  StoreGate structure before returning from execute 
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
-StoreGateSvc(StoreGateSvc)::dump():
+SGImplSvc(StoreGateSvc)::dump():
 Found 2 proxies for ClassID 1434 (BaseClass): 
- flags: (  valid,   locked,  reset) --- data:  0x6a1bdc8 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x6a393a8 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data:  0xdd42670 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd20820 --- key: WriteData
 Found 1 proxy for ClassID 2101 (EventInfo): 
- flags: (  valid,   locked,  reset) --- data:  0x6a327e0 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd458b0 --- key: 
 Found 3 proxies for ClassID 8000 (MyDataObj): 
- flags: (  valid,   locked,  reset) --- data:  0x6a1bdc8 --- key: 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x6a393a8 --- key: WriteData
- flags: (  valid, UNLOCKED,  reset) --- data:  0x6a181f8 --- key: dobj2
+ flags: (  valid,   locked,  reset) --- data:  0xdd42670 --- key: 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd20820 --- key: WriteData
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xdd2b610 --- key: dobj2
 Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
- flags: (  valid,   locked,  reset) --- data:  0x6b10a80 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd70f50 --- key: 
 Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
- flags: (  valid,   locked,  reset) --- data:  0x6a3d048 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd1a260 --- key: 
 Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
- flags: (  valid,   locked,  reset) --- data:  0x6a29360 --- key: WriteData
+ flags: (  valid,   locked,  reset) --- data:  0xdd23b10 --- key: WriteData
 Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
- flags: (  valid,   locked,  reset) --- data:  0x6a27b40 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd238e0 --- key: 
 Found 1 proxy for ClassID 202242136 (std::vector<float>): 
- flags: (  valid,   locked,  reset) --- data:  0x6a28048 --- key: 
+ flags: (  valid,   locked,  reset) --- data:  0xdd20410 --- key: 
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 ReadData             INFO in execute()
@@ -338,27 +341,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 0x5f962b4
-ReadData             INFO VectorMapLinks::linked element: key due - value 2 - stored as 0x5f962f4
+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  retrieve as BaseClass, print its address: 
 ReadData             INFO 0
-ReadData             INFO 0x65234f0
+ReadData             INFO 0xd796540
 StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
  of type EventInfo(CLID 2101)
-ReadData             INFO  EventInfo :  event: 3 run: 0
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #3, run #0 3 events processed so far  <<<===
+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 @0x6b10b40, recorded with key=, CLID=8000, containing data object @0x6a1bdc8  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10ae0, recorded with key=WriteData, CLID=8000, containing data object @0x6a393a8  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10ba0, recorded with key=, CLID=2101, containing data object @0x6a327e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10b40, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10ae0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10900, recorded with key=dobj2, CLID=8000, containing data object @0x6a181f8  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10a20, recorded with key=, CLID=9967, containing data object @0x6b10a80  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10840, recorded with key=, CLID=9983, containing data object @0x6a3d048  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b108a0, recorded with key=WriteData, CLID=9984, containing data object @0x6a29360  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b10960, recorded with key=, CLID=193758082, containing data object @0x6a27b40  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x6b109c0, recorded with key=, CLID=202242136, containing data object @0x6a28048  ... -> DONE
+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
 ApplicationMgr       INFO Application Manager Stopped successfully
@@ -368,26 +371,25 @@ AthAlgSeq            INFO Finalizing AthAlgSeq...
 AthOutSeq            INFO Finalizing AthOutSeq...
 AthRegSeq            INFO Finalizing AthRegSeq...
 AthMasterSeq         INFO Finalizing AthMasterSeq...
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-02-39-14
+StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-03-06-31
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b10b40, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b10ae0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b10ba0, recorded with key=, CLID=2101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b10b40, recorded with key=, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b10ae0, recorded with key=WriteData, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b10900, recorded with key=dobj2, CLID=8000, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b10a20, recorded with key=, CLID=9967, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b10840, recorded with key=, CLID=9983, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b108a0, recorded with key=WriteData, CLID=9984, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b10960, recorded with key=, CLID=193758082, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x6b109c0, recorded with key=, CLID=202242136, 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 @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
 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 ****************************************************************************************************
-AthenaSealSvc::...   INFO Time User   : Tot=    3 [ms]                                             #=  1
-ChronoStatSvc        INFO Time User   : Tot=  164 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  133 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/AtlasTest/ControlTest/share/StoreGatePileUp.ref b/AtlasTest/ControlTest/share/StoreGatePileUp.ref
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/StoreGateReentrant.ref b/AtlasTest/ControlTest/share/StoreGateReentrant.ref
new file mode 100644
index 00000000000..bde2b3e5a9c
--- /dev/null
+++ b/AtlasTest/ControlTest/share/StoreGateReentrant.ref
@@ -0,0 +1,272 @@
+Mon Apr 25 10:31:42 EDT 2016
+WARNING: TCMALLOCDIR not defined, will use libc malloc
+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 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 
+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 !
+Py:Athena            INFO including file "AthenaCommon/runbatch.py"
+# setting LC_ALL to "C"
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
+                                          running on karma on Mon Apr 25 10:32:06 2016
+====================================================================================================================================
+ApplicationMgr       INFO Successfully loaded modules : AthenaServices
+ApplicationMgr       INFO Application Manager Configured successfully
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=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
+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
+AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
+ClassIDSvc           INFO  getRegistryEntries: read 1036 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 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
+ApplicationMgr       INFO Application Manager Initialized successfully
+StoreGateSvc         INFO 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
+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
+Found 1 proxy for ClassID 2101 (EventInfo): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xaf586a0 --- 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
+Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
+ flags: (  valid,   locked,  reset) --- data:  0xaa7b7a0 --- key: cobj
+Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xaf65590 --- key: linkvec
+Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xaf65210 --- key: WriteDataReentrant
+Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
+ flags: (  valid,   locked,  reset) --- data:  0xaedd030 --- key: mkey
+Found 1 proxy for ClassID 202242136 (std::vector<float>): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xaf0a2a0 --- key: vFloat
+Found 1 proxy for ClassID 289238765 (TestDataObject): 
+ flags: (  valid,   locked,  reset) --- data:  0xac918a0 --- key: testobj
+<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
+
+ReadDataReentrant    INFO in execute()
+ReadDataReentrant    INFO Time: 11.3  ID: 132
+ReadDataReentrant    INFO Time: 41.7  ID: 291
+ReadDataReentrant    INFO pVec [0] = 1
+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
+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
+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
+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
+Found 1 proxy for ClassID 2101 (EventInfo): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xac918a0 --- 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
+Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
+ flags: (  valid,   locked,  reset) --- data:  0xaf65c20 --- key: cobj
+Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xac6da90 --- key: linkvec
+Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xaf22920 --- key: WriteDataReentrant
+Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
+ flags: (  valid,   locked,  reset) --- data:  0xaf65590 --- key: mkey
+Found 1 proxy for ClassID 202242136 (std::vector<float>): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xaf65210 --- key: vFloat
+Found 1 proxy for ClassID 289238765 (TestDataObject): 
+ flags: (  valid,   locked,  reset) --- data:  0x9eff710 --- key: testobj
+<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
+
+ReadDataReentrant    INFO in execute()
+ReadDataReentrant    INFO Time: 11.3  ID: 132
+ReadDataReentrant    INFO Time: 41.7  ID: 291
+ReadDataReentrant    INFO pVec [0] = 1
+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
+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
+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
+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
+Found 1 proxy for ClassID 2101 (EventInfo): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x9eff710 --- 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
+Found 1 proxy for ClassID 9967 (DataVector<MyContObj>): 
+ flags: (  valid,   locked,  reset) --- data:  0xaa7b7a0 --- key: cobj
+Found 1 proxy for ClassID 9983 (std::vector< ElementLink<MapStringFloat> >): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x9eff760 --- key: linkvec
+Found 1 proxy for ClassID 9984 (std::list< ElementLink< std::vector<float> > >): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xaf265d0 --- key: WriteDataReentrant
+Found 1 proxy for ClassID 193758082 (std::map<std::string,float>): 
+ flags: (  valid,   locked,  reset) --- data:  0xac6da90 --- key: mkey
+Found 1 proxy for ClassID 202242136 (std::vector<float>): 
+ flags: (  valid, UNLOCKED,  reset) --- data:  0xaf22920 --- key: vFloat
+Found 1 proxy for ClassID 289238765 (TestDataObject): 
+ flags: (  valid,   locked,  reset) --- data:  0x9eff850 --- key: testobj
+<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
+
+ReadDataReentrant    INFO in execute()
+ReadDataReentrant    INFO Time: 11.3  ID: 132
+ReadDataReentrant    INFO Time: 41.7  ID: 291
+ReadDataReentrant    INFO pVec [0] = 1
+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
+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
+ApplicationMgr       INFO Application Manager Stopped successfully
+WriteDataReentrant   INFO in finalize()
+ReadDataReentrant    INFO in finalize()
+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        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
+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
+*****Chrono*****     INFO ****************************************************************************************************
+ChronoStatSvc.f...   INFO  Service finalized successfully 
+ApplicationMgr       INFO Application Manager Finalized successfully
+ApplicationMgr       INFO Application Manager Terminated successfully
+Py:Athena            INFO leaving with code 0: "successful run"
diff --git a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
old mode 100755
new mode 100644
index 3f016936c5a..0ff1ccacedb
--- 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 # =======> /afs/cern.ch/user/s/ssnyder/atlas-work16/InstallArea/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"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
@@ -11,121 +11,119 @@ JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
 JobOptionsSvc        INFO Job options successfully read in from ../share/StoreGateSvcClient_test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus0087.cern.ch on Mon Dec 14 20:42:08 2015
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
+                                          running on karma on Mon Nov 30 23:44:08 2015
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-45-01-11
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-18-03
-ClassIDSvc           INFO  getRegistryEntries: read 246 CLIDRegistry entries for module ALL
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-02-45-01-11
+DetectorStore        INFO Initializing DetectorStore - package version StoreGate-00-00-00
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 941 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
+HistoryStore         INFO Initializing HistoryStore - package version StoreGate-00-00-00
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-45-01-11
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-00-00-00
 StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ProxyProviderSvc
 *** StoreGateSvcClient_test record BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x1be70f0 with key pFoo1 of type Foo(CLID 8101)
- in DataObject @0x1d17e10
+StoreGateSvc        DEBUG Recorded object @0x17eac20 with key pFoo1 of type Foo(CLID 8101)
+ in DataObject @0x17f3580
  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 @0x1d18fe0 found in Store for key pFoo1 with clid 8101
-ClassIDSvc           INFO  getRegistryEntries: read 720 CLIDRegistry entries for module ALL
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1cef0a0
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x1d190f0
+ Pre-existing valid DataProxy @0x17ead90 found in Store for key pFoo1 with clid 8101
+ClassIDSvc           INFO  getRegistryEntries: read 336 CLIDRegistry entries for module ALL
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x17e6e40
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x17e6d50
 <<---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 @0x1be70f0 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0x17eac20 already in store with key=pFoo1. Will not record a duplicate! 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1cf0980 with key pFoo2 of type Foo(CLID 8101)
- in DataObject @0x1ccfa70
+StoreGateSvc        DEBUG Recorded object @0x1844cd0 with key pFoo2 of type Foo(CLID 8101)
+ in DataObject @0x17e31d0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d04f40 with key cpFoo of type Foo(CLID 8101)
- in DataObject @0x1cde810
+StoreGateSvc        DEBUG Recorded object @0x17e6e00 with key cpFoo of type Foo(CLID 8101)
+ in DataObject @0x185cc70
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d06d40 with key silly of type Foo(CLID 8101)
- in DataObject @0x1c394a0
+StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key silly of type Foo(CLID 8101)
+ in DataObject @0x185c760
  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 @0x1cd91b0 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1d093c0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1c33340
+ Pre-existing valid DataProxy @0x1862bb0 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1862c30
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x185e700
 <<---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 @0x1cd91b0 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1927390
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1c394f0
+ Pre-existing valid DataProxy @0x1862bb0 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x18639f0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x185e7b0
 <<---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 @0x1cd91b0 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1d0b960
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1d18ec0
+ Pre-existing valid DataProxy @0x1862bb0 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x18633e0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1863330
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1d0ccd0 with key UnLocked of type Foo(CLID 8101)
- in DataObject @0x1cd1b20
+StoreGateSvc        DEBUG Recorded object @0x1863310 with key UnLocked of type Foo(CLID 8101)
+ in DataObject @0x1861b10
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1927780 with key Locked of type Foo(CLID 8101)
- in DataObject @0x1cd1800
+StoreGateSvc        DEBUG Recorded object @0x17e3fc0 with key Locked of type Foo(CLID 8101)
+ in DataObject @0x17e4000
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d10440 with key LockedReset of type Foo(CLID 8101)
- in DataObject @0x1cdff80
+StoreGateSvc        DEBUG Recorded object @0x17e4050 with key LockedReset of type Foo(CLID 8101)
+ in DataObject @0x17e35c0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d0ed50 with key UnLockedReset of type Foo(CLID 8101)
- in DataObject @0x1cd15f0
+StoreGateSvc        DEBUG Recorded object @0x17e3870 with key UnLockedReset of type Foo(CLID 8101)
+ in DataObject @0x17e38c0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d12b90 with key LockedDelete of type Foo(CLID 8101)
- in DataObject @0x1cd5370
+StoreGateSvc        DEBUG Recorded object @0x17d93c0 with key LockedDelete of type Foo(CLID 8101)
+ in DataObject @0x17d93e0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1cd1850 with key UnLockedDelete of type Foo(CLID 8101)
- in DataObject @0x1cd8c10
+StoreGateSvc        DEBUG Recorded object @0x17e39a0 with key UnLockedDelete of type Foo(CLID 8101)
+ in DataObject @0x17d96b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1cd36d0 with key Const of type Foo(CLID 8101)
- in DataObject @0x1ce0b80
+StoreGateSvc        DEBUG Recorded object @0x17d9960 with key Const of type Foo(CLID 8101)
+ in DataObject @0x17d99b0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1cd67d0 with key Const2 of type Foo(CLID 8101)
- in DataObject @0x1c219e0
+StoreGateSvc        DEBUG Recorded object @0x17d9760 with key Const2 of type Foo(CLID 8101)
+ in DataObject @0x17d9c80
  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 @0x1ce10b0 found in Store for key Const with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1ce0c70
- recorded with key Const of type Foo (CLID 8101) in DataObject @0x1d195e0
+ Pre-existing valid DataProxy @0x17d9bb0 found in Store for key Const with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x17d9f80
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x17eba20
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1d19540 with key ow of type Foo(CLID 8101)
- in DataObject @0x1d194f0
+StoreGateSvc        DEBUG Recorded object @0x17eb9d0 with key ow of type Foo(CLID 8101)
+ in DataObject @0x17ebae0
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1d196d0 with key ow of type Foo(CLID 8101)
- in DataObject @0x1d197d0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x17ebd30 with key ow of type Foo(CLID 8101)
+ in DataObject @0x17ebda0
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1d19540 with key ow of type Foo(CLID 8101)
- in DataObject @0x1d194f0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x17eb9d0 with key ow of type Foo(CLID 8101)
+ in DataObject @0x17ebae0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d196d0 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x1d197d0
+StoreGateSvc        DEBUG Recorded object @0x17ebd30 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x17ebda0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1d19860 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x1d19960
+StoreGateSvc        DEBUG overwrite: Recorded object @0x17ec0c0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x17ebef0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1d196d0 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x1d197d0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x17ebd30 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x17ebda0
  object not modifiable when retrieved
 *** StoreGateSvcClient_test records OK ***
 
@@ -161,32 +159,6 @@ Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING retrieve(const): No valid proxy for object UnLockedxxx  of type Foo(CLID 8101)
 <<---Error Message Ends-------
-Now we expect to see an error message:
-----Error Message Starts--->>
-StoreGateSvc      WARNING retrieve(default): No valid proxy for default object 
- of type Foo(CLID 8101)
-<<---Error Message Ends-------
-Now we expect to see an error message:
-----Error Message Starts--->>
-StoreGateSvc      WARNING retrieve(default): No valid proxy for default object 
- of type NotThere(CLID 8103)
-<<---Error Message Ends-------
-StoreGateSvc        DEBUG Retrieved const handle to object UnLocked  of type Foo(CLID 8101)
-Now we expect to see an error message:
-----Error Message Starts--->>
-StoreGateSvc      WARNING retrieve(const): No valid proxy for object modSully  of type Foo(CLID 8101)
-<<---Error Message Ends-------
-Now we expect to see an error message:
-----Error Message Starts--->>
-StoreGateSvc      WARNING retrieve(default): No valid proxy for default object  of type Foo(CLID 8101)
- Try to use a const DataHandle 
-<<---Error Message Ends-------
-StoreGateSvc        DEBUG Retrieved non-const handle to object silly  of type Foo(CLID 8101)
-Now we expect to see an error message:
-----Error Message Starts--->>
-StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object silly  of type Foo(CLID 8101) 
- Try to use a const DataHandle
-<<---Error Message Ends-------
 StoreGateSvc        DEBUG retrieve(range): no object found  of type NotThere(CLID 8103)
 StoreGateSvc        DEBUG retrieve(range): Can't set DataHandle for object range  of type NotThere(CLID 8103)
 *** StoreGateSvcClient_test retrieve OK ***
@@ -213,7 +185,7 @@ Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING addSymLink: no target DataProxy found. Sorry, can't link to a non-existing data object
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Retrieved const handle to object UnLocked  of type Base(CLID 8100)
+StoreGateSvc        DEBUG Retrieved non-const handle to object UnLocked  of type Base(CLID 8100)
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING addSymLink: no target DataProxy found. Sorry, can't link to a non-existing data object
@@ -225,17 +197,12 @@ Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING retrieve(const): No valid proxy for object modSully  of type Base(CLID 8100)
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type Base(CLID 8100)
-StoreGateSvc        DEBUG Retrieved const handle to object UnLocked  of type Base(CLID 8100)
-StoreGateSvc        DEBUG Retrieved non-const handle to default object  of type Base(CLID 8100)
-StoreGateSvc        DEBUG Retrieved non-const handle to object UnLocked  of type Base(CLID 8100)
 *** StoreGateSvcClient_test symlinks OK ***
 
 
 *** StoreGateSvcClient_test readPrivateCopy BEGINS ***
 StoreGateSvc        DEBUG Retrieved const handle to object silly  of type Foo(CLID 8101)
-StoreGateSvc      WARNING StoreGateSvc::typeless_readPrivateCopy: did not find object of type Foo with key silly
+StoreGateSvc      WARNING SGImplSvc::typeless_readPrivateCopy: did not find object of type Foo with key silly
 SG::fromStorable  WARNING null input pointer 
 StoreGateSvc        DEBUG Retrieved const handle to object silly  of type Foo(CLID 8101)
 *** StoreGateSvcClient_test readPrivateCopy OK ***
@@ -258,104 +225,106 @@ 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 @0x1d06d40 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x1c394a0
+StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x185c760
  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 @0x1d06d40 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x1c394a0
+StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x185c760
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d06d40 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x1c394a0
+StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x185c760
  object modifiable when retrieved
 *** StoreGateSvcClient_test removes OK ***
 
 
 
 *** StoreGateSvcClient_test testCreate BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x1d06d40 with key pCreateFooDefault of type Foo(CLID 8101)
- in DataObject @0x1c394a0
+StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pCreateFooDefault of type Foo(CLID 8101)
+ in DataObject @0x185c760
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d198c0 with key pCreateFoo1 of type Foo(CLID 8101)
- in DataObject @0x1d19960
+StoreGateSvc        DEBUG Recorded object @0x17e4970 with key pCreateFoo1 of type Foo(CLID 8101)
+ in DataObject @0x17ec440
  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 @0x1d19ae0 found in Store for key pCreateFoo1 with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1d19b50
- recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0x1d19e80
-StoreGateSvc        ERROR create: problem recording created object @0x1d19b50 using key pCreateFoo1
+ Pre-existing valid DataProxy @0x17ec550 found in Store for key pCreateFoo1 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x181a410
+ recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0x181a5d0
+StoreGateSvc        ERROR create: problem recording created object @0x181a410 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 @0x1d192f0 with key fooKey of type Foo(CLID 8101)
- in DataObject @0x1d19ed0
+StoreGateSvc        DEBUG Recorded object @0x181a840 with key fooKey of type Foo(CLID 8101)
+ in DataObject @0x181a640
  object modifiable when retrieved
-StoreGateSvc        DEBUG  Bound handle 0x7fffa8b44390 to proxy 0x1d19280
+StoreGateSvc        DEBUG  Bound handle 0x7ffd16461f40 to proxy 0x17ec220
 *** StoreGateSvcClient_test bind OK ***
 
 
 Testing dump: 
  -------->>
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
-StoreGateSvc(StoreGateSvc)::dump():
+SGImplSvc(StoreGateSvc)::dump():
 Found 1 proxy for ClassID 8100 (Base): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1cd1b20 --- key: UnLocked
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x1861b10 --- key: UnLocked
 Found 17 proxies for ClassID 8101 (Foo): 
- flags: (  valid,   locked,  reset) --- data:  0x1ce0b80 --- key: Const
- flags: (  valid,   locked,  reset) --- data:  0x1c219e0 --- key: Const2
- flags: (  valid,   locked,  reset) --- data:  0x1cd1800 --- key: Locked
- flags: (  valid,   locked, DELETE) --- data:  0x1cd5370 --- key: LockedDelete
- flags: (  valid,   locked,  reset) --- data:  0x1cdff80 --- key: LockedReset
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1cd1b20 --- key: UnLocked
- flags: (  valid, UNLOCKED, DELETE) --- data:  0x1cd8c10 --- key: UnLockedDelete
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1cd15f0 --- key: UnLockedReset
- flags: (  valid,   locked,  reset) --- data:  0x1cde810 --- key: cpFoo
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1d19ed0 --- key: fooKey
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1d194f0 --- key: ow
- flags: (  valid,   locked,  reset) --- data:  0x1d197d0 --- key: ow2
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1d19960 --- key: pCreateFoo1
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1c394a0 --- key: pCreateFooDefault
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1d17e10 --- key: pFoo1
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1ccfa70 --- key: pFoo2
+ flags: (  valid,   locked,  reset) --- data:  0x17d99b0 --- key: Const
+ flags: (  valid,   locked,  reset) --- data:  0x17d9c80 --- key: Const2
+ flags: (  valid,   locked,  reset) --- data:  0x17e4000 --- key: Locked
+ flags: (  valid,   locked, DELETE) --- data:  0x17d93e0 --- key: LockedDelete
+ flags: (  valid,   locked,  reset) --- data:  0x17e35c0 --- key: LockedReset
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x1861b10 --- key: UnLocked
+ flags: (  valid, UNLOCKED, DELETE) --- data:  0x17d96b0 --- key: UnLockedDelete
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x17e38c0 --- key: UnLockedReset
+ flags: (  valid,   locked,  reset) --- data:  0x185cc70 --- key: cpFoo
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x181a640 --- key: fooKey
+ flags: (  valid, UNLOCKED, DELETE) --- data:  0x17ebae0 --- key: ow
+ flags: (  valid,   locked, DELETE) --- data:  0x17ebda0 --- key: ow2
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x17ec440 --- key: pCreateFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x185c760 --- key: pCreateFooDefault
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x17f3580 --- key: pFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x17e31d0 --- 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 @0x1cd6760, recorded with key=UnLocked, CLID=8101, containing data object @0x1cd1b20  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1ce10b0, recorded with key=Const, CLID=8101, containing data object @0x1ce0b80  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18860, recorded with key=Const2, CLID=8101, containing data object @0x1c219e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd5fb0, recorded with key=Locked, CLID=8101, containing data object @0x1cd1800  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd8ba0, recorded with key=LockedDelete, CLID=8101, containing data object @0x1cd5370  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd24f0, recorded with key=LockedReset, CLID=8101, containing data object @0x1cdff80  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd6760, recorded with key=UnLocked, CLID=8101, containing data object @0x1cd1b20  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd3640, recorded with key=UnLockedDelete, CLID=8101, containing data object @0x1cd8c10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd1640, recorded with key=UnLockedReset, CLID=8101, containing data object @0x1cd15f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cdd0c0, recorded with key=cpFoo, CLID=8101, containing data object @0x1cde810  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d19280, recorded with key=fooKey, CLID=8101, containing data object @0x1d19ed0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18020, recorded with key=ow, CLID=8101, containing data object @0x1d194f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d17fb0, recorded with key=ow2, CLID=8101, containing data object @0x1d197d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d19ae0, recorded with key=pCreateFoo1, CLID=8101, containing data object @0x1d19960  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d199b0, recorded with key=pCreateFooDefault, CLID=8101, containing data object @0x1c394a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18fe0, recorded with key=pFoo1, CLID=8101, containing data object @0x1d17e10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1ccc050, recorded with key=pFoo2, CLID=8101, containing data object @0x1ccfa70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd91b0, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x1cd39e0 with key d1 of type D1(CLID 8112)
- in DataObject @0x1ccfa70
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3ed0, recorded with key=UnLocked, CLID=8101, containing data object @0x1861b10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9bb0, recorded with key=Const, CLID=8101, containing data object @0x17d99b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9d00, recorded with key=Const2, CLID=8101, containing data object @0x17d9c80  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e34a0, recorded with key=Locked, CLID=8101, containing data object @0x17e4000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9470, recorded with key=LockedDelete, CLID=8101, containing data object @0x17d93e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e37a0, recorded with key=LockedReset, CLID=8101, containing data object @0x17e35c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3ed0, recorded with key=UnLocked, CLID=8101, containing data object @0x1861b10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9890, recorded with key=UnLockedDelete, CLID=8101, containing data object @0x17d96b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d92f0, recorded with key=UnLockedReset, CLID=8101, containing data object @0x17e38c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x18519a0, recorded with key=cpFoo, CLID=8101, containing data object @0x185cc70  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec220, recorded with key=fooKey, CLID=8101, containing data object @0x181a640  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebc60, recorded with key=ow, CLID=8101, containing data object @0x17ebae0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebdf0, recorded with key=ow2, CLID=8101, containing data object @0x17ebda0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec550, recorded with key=pCreateFoo1, CLID=8101, containing data object @0x17ec440  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec0e0, recorded with key=pCreateFooDefault, CLID=8101, containing data object @0x185c760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead90, recorded with key=pFoo1, CLID=8101, containing data object @0x17f3580  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=pFoo2, CLID=8101, containing data object @0x17e31d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1862bb0, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x185dcc0 with key d1 of type D1(CLID 8112)
+ in DataObject @0x18632c0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1  of type B1(CLID 8111)
+0x17f2f40
+0x17f2dc0StoreGateSvc
 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 @0x1c6f460 with key d2 of type D1(CLID 8112)
- in DataObject @0x1d17e10
+StoreGateSvc        DEBUG Recorded object @0x18615e0 with key d2 of type D1(CLID 8112)
+ in DataObject @0x181a2a0
  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)
@@ -364,21 +333,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 @0x1d18fe0, recorded with key=d2, CLID=8112, containing data object @0x1d17e10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d199b0, recorded with key=dd, CLID=8112, containing data object @0x1c394a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18fe0, recorded with key=d2, CLID=8112, containing data object @0x1d17e10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18fe0, recorded with key=d2, CLID=8112, containing data object @0x1d17e10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1ccc050, recorded with key=dd, CLID=8112, containing data object @0x1ccfa70  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead90, recorded with key=d2, CLID=8112, containing data object @0x181a2a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ec0e0, recorded with key=dd, CLID=8112, containing data object @0x185a1d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead90, recorded with key=d2, CLID=8112, containing data object @0x181a2a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead90, recorded with key=d2, CLID=8112, containing data object @0x181a2a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=dd, CLID=8112, containing data object @0x17e31d0  ... -> 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 @0x1d19330 with key pSwapFoo1 of type Foo(CLID 8101)
- in DataObject @0x1d17e10
+StoreGateSvc        DEBUG Recorded object @0x17ebd50 with key pSwapFoo1 of type Foo(CLID 8101)
+ in DataObject @0x17f3580
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d03c40 with key pSwapFoo2 of type Foo(CLID 8101)
- in DataObject @0x1ccfa70
+StoreGateSvc        DEBUG Recorded object @0x17e3570 with key pSwapFoo2 of type Foo(CLID 8101)
+ in DataObject @0x17ec440
  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)
@@ -387,75 +356,81 @@ StoreGateSvc        DEBUG Retrieved non-const handle to object pSwapFoo2  of typ
 
 
 *** StoreGateSvcClient_test VersionedKey BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x1d198a0 with key ;77;aVersObj of type Foo(CLID 8101)
- in DataObject @0x1c394a0
+StoreGateSvc        DEBUG Recorded object @0x17d6520 with key aVersObj of type Foo(CLID 8101)
+ in DataObject @0x17e31d0
+ object modifiable when retrieved
+StoreGateSvc        DEBUG Retrieved non-const handle to object aVersObj  of type Foo(CLID 8101)
+StoreGateSvc        DEBUG Recorded object @0x17e3670 with key ;77;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x185a1d0
  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 Recorded object @0x1d19580 with key ;88;aVersObj of type Foo(CLID 8101)
- in DataObject @0x1d19960
+StoreGateSvc        DEBUG Retrieved non-const handle to object ;00;aVersObj  of type Foo(CLID 8101)
+StoreGateSvc        DEBUG Recorded object @0x181a490 with key ;88;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x17ebae0
  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 @0x1d19ae0 found in Store for key ;88;aVersObj with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1cd36b0
- recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0x1d197d0
+ Pre-existing valid DataProxy @0x17ebdf0 found in Store for key ;88;aVersObj with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x181a820
+ recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0x181a720
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1cee180 with key ;66;aVersObj of type Foo(CLID 8101)
- in DataObject @0x1d194f0
+StoreGateSvc        DEBUG Recorded object @0x1860810 with key ;66;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x181a640
  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 @0x1d17fb0, recorded with key=;66;aVersObj, CLID=8101, containing data object @0x1d194f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18fe0, recorded with key=;77;aVersObj, CLID=8101, containing data object @0x1c394a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d19ae0, recorded with key=;88;aVersObj, CLID=8101, containing data object @0x1d19960  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18fe0, recorded with key=;77;aVersObj, CLID=8101, containing data object @0x1c394a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d199b0, recorded with key=pSwapFoo1, CLID=8101, containing data object @0x1ccfa70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1ccc050, recorded with key=pSwapFoo2, CLID=8101, containing data object @0x1d17e10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead90, recorded with key=aVersObj, CLID=8101, containing data object @0x17e31d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebc60, recorded with key=;66;aVersObj, CLID=8101, containing data object @0x181a640  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec550, recorded with key=;77;aVersObj, CLID=8101, containing data object @0x185a1d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebdf0, recorded with key=;88;aVersObj, CLID=8101, containing data object @0x17ebae0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebc60, recorded with key=;66;aVersObj, CLID=8101, containing data object @0x181a640  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec0e0, recorded with key=pSwapFoo1, CLID=8101, containing data object @0x17ec440  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=pSwapFoo2, CLID=8101, containing data object @0x17f3580  ... -> DONE
 *** test_DVL_conversions
-StoreGateSvc        DEBUG Recorded object @0x1d19fe0 with key contd of type CV(CLID 82734625)
- in DataObject @0x1ccc050
+StoreGateSvc        DEBUG Recorded object @0x17eac60 with key contd of type CV(CLID 82734625)
+ in DataObject @0x186d850
  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 @0x1cd2330 with key contd of type CL(CLID 82734626)
- in DataObject @0x1d18fe0
+StoreGateSvc        DEBUG Recorded object @0x17eb7e0 with key contd of type CL(CLID 82734626)
+ in DataObject @0x17e3950
  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 @0x1d1a310 with key dvl of type CV(CLID 82734625)
- in DataObject @0x1d17fb0
+StoreGateSvc        DEBUG Recorded object @0x1861b70 with key dvl of type CV(CLID 82734625)
+ in DataObject @0x181a7f0
  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 @0x1d1aaf0 with key dvl2 of type CV(CLID 82734625)
- in DataObject @0x1d19280
+StoreGateSvc        DEBUG Recorded object @0x17e3420 with key dvl2 of type CV(CLID 82734625)
+ in DataObject @0x17e33b0
  object not modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object dvl2  of type CV(CLID 82734625)
-StoreGateSvc        DEBUG Recorded object @0x1d1ae40 with key dvl of type CL(CLID 82734626)
- in DataObject @0x1cd1640
+StoreGateSvc        DEBUG Recorded object @0x181aff0 with key dvl of type CL(CLID 82734626)
+ in DataObject @0x17e81e0
  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 @0x1d1b3b0 with key dvl2 of type CL(CLID 82734626)
- in DataObject @0x1cd6760
+StoreGateSvc        DEBUG Recorded object @0x17e8a60 with key dvl2 of type CL(CLID 82734626)
+ in DataObject @0x17e89f0
  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 @0x1d1b7a0 with key x of type Athena_test::X(CLID 82734627)
- in DataObject @0x1d17e10
+StoreGateSvc        DEBUG Recorded object @0x17e8f40 with key x of type Athena_test::X(CLID 82734627)
+ in DataObject @0x17e8ef0
  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
@@ -464,135 +439,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 @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0x1ccc050  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0x1d18fe0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18020, recorded with key=dvl, CLID=82734625, containing data object @0x1d17fb0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cdd0c0, recorded with key=dvl2, CLID=82734625, containing data object @0x1d19280  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd3640, recorded with key=dvl, CLID=82734626, containing data object @0x1cd1640  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd24f0, recorded with key=dvl2, CLID=82734626, containing data object @0x1cd6760  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18020, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cdd0c0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd3640, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd24f0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18020, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cdd0c0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd3640, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd24f0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd8ba0, recorded with key=x, CLID=82734627, containing data object @0x1d17e10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd8ba0, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x1d1b4a0 with key LockReset of type Foo(CLID 8101)
- in DataObject @0x1d17e10
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0x186d850  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0x17e3950  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0x181a7f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0x17e33b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0x17e81e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0x17e89f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0x17e8ef0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x17e3830 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0x17e8ef0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1cf1c80 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0x1ccfa70
+StoreGateSvc        DEBUG Recorded object @0x17e49e0 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0x17eadf0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1922900 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0x1c394a0
+StoreGateSvc        DEBUG Recorded object @0x17e4b20 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0x17e34e0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d0e2b0 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0x1d19960
+StoreGateSvc        DEBUG Recorded object @0x17d9860 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0x17ebc60
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19280, recorded with key=LockDelete, CLID=8101, containing data object @0x1c394a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd6760, recorded with key=LockReset, CLID=8101, containing data object @0x1d17e10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d17fb0, recorded with key=UnLockDelete, CLID=8101, containing data object @0x1d19960  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd1640, recorded with key=UnLockReset, CLID=8101, containing data object @0x1ccfa70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d17fb0, recorded with key=UnLockDelete, CLID=8101, containing data object @0x1d19960  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18020, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cdd0c0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd3640, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd24f0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18020, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cdd0c0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd3640, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd24f0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18020, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cdd0c0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd3640, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd24f0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd8ba0, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd8ba0, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9310, recorded with key=LockDelete, CLID=8101, containing data object @0x17e34e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e4f00, recorded with key=LockReset, CLID=8101, containing data object @0x17e8ef0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17eac60, recorded with key=UnLockDelete, CLID=8101, containing data object @0x17ebc60  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e4e80, recorded with key=UnLockReset, CLID=8101, containing data object @0x17eadf0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17eac60, recorded with key=UnLockDelete, CLID=8101, containing data object @0x17ebc60  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, 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 @0x1cd6760, recorded with key=LockReset, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd1640, recorded with key=UnLockReset, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18020, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cdd0c0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd3640, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd24f0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18020, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cdd0c0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd3640, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd24f0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d199b0, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18020, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cdd0c0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d19ae0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd3640, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd24f0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd8ba0, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd8ba0, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x1d1b910 with key LockReset of type Foo(CLID 8101)
- in DataObject @0x1d194f0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e4f00, recorded with key=LockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e4e80, recorded with key=UnLockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x17e4a20 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0x17e4ad0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d1b170 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0x1d19960
+StoreGateSvc        DEBUG Recorded object @0x17e8610 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0x17e89a0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d19b70 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0x1ccfa70
+StoreGateSvc        DEBUG Recorded object @0x17d98b0 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0x18519d0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d1b230 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0x1d17e10
+StoreGateSvc        DEBUG Recorded object @0x17e86e0 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0x17d9990
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd3640, recorded with key=LockDelete, CLID=8101, containing data object @0x1ccfa70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd8ba0, recorded with key=LockReset, CLID=8101, containing data object @0x1d194f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d19ae0, recorded with key=UnLockDelete, CLID=8101, containing data object @0x1d17e10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd24f0, recorded with key=UnLockReset, CLID=8101, containing data object @0x1d19960  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=LockDelete, CLID=8101, containing data object @0x18519d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=LockReset, CLID=8101, containing data object @0x17e4ad0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=UnLockDelete, CLID=8101, containing data object @0x17d9990  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=UnLockReset, CLID=8101, containing data object @0x17e89a0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 
 *** StoreGateSvcClient_test Keys ENDS ***
 
 *** StoreGateSvcClient_test retrieveAux BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x1d1b440 with key BVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x1d19960
+StoreGateSvc        DEBUG Recorded object @0x17e8ca0 with key BVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x17e8190
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1cd39a0 with key BVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x1d17e10
+StoreGateSvc        DEBUG Recorded object @0x18607f0 with key BVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x17ebda0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d1b6f0 with key CVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x1d194f0
+StoreGateSvc        DEBUG Recorded object @0x17e49b0 with key CVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x17e8ea0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d19c70 with key CVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x1ccfa70
+StoreGateSvc        DEBUG Recorded object @0x181afb0 with key CVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x17e37e0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d19d90 with key ErrorVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x1c394a0
+StoreGateSvc        DEBUG Recorded object @0x17e6d70 with key ErrorVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x17e88b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1d1b3b0 with key BBVec of type TestVector<BBX>(CLID 125040193)
- in DataObject @0x1d197d0
+StoreGateSvc        DEBUG Recorded object @0x181ae00 with key BBVec of type TestVector<BBX>(CLID 125040193)
+ in DataObject @0x17e3790
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1c6d2b0 with key BBVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x1cd8c10
+StoreGateSvc        DEBUG Recorded object @0x17eb9d0 with key BBVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x17f3580
  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)
@@ -611,93 +586,101 @@ 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      VERBOSE called associateAux_impl non const for key BBVec
-StoreGateSvc        DEBUG Retrieved non-const handle to object BBVec  of type TestVector<BBX>(CLID 125040193)
-StoreGateSvc        DEBUG Recorded object @0x1d19820 with key BStand of type BX(CLID 82835621)
- in DataObject @0x1cd15f0
+StoreGateSvc        DEBUG Recorded object @0x1862c30 with key BStand of type BX(CLID 82835621)
+ in DataObject @0x17e8770
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1c5d300 with key BStandAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x1cde810
+StoreGateSvc        DEBUG Recorded object @0x185e810 with key BStandAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x181aea0
  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)
 *** StoreGateSvcClient_test retrieveAux OK ***
 
 
+
+*** StoreGateSvcClient_test testBoundReset BEGINS ***
+StoreGateSvc        DEBUG overwrite: Recorded object @0x17e4b20 with key testBoundReset of type int(CLID 244260744)
+ in DataObject @0x17eb8b0
+ object modifiable when retrieved
+
+*** StoreGateSvcClient_test testBoundReset OK ***
+
+
 *** test_lock
-StoreGateSvc        DEBUG Recorded object @0x1d1b8f0 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0x1d19ed0
+StoreGateSvc        DEBUG Recorded object @0x17e3fe0 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0x17e4e30
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d1ac30, recorded with key=lockable1, CLID=82734636, containing data object @0x1d19ed0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd24f0, recorded with key=BVec, CLID=82735621, containing data object @0x1d19960  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd3640, recorded with key=CVec, CLID=82735621, containing data object @0x1d194f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d199b0, recorded with key=ErrorVec, CLID=82735621, containing data object @0x1c394a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d193b0, recorded with key=BStand, CLID=82835621, containing data object @0x1cd15f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d17fb0, recorded with key=BBVecAux., CLID=125030194, containing data object @0x1cd8c10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18fe0, recorded with key=BStandAux., CLID=125030194, containing data object @0x1cde810  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd8ba0, recorded with key=BVecAux., CLID=125030194, containing data object @0x1d17e10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1d18020, recorded with key=CVecAux., CLID=125030194, containing data object @0x1ccfa70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1cd1640, recorded with key=BBVec, CLID=125040193, containing data object @0x1d197d0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x1cf0980 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0x1d197d0
- object modifiable when retrieved
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-02-45-01-11
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17eac60, recorded with key=lockable1, CLID=82734636, containing data object @0x17e4e30  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=BVec, CLID=82735621, containing data object @0x17e8190  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=CVec, CLID=82735621, containing data object @0x17e8ea0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=ErrorVec, CLID=82735621, containing data object @0x17e88b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e4e80, recorded with key=BStand, CLID=82835621, containing data object @0x17e8770  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=BBVecAux., CLID=125030194, containing data object @0x17f3580  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e4f00, recorded with key=BStandAux., CLID=125030194, containing data object @0x181aea0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=BVecAux., CLID=125030194, containing data object @0x17ebda0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=CVecAux., CLID=125030194, containing data object @0x17e37e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=BBVec, CLID=125040193, containing data object @0x17e3790  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e52c0, recorded with key=testBoundReset, CLID=244260744, containing data object @0x17eb8b0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x17d98b0 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0x185c760
+ object modifiable when retrieved
+StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-00-00-00
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d1ac30, recorded with key=lockable1, CLID=82734636, containing data object @0x1d197d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd24f0, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd3640, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d199b0, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d193b0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d17fb0, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18fe0, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd8ba0, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1d18020, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1cd1640, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17eac60, recorded with key=lockable1, CLID=82734636, containing data object @0x185c760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8920, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8830, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3710, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e4e80, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e4f00, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3850, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead70, 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 @0x1cd1640 found in Store for key pFoo1 with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1d1b170
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x1ccfa70
+ Pre-existing valid DataProxy @0x17ead70 found in Store for key pFoo1 with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x17e8610
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x18519d0
 <<---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 @0x192ec20 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0x1819e00 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 @0x1d18fe0 found in Store for key silly with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1d1b7a0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1c394a0
+ Pre-existing valid DataProxy @0x17e4f00 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x17e6e20
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x17ec390
 <<---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 @0x1d18fe0 found in Store for key silly with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1d1b2b0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1d194f0
+ Pre-existing valid DataProxy @0x17e4f00 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x17e4a40
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x185c760
 <<---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 @0x1d18fe0 found in Store for key silly with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1ce1140
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1d19960
+ Pre-existing valid DataProxy @0x17e4f00 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x17e3130
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x17e3790
 <<---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 @0x1cdd0c0 found in Store for key Const with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1927390
- recorded with key Const of type Foo (CLID 8101) in DataObject @0x1d195e0
+ Pre-existing valid DataProxy @0x17e52c0 found in Store for key Const with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x181a970
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x17eadf0
 <<---Error Message Ends-------
 IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
 IOVSvcTool           INFO IOVRanges will be checked at every Event
-ClassIDSvc           INFO  getRegistryEntries: read 152 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 145 CLIDRegistry entries for module ALL
 *** StoreGateSvcClient_test records OK ***
 
 
diff --git a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.txt b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/StoreGateTestCommon.txt b/AtlasTest/ControlTest/share/StoreGateTestCommon.txt
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/SubAlg.ref b/AtlasTest/ControlTest/share/SubAlg.ref
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/share/test_interactive_athena.py b/AtlasTest/ControlTest/share/test_interactive_athena.py
index 36db8d80fae..6a57c9fd3bb 100644
--- a/AtlasTest/ControlTest/share/test_interactive_athena.py
+++ b/AtlasTest/ControlTest/share/test_interactive_athena.py
@@ -38,13 +38,13 @@ def test_lock():
     sg = PyAthena.py_svc('StoreGateSvc')
     ei = PyAthena.EventInfo()
     sg.record (ei, 'EventInfo')
-    sg.setConst (ei)
+    sg.setConst (ei).ignore()
 
     ll = PyAthena.MyLockableDataObj()
     assert (not ll.m_locked)
     sg.record (ll, 'lockable')
     assert (not ll.m_locked)
-    sg.setConst (ll)
+    sg.setConst (ll).ignore()
     assert (ll.m_locked)
     print 'done test lock'
     return
@@ -59,7 +59,7 @@ for _ in xrange(10):
 
 test_lock()
 
-theApp.finalize()
+theApp.finalize().ignore()
 print "="*80
 print "test [OK]"
 print "="*80
diff --git a/AtlasTest/ControlTest/share/test_interactive_athena.ref b/AtlasTest/ControlTest/share/test_interactive_athena.ref
index b0568c3a62a..15a0857f5af 100644
--- a/AtlasTest/ControlTest/share/test_interactive_athena.ref
+++ b/AtlasTest/ControlTest/share/test_interactive_athena.ref
@@ -1,104 +1,109 @@
-Sat Apr 19 21:06:34 CEST 2014
-WARNING: TCMALLOCDIR not defined, will use libc malloc
+Sat Mar 12 19:53:48 CET 2016
+Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [?-?] [i686-slc5-gcc43-dbg] [?/?] -- built on [?]
+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 including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Py:Athena            INFO including file "AthenaCommon/Execution.py"
-Py:Athena            INFO including file "/home/sss/atlas/dvtest/../share/test_interactive_athena.py"
-Py:ConfigurableDb    INFO Read module info for 175 configurables from 2 genConfDb files
-Py:ConfigurableDb    INFO No duplicates have been found: that's good !
-ApplicationMgr       INFO Updating ROOT::Reflex::PluginService::SetDebug(level) to level=0
+Py:Athena            INFO executing ROOT6Setup
+[?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
+Py:Athena            INFO including file "ControlTest/test_interactive_athena.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 WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
+Py:ConfigurableDb WARNING --------------------------------------------------
+Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigJetHypo.TrigJetHypoConf - ['TrigHLTJetHypo.TrigHLTJetHypoConf']
+Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
-                                          running on karma on Sat Apr 19 21:06:35 2014
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
+                                          running on lxplus031.cern.ch on Sat Mar 12 19:53:59 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating ROOT::Reflex::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=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 1959 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 1959 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-19
+ClassIDSvc           INFO  getRegistryEntries: read 2109 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-02
 AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
 AthAlgSeq            INFO Member list: PyAthena::Alg/pyalg
 PyComponentMgr       INFO Initializing PyComponentMgr...
 pyalg                INFO Initializing pyalg...
 Py:pyalg             INFO initialize...
 Py:pyalg             INFO initialize... [ok]
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-00-00-00
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
+StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-06-31
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-02-07
 HistogramPersis...WARNING Histograms saving not required.
-ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-00-00-00
+ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-03-06-31
 ApplicationMgr       INFO Application Manager Initialized successfully
 StoreGateSvc         INFO Start StoreGateSvc
 ApplicationMgr       INFO Application Manager Started successfully
-AthenaEventLoopMgr   INFO   ===>>>  start of run 0    <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #0 0 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 0/1
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #0 1 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #0 1 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 1/2
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #0 2 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #3, run #0 2 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #3, run #1 2 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 2/3
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #3, run #0 3 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #4, run #0 3 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #3, run #1 3 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #4, run #1 3 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 3/4
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #4, run #0 4 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #5, run #0 4 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #4, run #1 4 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #5, run #1 4 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 4/5
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #5, run #0 5 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #6, run #0 5 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #5, run #1 5 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #6, run #1 5 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 5/6
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #6, run #0 6 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #7, run #0 6 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #6, run #1 6 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #7, run #1 6 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 6/7
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #7, run #0 7 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #8, run #0 7 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #7, run #1 7 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #8, run #1 7 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 7/8
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #8, run #0 8 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #9, run #0 8 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #8, run #1 8 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #9, run #1 8 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 8/9
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #9, run #0 9 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #10, run #0 9 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #9, run #1 9 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #10, run #1 9 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 9/10
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #10, run #0 10 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #11, run #0 10 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #10, run #1 10 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #11, run #1 10 events processed so far  <<<===
 Py:pyalg             INFO execute...
 Py:pyalg             INFO --> evt: 10/11
 Py:pyalg             INFO execute... [ok]
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #11, run #0 11 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #11, run #1 11 events processed so far  <<<===
 test lock
-ClassIDSvc           INFO  getRegistryEntries: read 2755 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 3076 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1065 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 10 CLIDRegistry entries for module ALL
 StoreGateSvc      WARNING record_impl: Could not find suitable SG::BaseInfoBase for CLID [8009] (lockable) !	No auto-symlink established !
 done test lock
 StoreGateSvc         INFO Stop StoreGateSvc
@@ -112,15 +117,14 @@ 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         INFO Finalizing StoreGateSvc - package version StoreGate-03-06-31
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 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 ****************************************************************************************************
-AthenaSealSvc::...   INFO Time User   : Tot=    0 [us]                                             #=  1
-ChronoStatSvc        INFO Time User   : Tot=  205 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  3.5  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/AtlasTest/ControlTest/test/CircularDep_test.cxx b/AtlasTest/ControlTest/test/CircularDep_test.cxx
old mode 100755
new mode 100644
index a6c3e59d4df..29075011d34
--- a/AtlasTest/ControlTest/test/CircularDep_test.cxx
+++ b/AtlasTest/ControlTest/test/CircularDep_test.cxx
@@ -4,9 +4,13 @@
 
 #undef NDEBUG
 #include "TestTools/SGassert.h"
-#include "DataModel/DataVector.h"
-#include "DataModel/ElementLink.h"
+#include "AthContainers/DataVector.h"
+#include "AthLinks/ElementLink.h"
 #include "SGTools/BaseInfo.h"
+#include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/ISvcLocator.h"
+#include "TestTools/initGaudi.h"
+#include "SGTools/CLASS_DEF.h"
 
 #include <iostream>
 using std::cerr;
@@ -24,14 +28,10 @@ typedef DataVector<Circular> CircularVector;
 
 class DerivedCircularVector : public DataVector<Circular> {};
 
-#include "SGTools/CLASS_DEF.h"
 CLASS_DEF( CircularVector , 218202856 , 1 )
 CLASS_DEF( DerivedCircularVector , 254054940 , 1 )
 SG_BASE (DerivedCircularVector, CircularVector);
 
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "TestTools/initGaudi.h"
 using namespace Athena_test;
 
 int main() {
diff --git a/AtlasTest/ControlTest/test/ClearStore_test.cxx b/AtlasTest/ControlTest/test/ClearStore_test.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/test/DataProxy_test.cxx b/AtlasTest/ControlTest/test/DataProxy_test.cxx
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/test/ElementLinkVector_test.cxx b/AtlasTest/ControlTest/test/ElementLinkVector_test.cxx
old mode 100755
new mode 100644
index 7491ef4dbd9..e1b9b549b13
--- a/AtlasTest/ControlTest/test/ElementLinkVector_test.cxx
+++ b/AtlasTest/ControlTest/test/ElementLinkVector_test.cxx
@@ -3,9 +3,10 @@
 */
 
 #include "TestTools/SGassert.h"
-#include "DataModel/ElementLinkVector.h"
-#include "DataModel/DataVector.h"
+#include "AthLinks/ElementLinkVector.h"
+#include "AthContainers/DataVector.h"
 #include "StoreGate/StoreGateSvc.h"
+#include "SGTools/CLASS_DEF.h"
 
 #include "GaudiKernel/ISvcLocator.h"
 
@@ -19,11 +20,11 @@
 #include <string>
 #include <stdexcept>
 
+#include "TestTools/initGaudi.h"
+using namespace Athena_test;
 using namespace std;
 
 typedef DataVector<int> IntVector;
-
-#include "SGTools/CLASS_DEF.h"
 CLASS_DEF( IntVector , 7368883 , 1 )
 
 namespace Athena_test 
@@ -124,8 +125,6 @@ namespace Athena_test
   }
 } //end namespace
 
-#include "TestTools/initGaudi.h"
-using namespace Athena_test;
 
 int main() {
   ISvcLocator* pSvcLoc;
diff --git a/AtlasTest/ControlTest/test/ElementLink_test.cxx b/AtlasTest/ControlTest/test/ElementLink_test.cxx
old mode 100755
new mode 100644
index 32e2c0a7719..2bcba092e67
--- a/AtlasTest/ControlTest/test/ElementLink_test.cxx
+++ b/AtlasTest/ControlTest/test/ElementLink_test.cxx
@@ -4,12 +4,12 @@
 
 #include "TestTools/FLOATassert.h"
 #include "TestTools/SGassert.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "AthLinks/tools/MapIndexingPolicy.h"
 #include "AthLinks/tools/SetIndexingPolicy.h"
-#include "DataModel/DataLink.h"
-#include "DataModel/ElementLink.h"
-#include "DataModel/ElementLinkVector.h"
+#include "AthLinks/DataLink.h"
+#include "AthLinks/ElementLink.h"
+#include "AthLinks/ElementLinkVector.h"
 #include "AthLinks/DeclareIndexingPolicy.h"
 #include "SGTools/CLASS_DEF.h"
 #include "SGTools/StlVectorClids.h"
@@ -72,7 +72,7 @@ CLASS_DEF(std::vector<Foo>, 2233, 1)
 
 float tv_diff (const timeval& tv1, const timeval& tv2)
 {
-  return static_cast<float>(tv2.tv_sec - tv1.tv_sec + (tv2.tv_usec - tv1.tv_usec) / 1000000.);
+  return static_cast<float>(tv2.tv_sec - tv1.tv_sec + (tv2.tv_usec - tv1.tv_usec) * 1e-6);
 }
 
 
diff --git a/AtlasTest/ControlTest/test/FortranAlgorithm.sh b/AtlasTest/ControlTest/test/FortranAlgorithm.sh
new file mode 100755
index 00000000000..7a23a0a39cb
--- /dev/null
+++ b/AtlasTest/ControlTest/test/FortranAlgorithm.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# $Id: FortranAlgorithm.sh 729263 2016-03-11 17:34:05Z krasznaa $
+#
+# Script running the FortranAlgorithm intergration test.
+#
+
+# Transmit errors:
+set -e
+
+# Get the necessary inputs:
+preFortAlgEx.sh > /dev/null
+
+# Run the job:
+athena.py AthExFortranAlgorithm/FortranAlgorithmOptions.py
diff --git a/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx b/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
old mode 100755
new mode 100644
index 7a4e0ae3842..00388a9e083
--- a/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
+++ b/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
@@ -9,8 +9,6 @@
 
 // $Id: ProxyProviderSvc_test.cxx,v 1.7 2008-07-10 00:29:24 calaf Exp $
 
-//<<<<<< INCLUDES                                                       >>>>>>
-
 #include "AthenaKernel/IProxyProviderSvc.h"
 
 #include <cassert>
@@ -26,10 +24,13 @@
 #include "SGTools/TransientAddress.h"
 #include "SGTools/DataProxy.h"
 
+#include "StoreGate/ReadHandle.h"
+#include "StoreGate/WriteHandle.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "SGTools/ClassID_traits.h"
 #include "AthenaKernel/IAddressProvider.h"
 #include "AthenaKernel/StoreID.h"
+#include "CxxUtils/make_unique.h"
 
 #include "GaudiKernel/GenericAddress.h"
 #include "GaudiKernel/ISvcLocator.h"
@@ -44,10 +45,21 @@ using std::cerr;
 using std::cout;
 using std::endl;
 using std::string;
-using SG::DataProxy;
-using SG::TransientAddress;
+using namespace SG;
+
+class FooBar {
+public:
+  FooBar(): m_i(s_i++){}
+  int i() const { return m_i; }
+  ~FooBar() { 
+    cout << "FooBar i=" << i() << " deleted" << endl;
+  }
+private:
+  int m_i;
+  static int s_i;
+};
+int FooBar::s_i=0;
 
-class FooBar {};
 #include "SGTools/CLASS_DEF.h"
 CLASS_DEF(FooBar, 8109, 0)
 
@@ -106,10 +118,10 @@ void testRecordBeforeRead(StoreGateSvc& rSG, IProxyProviderSvc& rPPS) {
 void testReadPrivate(StoreGateSvc& rSG) {
   cout << "*** ProxyProviderSvc_test readPrivate BEGINS ***" <<endl;
   
-  std::auto_ptr<Foo> apFoo;
+  std::unique_ptr<Foo> apFoo;
   SGASSERTERROR((rSG.readPrivateCopy<Foo>("NotThere")).get() != 0);
   
-  apFoo=rSG.readPrivateCopy<Foo>("diskFoo");
+  apFoo=rSG.readUniquePrivateCopy<Foo>("diskFoo");
   assert(0 != &*apFoo);
   assert(floatEQ(0, static_cast<float>(apFoo->a()))); //check that our Foo is the def constr one
 
@@ -117,13 +129,13 @@ void testReadPrivate(StoreGateSvc& rSG) {
   //record must fail because we already have a provider
   //not yet SGASSERTERROR(rSG.record(new Foo(6.28), "privFoo").isSuccess());
   assert(rSG.record(new Foo(6.28), "privFoo").isSuccess());
-  assert(rSG.overwrite(std::auto_ptr<Foo>(new Foo(6.28)), "privFoo").isSuccess());
+  assert(rSG.overwrite(CxxUtils::make_unique<Foo>(6.28), "privFoo").isSuccess());
   
-  apFoo=rSG.readPrivateCopy<Foo>("privFoo");
+  apFoo=rSG.readUniquePrivateCopy<Foo>("privFoo");
   assert(0 != &*apFoo);
   assert(floatNEQ(6.28f, static_cast<float>(apFoo->a()))); //check that our Foo is a different one
   apFoo->setA(3.14);
-  std::auto_ptr<Foo> bpFoo(rSG.readPrivateCopy<Foo>("privFoo"));
+  std::unique_ptr<Foo> bpFoo(rSG.readUniquePrivateCopy<Foo>("privFoo"));
   assert(0 != &*bpFoo);
   assert(&*bpFoo != &*apFoo); //two independent instances
   assert(floatNEQ(6.28f, static_cast<float>(bpFoo->a()))); 
@@ -136,16 +148,17 @@ void testReadPrivate(StoreGateSvc& rSG) {
   assert(plainFoo != &*bpFoo); //yet another instance
   //  cout << "---------ap " << &*apFoo << " bp " << &*bpFoo  <<endl;
   //cout << " pFoo33 " << pFoo33 << endl;
-  
-  assert(rSG.record(apFoo, "silly33").isSuccess());
+
+  const Foo* pFoo33Orig = apFoo.get();
+  assert(rSG.record(std::move(apFoo), "silly33").isSuccess());
   const Foo *pFoo33(rSG.retrieve<Foo>("silly33"));
   assert(0 != pFoo33);
   assert(floatEQ(3.14f, static_cast<float>(pFoo33->a())));
-  assert(pFoo33 != &*apFoo); //not one of the private copies
+  assert(pFoo33 == pFoo33Orig); //the private copy we recorded.
   assert(pFoo33 != &*bpFoo); //not one of the private copies
   SGASSERTERROR((rSG.readPrivateCopy<Foo>("silly33")).get() != 0);
   assert(rSG.retrieve<Foo>("silly33"));
-  std::auto_ptr<Foo> aptrFoo33(rSG.retrievePrivateCopy<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);
@@ -187,6 +200,34 @@ void testHLTAutoKeyReset(StoreGateSvc& rSG, IProxyProviderSvc& rPPS) {
   cout << "*** ProxyProviderSvc_test HLTAutoKeyReset OK ***\n\n" <<endl;
 }
 
+
+void testOverwrite(StoreGateSvc& rSG, IProxyProviderSvc& rPPS) {
+  cout << "*** ProxyProviderSvc_test Overwrite starts ***\n\n" <<endl;
+  
+  assert(rSG.clearStore(true).isSuccess());
+  rPPS.addProvider(new TestProvider<Foo>("toOverwrite"));
+  //key
+  const std::string KEY("toOverwrite");
+  //our "data members"
+  WriteHandle<FooBar> wFB(KEY);
+  ReadHandle<FooBar> rFB(KEY);
+  //simulate an event loop
+  for (int i=0;i<3;++i) {
+    cout << "=============Event #" << i << " starts" << std::endl;
+    //check we can not retrieve a non const pointer from the PPS
+    assert(!(wFB.isValid()));
+    //overwrite an object coming from the PPS
+    assert(rSG.overwrite(new FooBar(), KEY));
+    //check contents of the overwritten object
+    assert(rFB.isValid());
+    cout << "Overwritten FooBar i="<< rFB->i() << endl;
+    assert(i == rFB->i());
+    //clear the store
+    assert(rSG.clearStore().isSuccess());
+  }
+  cout << "*** ProxyProviderSvc_test Overwrite OK ***\n\n" <<endl;
+}
+
 int main() {
   ISvcLocator* pSvcLoc(0);
   if (!initGaudi("ProxyProviderSvc_test.txt", pSvcLoc)) {
@@ -237,6 +278,7 @@ int main() {
   testRecordBeforeRead(*pStore, *pIPPSvc);
   testReadPrivate(*pStore);
   testHLTAutoKeyReset(*pStore, *pIPPSvc);
+  testOverwrite(*pStore, *pIPPSvc);
   assert(pStore->clearStore(true).isSuccess());
   return 0;
 }
diff --git a/AtlasTest/ControlTest/test/SGDataLink_test.cxx b/AtlasTest/ControlTest/test/SGDataLink_test.cxx
old mode 100755
new mode 100644
index 2aeb6736420..7c9e2add222
--- a/AtlasTest/ControlTest/test/SGDataLink_test.cxx
+++ b/AtlasTest/ControlTest/test/SGDataLink_test.cxx
@@ -5,11 +5,11 @@
 #undef NDEBUG
 #include "TestTools/SGassert.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 #include "AthLinks/tools/MapIndexingPolicy.h"
 #include "AthLinks/tools/SetIndexingPolicy.h"
-#include "DataModel/DataLink.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/DataLink.h"
+#include "AthLinks/ElementLink.h"
 #include "AthLinks/DeclareIndexingPolicy.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "AthenaKernel/DefaultKey.h"
@@ -28,6 +28,10 @@
 #include <stdexcept>
 
 #include <sstream>
+
+#include "TestTools/initGaudi.h"
+using namespace Athena_test;
+
 using std::ostringstream;
 using std::istringstream;
 
@@ -308,8 +312,6 @@ namespace Athena_test
   }
 } //end namespace
 
-#include "TestTools/initGaudi.h"
-using namespace Athena_test;
 
 int main() {
   ISvcLocator* pSvcLoc;
diff --git a/AtlasTest/ControlTest/test/StoreGateDFlow.sh b/AtlasTest/ControlTest/test/StoreGateDFlow.sh
new file mode 100755
index 00000000000..d54c530c0fe
--- /dev/null
+++ b/AtlasTest/ControlTest/test/StoreGateDFlow.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# $Id: StoreGateDFlow.sh 729263 2016-03-11 17:34:05Z krasznaa $
+#
+# Script running the StoreGateDFlow intergration test.
+#
+
+# Transmit errors:
+set -e
+
+# Run the job:
+athena.py AthExStoreGateExample/dflow_jobo.py
diff --git a/AtlasTest/ControlTest/test/StoreGateGen.sh b/AtlasTest/ControlTest/test/StoreGateGen.sh
new file mode 100755
index 00000000000..d5300d06d0c
--- /dev/null
+++ b/AtlasTest/ControlTest/test/StoreGateGen.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# $Id: StoreGateGen.sh 729263 2016-03-11 17:34:05Z krasznaa $
+#
+# Script running the StoreGateGen intergration test.
+#
+
+# Transmit errors:
+set -e
+
+# Run the job:
+athena.py AthExStoreGateExample/StoreGateExample_Gen_jobOptions.py
diff --git a/AtlasTest/ControlTest/test/StoreGateReentrant.sh b/AtlasTest/ControlTest/test/StoreGateReentrant.sh
new file mode 100755
index 00000000000..b0b718ac41b
--- /dev/null
+++ b/AtlasTest/ControlTest/test/StoreGateReentrant.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# $Id: StoreGateReentrant.sh 729263 2016-03-11 17:34:05Z krasznaa $
+#
+# Script running the StoreGateReentrant intergration test.
+#
+
+# Transmit errors:
+set -e
+
+# Run the job:
+athena.py AthExStoreGateExample/StoreGateExample_Reentrant_jobOptions.py
diff --git a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
old mode 100755
new mode 100644
index ea02b6d3839..be2d64885d2
--- a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
+++ b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
@@ -23,6 +23,12 @@
 #include "AthenaKernel/ILockable.h"
 
 #ifndef NOGAUDI
+#include "SGTools/BaseInfo.h"
+#include "AthContainers/DataVector.h"
+#include "AthContainers/ConstDataVector.h"
+#include "AthContainers/DataList.h"
+#include "AthContainers/ConstDataList.h"
+
 #include "TestTools/initGaudi.h"
 using namespace Athena_test;
 using namespace std;
@@ -37,11 +43,6 @@ namespace Athena_test {
 //
 
 
-#include "SGTools/BaseInfo.h"
-#include "DataModel/DataVector.h"
-#include "DataModel/ConstDataVector.h"
-#include "AthContainers/DataList.h"
-#include "AthContainers/ConstDataList.h"
 
 namespace Athena_test {
 
@@ -345,6 +346,7 @@ int main() {
   testKeys(*pStore);
 
   testRetrieveAux(*pStore);
+  testBoundReset(*pStore);
 
   test_lock (*pStore);
 
diff --git a/AtlasTest/ControlTest/test/TestControl.xml b/AtlasTest/ControlTest/test/TestControl.xml
old mode 100755
new mode 100644
diff --git a/AtlasTest/ControlTest/test/test_interactive_athena.sh b/AtlasTest/ControlTest/test/test_interactive_athena.sh
new file mode 100755
index 00000000000..592dd8f0216
--- /dev/null
+++ b/AtlasTest/ControlTest/test/test_interactive_athena.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# $Id: test_interactive_athena.sh 729263 2016-03-11 17:34:05Z krasznaa $
+#
+# Script running the test_interactive_athena intergration test.
+#
+
+# Transmit errors:
+set -e
+
+# Run the job:
+athena.py ControlTest/test_interactive_athena.py
-- 
GitLab