AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py

@@ -71,12 +71,13 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
 
     # setup fallback MuonEnvelope
     Muon = Volume()
+    Muon.addRZ(  4255.0 ,  4000.0 )
     Muon.addRZ(  4255.0 ,  6550.0 )
     Muon.addRZ(  3800.0 ,  6550.0 )
     Muon.addRZ(  3800.0 ,  6736.0 )
     Muon.addRZ(   420.0 ,  6736.0 )
     Muon.addRZ(   420.0 ,  6783.0 )
-    Muon.addRZ(    70.0 ,  6783.0 ) 
+    Muon.addRZ(    70.0 ,  6783.0 )
     Muon.addRZ(    70.0 , 12900.0 )
     Muon.addRZ(   279.0 , 12900.0 )
     Muon.addRZ(   279.0 , 18650.0 )
@@ -92,18 +93,18 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     Muon.addRZ( 12650.0 , 18650.0 )
     Muon.addRZ( 13400.0 , 18650.0 )
     Muon.addRZ( 13400.0 , 12900.0 )
-    Muon.addRZ( 13910.0 , 12900.0 )
-    Muon.addRZ( 13910.0 , 6550.0 )
-    Muon.addRZ( 13000.0 , 6550.0 )
+    Muon.addRZ( 14200.0 , 12900.0 )
+    Muon.addRZ( 14200.0 ,  4000.0 )
+    Muon.addRZ( 13000.0 ,  4000.0 )
     kwargs.setdefault("FallbackMuonR"   , Muon.getRs()        )
     kwargs.setdefault("FallbackMuonZ"   , Muon.getZs()        )
 
 
-    # setup fallback CavernEnvelope 
+    # setup fallback CavernEnvelope
     Cavern = Volume()
-    Cavern.addRZ( 13000.0 , 6550.0 )
-    Cavern.addRZ( 13910.0 , 6550.0 )
-    Cavern.addRZ( 13910.0 , 12900.0 ) # boundary with MS
+    Cavern.addRZ( 13000.0 , 4000.0 )
+    Cavern.addRZ( 14200.0 , 4000.0 )
+    Cavern.addRZ( 14200.0 , 12900.0 ) # boundary with MS
     Cavern.addRZ( 13400.0 , 12900.0 ) # boundary with MS
     Cavern.addRZ( 13400.0 , 18650.0 ) # boundary with MS
     Cavern.addRZ( 12650.0 , 18650.0 ) # boundary with MS
@@ -112,7 +113,7 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     Cavern.addRZ(  2750.0 , 23001.0 ) # boundary with MS
     Cavern.addRZ(  1500.0 , 23001.0 ) # boundary with MS
     Cavern.addRZ(  1500.0 , 26046.0 ) # boundary with MS
-    Cavern.addRZ(     0.0 , 26046.0 ) # 
+    Cavern.addRZ(     0.0 , 26046.0 ) #
 
     # the outer dimesions differ between collision and cosmics jobs
     from AthenaCommon.BeamFlags import jobproperties

AtlasGeometryCommon/SubDetectorEnvelopes/share/postInclude.showEnvelopesGUI.py

+"""
+Visualize envelopes as defined in EnvelopeDefSvc
+Elmar Ritsch, 13/05/2016
+"""
+
+from AthenaCommon.CfgGetter import getService
+
+
+def draw_envelope(ax, rlist_half, zlist_half, color, label):
+
+    # mirror the given (r,z) values in the x-y plane
+    rlist = rlist_half[:]
+    zlist = zlist_half[:]
+    for r in reversed(rlist_half):
+        rlist.append(r)
+    for z in reversed(zlist_half):
+        zlist.append(-z)
+    rlist.append(rlist[0])
+    zlist.append(zlist[0])
+
+    area = Polygon(zip(zlist, rlist), alpha=0.5, closed=True, color=color, label=label, linewidth=0.)
+    ax.add_patch(area)
+
+
+if __name__ == "__main__":
+    import matplotlib
+    matplotlib.use('Qt4Agg') # use backend that supports GUI (rather than file output only)
+    import matplotlib.pyplot as plt
+    from matplotlib.patches import Polygon
+
+    svc = getService('AtlasGeometry_EnvelopeDefSvc')
+
+    fig, ax = plt.subplots(figsize=(20,10))
+
+    draw_envelope(ax, svc.FallbackBeamPipeR, svc.FallbackBeamPipeZ, 'r', label='BeamPipe')
+    draw_envelope(ax, svc.FallbackInDetR, svc.FallbackInDetZ, 'b', label='InDet')
+    draw_envelope(ax, svc.FallbackCaloR, svc.FallbackCaloZ, 'c', label='Calo')
+    draw_envelope(ax, svc.FallbackMuonR, svc.FallbackMuonZ, 'm', label='MS')
+    draw_envelope(ax, svc.FallbackCavernR, svc.FallbackCavernZ, 'k', label='Cavern')
+
+    ax.autoscale_view()
+    plt.ylabel('r  (mm)')
+    plt.xlabel('z  (mm)')
+    plt.legend()
+    plt.show(block=True)
+    exit(1)

AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml

@@ -31,7 +31,7 @@
 
         <TEST name="RECOSHIFT_RAWtoESD" type="script" suite="athenamp">
             <package_atn>AtlasTest/AthenaMPTest</package_atn>
-            <options_atn>TRF_ECHO=1 Reco_tf.py '--inputBSFile' '/afs/cern.ch/atlas/project/rig/referencefiles/dataStreams_10Events/data10_7TeV.00167607.physics_JetTauEtmiss.merge.RAW._lb0087._SFO-4._0001.1_10events' '--maxEvents' '4' '--outputESDFile' 'myESD.pool.root' '--athenaopts=--nprocs=2' '--geometryVersion=ATLAS-R2-2015-03-01-00' '--preExec' 'rec.doTrigger=False' </options_atn>
+            <options_atn>TRF_ECHO=1 Reco_tf.py '--inputBSFile' '/afs/cern.ch/atlas/project/rig/referencefiles/dataStreams_10Events/data10_7TeV.00167607.physics_JetTauEtmiss.merge.RAW._lb0087._SFO-4._0001.1_10events' '--maxEvents' '4' '--outputESDFile' 'myESD.pool.root' '--athenaopts=--nprocs=2' '--geometryVersion=ATLAS-R1-2010-02-00-00' '--preExec' 'rec.doTrigger=False' </options_atn>
             <timelimit>90</timelimit>
             <author> Vakho Tsulaia </author>
             <mailto> tsulaia@cern.ch  </mailto>

AtlasTest/ControlTest/CMakeLists.txt

-# $Id: CMakeLists.txt 730270 2016-03-16 07:57:19Z krasznaa $
+# $Id: CMakeLists.txt 757711 2016-06-26 13:59:12Z ssnyder $
 ################################################################################
 # Package: ControlTest
 ################################################################################
@@ -89,9 +89,16 @@ atlas_add_test( ClearStore_test
    EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
    ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
 
+atlas_add_test( StoreID
+   SOURCES test/StoreID_test.cxx
+   LINK_LIBRARIES TestTools StoreGateLib
+   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" )
+   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" 
+   PROPERTIES TIMEOUT 300 )
 
 if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
       "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
@@ -103,18 +110,22 @@ endif()
 
 atlas_add_test( StoreGateReentrant
    SCRIPT test/StoreGateReentrant.sh
+   PROPERTIES TIMEOUT 300
    EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$${SGGoptignore}|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc" )
 
 atlas_add_test( StoreGateGen
    SCRIPT test/StoreGateGen.sh
+   PROPERTIES TIMEOUT 300
    EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$${SGGoptignore}|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc" )
 
 atlas_add_test( StoreGateDFlow
    SCRIPT test/StoreGateDFlow.sh
+   PROPERTIES TIMEOUT 300
    EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$${SGGoptignore}|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|WARNING could not get proxy for key|Start StoreGateSvc" )
 
 atlas_add_test( test_interactive_athena
    SCRIPT test/test_interactive_athena.sh
+   PROPERTIES TIMEOUT 300
    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:

AtlasTest/ControlTest/cmt/requirements

@@ -57,6 +57,9 @@ apply_pattern UnitTest_run unit_test=ClearStore \
 macro_append ClearStore_testlinkopts " -lSGtests"
 #macro ClearStore_test_cppflags " -D __PROXYDEBUG"
 
+apply_pattern UnitTest_run unit_test=StoreID \
+  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
+
 #integration tests
 apply_pattern install_applications
 apply_pattern install_xmls
@@ -101,4 +104,3 @@ apply_pattern athenarun_test name="test_interactive_athena" \
 
 ## AthenaCommon/python unit-test
 apply_pattern declare_python_modules files="*.py"
-

AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref

-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/work/c/calaf/public/fixOverwrite/InstallArea/jobOptions/ControlTest/StoreGateTestCommon.txt
-JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
+JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build-clang/joboptions/ControlTest/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
 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/atlas/software/builds/nightlies/devval/AtlasCore/rel_1/InstallArea/jobOptions/ToyConversion/ToyConversionOpts.txt
+JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build-clang/joboptions/ToyConversion/ToyConversionOpts.txt
 JobOptionsSvc        INFO # (5,1): EventPersistencySvc.CnvServices += ["ToyConversionSvc"]
-JobOptionsSvc        INFO # =======> /afs/cern.ch/work/c/calaf/public/fixOverwrite/AtlasTest/ControlTest/run/../share/ProxyProviderSvc_test.txt
+JobOptionsSvc        INFO # =======> /home/sss/nobackup/atlas/build-clang/../tests/../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"]
@@ -20,63 +19,65 @@ JobOptionsSvc        INFO Job options successfully read in from ../share/ProxyPr
 ApplicationMgr      DEBUG Getting my own properties
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r3)
-                                          running on lxplus0045.cern.ch on Wed Mar 18 02:12:43 2015
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Sun Jun 12 23:05:49 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 ServiceManager      DEBUG Initializing service DetectorStore
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-03-01-09
+DetectorStore     VERBOSE Initializing DetectorStore - package version StoreGate-00-00-00
+DetectorStore       DEBUG Property update for OutputLevel : new value = 1
 DetectorStore       DEBUG Service base class initialized successfully
+EventPersistenc...  DEBUG Property update for OutputLevel : new value = 1
 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-18
+ClassIDSvc          DEBUG Property update for OutputLevel : new value = 2
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
 ClassIDSvc          DEBUG Service base class initialized successfully
-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
+ClassIDSvc           INFO  getRegistryEntries: read 1045 CLIDRegistry entries for module ALL
+ClassIDSvc          DEBUG processCLIDDB: read 1345 entries from CLIDDB file: /home/sss/atlas/rootaccess/build-clang/share/clid.db
 DetectorStore     VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
+ProxyProviderSvc    DEBUG Property update for OutputLevel : new value = 1
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
 ProxyProviderSvc  VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 ServiceManager      DEBUG Initializing service HistoryStore
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-03-01-09
+HistoryStore      VERBOSE Initializing HistoryStore - package version StoreGate-00-00-00
+HistoryStore        DEBUG Property update for OutputLevel : new value = 1
 HistoryStore        DEBUG Service base class initialized successfully
 HistoryStore      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 HistoryStore      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
+ServiceManager      DEBUG Initializing service ConditionsStore
 ServiceManager      DEBUG Initializing service AppMgrRunable
 ServiceManager      DEBUG Initializing service EventLoopMgr
+EventDataSvc        DEBUG Property update for OutputLevel : new value = 1
 EventDataSvc        DEBUG Service base class initialized successfully
 EventDataSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
+HistogramDataSvc    DEBUG Property update for OutputLevel : new value = 1
 HistogramDataSvc    DEBUG Service base class initialized successfully
 HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
+HistogramPersis...  DEBUG  'CnvServices':[ 'RootHistSvc' ]
 HistogramPersis...  DEBUG Service base class initialized successfully
 HistogramPersis...WARNING Histograms saving not required.
 HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-01-09
+StoreGateSvc      VERBOSE Initializing StoreGateSvc - package version StoreGate-00-00-00
+StoreGateSvc        DEBUG Property update for OutputLevel : new value = 1
 StoreGateSvc        DEBUG Service base class initialized successfully
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc        DEBUG  Bound handle 0x7fff5f6e0000 to proxy 0xe352e0
-building toy 0xe35c80
+StoreGateSvc        DEBUG  Bound handle 0x7ffd6b33e6a8 to proxy 0x29e5c60
+ToyConversionSvc    DEBUG Property update for OutputLevel : new value = 1
 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 722 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 345 CLIDRegistry entries for module ALL
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 1 proxy for ClassID 8107 (Bar): 
- flags: (  valid,   locked,  reset) --- data:   0xe365b0 --- key: aBar
+ flags: (  valid,   locked,  reset) --- data:  0x29e8190 --- key: aBar
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 StoreGateSvc        DEBUG Retrieved const handle to object aFoo  of type Foo(CLID 8101)
@@ -86,21 +87,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 0xdf3a00 has a NULL data object ptr
+SG::DataProxy_castWARNING this proxy 0x29599c0 has a NULL data object ptr
 <<---Error Message Ends-------
 *** ProxyProviderSvc_test OK ***
 *** ProxyProviderSvc_test RecordBeforeRead BEGINS ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-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 aFoo CLID 8101 address 0x2985ad0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=aFoo, CLID=8101, containing data object @0x2985ad0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  reset object aBar CLID 8107 address 0x29e8190
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x29e5c60, recorded with key=aBar, CLID=8107, containing data object @0x29e8190  ... -> 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      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x29599c0, 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 SGImplSvc::overwrite method instead
-StoreGateSvc        DEBUG Recorded object @0xe2a140 with key existingFoo of type Foo(CLID 8101)
- in DataObject @0xd89e10
+StoreGateSvc        DEBUG Recorded object @0x28e9080 with key existingFoo of type Foo(CLID 8101)
+ in DataObject @0x29e8190
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object existingFoo  of type Foo(CLID 8101)
 6.28
@@ -115,15 +116,15 @@ Now we expect to see an error message:
 <<---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 SGImplSvc::overwrite method instead
-StoreGateSvc        DEBUG Recorded object @0xe293c0 with key privFoo of type Foo(CLID 8101)
- in DataObject @0xd8d500
+StoreGateSvc        DEBUG Recorded object @0x28c2670 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0x29405b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0xe0d840 with key privFoo of type Foo(CLID 8101)
- in DataObject @0xdf0170
+StoreGateSvc        DEBUG overwrite: Recorded object @0x277a020 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0x2985ad0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object privFoo  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0xe2bb10 with key silly33 of type Foo(CLID 8101)
- in DataObject @0xdf9950
+StoreGateSvc        DEBUG Recorded object @0x28c7350 with key silly33 of type Foo(CLID 8101)
+ in DataObject @0x2943400
  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:
@@ -144,28 +145,28 @@ Now we expect to see an error message:
 *** ProxyProviderSvc_test HLTAutoKeyReset BEGINS ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x2986650, 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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x29e81e0, recorded with key=diskFoo, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object existingFoo CLID 8101 address 0x29e8190
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x2942e60, recorded with key=existingFoo, CLID=8101, containing data object @0x29e8190  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object privFoo CLID 8101 address 0x2985ad0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x2985fa0, recorded with key=privFoo, CLID=8101, containing data object @0x2985ad0  ... -> 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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x296ebf0, 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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x29e5c60, 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      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x29599c0, recorded with key=aFooBar, CLID=8109, containing data object @0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
 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
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x29599c0, 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
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2942e60, 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
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x29e81e0, 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
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=NOT_HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
 *** ProxyProviderSvc_test HLTAutoKeyReset OK ***
 
 
@@ -174,36 +175,36 @@ StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProx
 
 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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x29e81e0, 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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x2986650, 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
+StoreGateSvc        DEBUG overwrite: Recorded object @0x28c93a0 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x29e8190
  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
+DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x29e8190
 FooBar i=0 deleted
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdf3a00, recorded with key=toOverwrite, CLID=8109, containing data object @0xd528d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=toOverwrite, CLID=8109, containing data object @0x29e8190  ... -> DONE
 =============Event #1 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0xd7c320 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0xd528d0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x28c2130 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x29e8190
  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
+DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x29e8190
 FooBar i=1 deleted
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde50d0, recorded with key=toOverwrite, CLID=8109, containing data object @0xd528d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=toOverwrite, CLID=8109, containing data object @0x29e8190  ... -> DONE
 =============Event #2 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0xe2bb10 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0xd528d0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x28c2670 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x29e8190
  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
+DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x29e8190
 FooBar i=2 deleted
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xe350b0, recorded with key=toOverwrite, CLID=8109, containing data object @0xd528d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=toOverwrite, CLID=8109, containing data object @0x29e8190  ... -> DONE
 *** ProxyProviderSvc_test Overwrite OK ***
 
 

AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref

 
 
 Initializing Gaudi ApplicationMgr using job opts ../share/StoreGateSvcClient_test.txt
-JobOptionsSvc        INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ControlTest/StoreGateTestCommon.txt
-JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
+JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/ControlTest/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
 JobOptionsSvc        INFO # (8,1): StoreGateSvc.ActivateHistory = 0
@@ -11,119 +11,117 @@ 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 v999r999)
-                                          running on karma on Mon Nov 30 23:44:08 2015
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Mon Jun 20 11:32:32 2016
 ====================================================================================================================================
 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 941 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1007 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-00-00-00
+StoreGateSvc        DEBUG Property update for OutputLevel : new value = 1
 StoreGateSvc        DEBUG Service base class initialized successfully
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
 *** StoreGateSvcClient_test record BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x17eac20 with key pFoo1 of type Foo(CLID 8101)
- in DataObject @0x17f3580
+StoreGateSvc        DEBUG Recorded object @0xc8a740 with key pFoo1 of type Foo(CLID 8101)
+ in DataObject @0xcabaa0
  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 @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
+ Pre-existing valid DataProxy @0xf63000 found in Store for key pFoo1 with clid 8101
+ClassIDSvc           INFO  getRegistryEntries: read 343 CLIDRegistry entries for module ALL
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xcab400
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0xca3d60
 <<---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 @0x17eac20 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0xc8a740 already in store with key=pFoo1. Will not record a duplicate! 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1844cd0 with key pFoo2 of type Foo(CLID 8101)
- in DataObject @0x17e31d0
+StoreGateSvc        DEBUG Recorded object @0xf57d10 with key pFoo2 of type Foo(CLID 8101)
+ in DataObject @0xf70a90
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e6e00 with key cpFoo of type Foo(CLID 8101)
- in DataObject @0x185cc70
+StoreGateSvc        DEBUG Recorded object @0xcaac20 with key cpFoo of type Foo(CLID 8101)
+ in DataObject @0xca0c20
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key silly of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0xf70ae0 with key silly of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  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 @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
+ Pre-existing valid DataProxy @0xff0770 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xfcd4e0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xfcd450
 <<---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 @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
+ Pre-existing valid DataProxy @0xff0770 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xcab020
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xf5d370
 <<---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 @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
+ Pre-existing valid DataProxy @0xff0770 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf6f6c0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xf5d3c0
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1863310 with key UnLocked of type Foo(CLID 8101)
- in DataObject @0x1861b10
+StoreGateSvc        DEBUG Recorded object @0xca8d70 with key UnLocked of type Foo(CLID 8101)
+ in DataObject @0xfcfd70
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e3fc0 with key Locked of type Foo(CLID 8101)
- in DataObject @0x17e4000
+StoreGateSvc        DEBUG Recorded object @0xca8950 with key Locked of type Foo(CLID 8101)
+ in DataObject @0xf752e0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e4050 with key LockedReset of type Foo(CLID 8101)
- in DataObject @0x17e35c0
+StoreGateSvc        DEBUG Recorded object @0xca27d0 with key LockedReset of type Foo(CLID 8101)
+ in DataObject @0xf60b80
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e3870 with key UnLockedReset of type Foo(CLID 8101)
- in DataObject @0x17e38c0
+StoreGateSvc        DEBUG Recorded object @0xf70680 with key UnLockedReset of type Foo(CLID 8101)
+ in DataObject @0xf705d0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d93c0 with key LockedDelete of type Foo(CLID 8101)
- in DataObject @0x17d93e0
+StoreGateSvc        DEBUG Recorded object @0xf64810 with key LockedDelete of type Foo(CLID 8101)
+ in DataObject @0xf64760
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e39a0 with key UnLockedDelete of type Foo(CLID 8101)
- in DataObject @0x17d96b0
+StoreGateSvc        DEBUG Recorded object @0xcb13b0 with key UnLockedDelete of type Foo(CLID 8101)
+ in DataObject @0xf648b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d9960 with key Const of type Foo(CLID 8101)
- in DataObject @0x17d99b0
+StoreGateSvc        DEBUG Recorded object @0xf5cb30 with key Const of type Foo(CLID 8101)
+ in DataObject @0xf5b700
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d9760 with key Const2 of type Foo(CLID 8101)
- in DataObject @0x17d9c80
+StoreGateSvc        DEBUG Recorded object @0xca5f20 with key Const2 of type Foo(CLID 8101)
+ in DataObject @0xca5e70
  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 @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
+ Pre-existing valid DataProxy @0xf60380 found in Store for key Const with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf5d8f0
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0xf5d820
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x17eb9d0 with key ow of type Foo(CLID 8101)
- in DataObject @0x17ebae0
+StoreGateSvc        DEBUG Recorded object @0xf757b0 with key ow of type Foo(CLID 8101)
+ in DataObject @0xf5d910
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17ebd30 with key ow of type Foo(CLID 8101)
- in DataObject @0x17ebda0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xca4360 with key ow of type Foo(CLID 8101)
+ in DataObject @0xca4430
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17eb9d0 with key ow of type Foo(CLID 8101)
- in DataObject @0x17ebae0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xca4480 with key ow of type Foo(CLID 8101)
+ in DataObject @0xf5d910
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17ebd30 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x17ebda0
+StoreGateSvc        DEBUG Recorded object @0xca4340 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0xca4430
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17ec0c0 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x17ebef0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xf64010 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0xf63760
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17ebd30 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x17ebda0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xf63ff0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0xca4430
  object not modifiable when retrieved
 *** StoreGateSvcClient_test records OK ***
 
@@ -225,47 +223,47 @@ Now we expect to see an error message:
 StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object   of type Foo(CLID 8101) 
  Try to use a const DataHandle
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0xf63910 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  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 @0x185c7f0 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0xca4340 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0xca4340 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  object modifiable when retrieved
 *** StoreGateSvcClient_test removes OK ***
 
 
 
 *** StoreGateSvcClient_test testCreate BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pCreateFooDefault of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0xca4340 with key pCreateFooDefault of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e4970 with key pCreateFoo1 of type Foo(CLID 8101)
- in DataObject @0x17ec440
+StoreGateSvc        DEBUG Recorded object @0xf645a0 with key pCreateFoo1 of type Foo(CLID 8101)
+ in DataObject @0xf72cb0
  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 @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
+ Pre-existing valid DataProxy @0xf6fb40 found in Store for key pCreateFoo1 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf72d00
+ recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0xf72f00
+StoreGateSvc        ERROR create: problem recording created object @0xf72d00 using key pCreateFoo1
 <<---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 @0x181a840 with key fooKey of type Foo(CLID 8101)
- in DataObject @0x181a640
+StoreGateSvc        DEBUG Recorded object @0xca9160 with key fooKey of type Foo(CLID 8101)
+ in DataObject @0xf79970
  object modifiable when retrieved
-StoreGateSvc        DEBUG  Bound handle 0x7ffd16461f40 to proxy 0x17ec220
+StoreGateSvc        DEBUG  Bound handle 0x7fff1094f1e0 to proxy 0xf79b40
 *** StoreGateSvcClient_test bind OK ***
 
 
@@ -274,57 +272,57 @@ Testing dump:
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 1 proxy for ClassID 8100 (Base): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1861b10 --- key: UnLocked
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xfcfd70 --- key: UnLocked
 Found 17 proxies for ClassID 8101 (Foo): 
- 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: (  valid,   locked,  reset) --- data:   0xf5b700 --- key: Const
+ flags: (  valid,   locked,  reset) --- data:   0xca5e70 --- key: Const2
+ flags: (  valid,   locked,  reset) --- data:   0xf752e0 --- key: Locked
+ flags: (  valid,   locked, DELETE) --- data:   0xf64760 --- key: LockedDelete
+ flags: (  valid,   locked,  reset) --- data:   0xf60b80 --- key: LockedReset
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xfcfd70 --- key: UnLocked
+ flags: (  valid, UNLOCKED, DELETE) --- data:   0xf648b0 --- key: UnLockedDelete
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf705d0 --- key: UnLockedReset
+ flags: (  valid,   locked,  reset) --- data:   0xca0c20 --- key: cpFoo
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf79970 --- key: fooKey
+ flags: (  valid, UNLOCKED, DELETE) --- data:   0xf5d910 --- key: ow
+ flags: (  valid,   locked, DELETE) --- data:   0xca4430 --- key: ow2
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf72cb0 --- key: pCreateFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf63fa0 --- key: pCreateFooDefault
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xcabaa0 --- key: pFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf70a90 --- key: pFoo2
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: silly
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 <<--------
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfe8810, recorded with key=UnLocked, CLID=8101, containing data object @0xfcfd70  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf60380, recorded with key=Const, CLID=8101, containing data object @0xf5b700  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca38c0, recorded with key=Const2, CLID=8101, containing data object @0xca5e70  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf60ab0, recorded with key=Locked, CLID=8101, containing data object @0xf752e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca4ad0, recorded with key=LockedDelete, CLID=8101, containing data object @0xf64760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfef5b0, recorded with key=LockedReset, CLID=8101, containing data object @0xf60b80  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfe8810, recorded with key=UnLocked, CLID=8101, containing data object @0xfcfd70  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5b610, recorded with key=UnLockedDelete, CLID=8101, containing data object @0xf648b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf64670, recorded with key=UnLockedReset, CLID=8101, containing data object @0xf705d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfe3b80, recorded with key=cpFoo, CLID=8101, containing data object @0xca0c20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79b40, recorded with key=fooKey, CLID=8101, containing data object @0xf79970  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca41f0, recorded with key=ow, CLID=8101, containing data object @0xf5d910  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca42c0, recorded with key=ow2, CLID=8101, containing data object @0xca4430  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf6fb40, recorded with key=pCreateFoo1, CLID=8101, containing data object @0xf72cb0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca43b0, recorded with key=pCreateFooDefault, CLID=8101, containing data object @0xf63fa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=pFoo1, CLID=8101, containing data object @0xcabaa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xc9ff20, recorded with key=pFoo2, CLID=8101, containing data object @0xf70a90  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xff0770, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0xfee4a0 with key d1 of type D1(CLID 8112)
+ in DataObject @0xff2600
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1  of type B1(CLID 8111)
-0x17f2f40
-0x17f2dc0StoreGateSvc
+0xf74cc0
+0xf74ab0StoreGateSvc
 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 @0x18615e0 with key d2 of type D1(CLID 8112)
- in DataObject @0x181a2a0
+StoreGateSvc        DEBUG Recorded object @0xc8ecc0 with key d2 of type D1(CLID 8112)
+ in DataObject @0xff7550
  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)
@@ -333,21 +331,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 @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      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=d2, CLID=8112, containing data object @0xff7550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=dd, CLID=8112, containing data object @0xff8280  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=d2, CLID=8112, containing data object @0xff7550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=d2, CLID=8112, containing data object @0xff7550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xc9ff20, recorded with key=dd, CLID=8112, containing data object @0xf70a90  ... -> DONE
 StoreGateSvc        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 @0x17ebd50 with key pSwapFoo1 of type Foo(CLID 8101)
- in DataObject @0x17f3580
+StoreGateSvc        DEBUG Recorded object @0xf645a0 with key pSwapFoo1 of type Foo(CLID 8101)
+ in DataObject @0xf5d9b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e3570 with key pSwapFoo2 of type Foo(CLID 8101)
- in DataObject @0x17ec440
+StoreGateSvc        DEBUG Recorded object @0xf72f90 with key pSwapFoo2 of type Foo(CLID 8101)
+ in DataObject @0xf6fc10
  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)
@@ -356,81 +354,81 @@ StoreGateSvc        DEBUG Retrieved non-const handle to object pSwapFoo2  of typ
 
 
 *** StoreGateSvcClient_test VersionedKey BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x17d6520 with key aVersObj of type Foo(CLID 8101)
- in DataObject @0x17e31d0
+StoreGateSvc        DEBUG Recorded object @0xca0580 with key aVersObj of type Foo(CLID 8101)
+ in DataObject @0xf78df0
  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
+StoreGateSvc        DEBUG Recorded object @0xca9b00 with key ;77;aVersObj of type Foo(CLID 8101)
+ in DataObject @0xf5bc40
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object ;77;aVersObj  of type Foo(CLID 8101)
 StoreGateSvc        DEBUG Retrieved non-const handle to object aVersObj  of type Foo(CLID 8101)
 StoreGateSvc        DEBUG Retrieved non-const handle to object ;00;aVersObj  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0x181a490 with key ;88;aVersObj of type Foo(CLID 8101)
- in DataObject @0x17ebae0
+StoreGateSvc        DEBUG Recorded object @0xcaac20 with key ;88;aVersObj of type Foo(CLID 8101)
+ in DataObject @0xcab300
  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 @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
+ Pre-existing valid DataProxy @0xca3910 found in Store for key ;88;aVersObj with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf77d60
+ recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0xf5d3c0
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1860810 with key ;66;aVersObj of type Foo(CLID 8101)
- in DataObject @0x181a640
+StoreGateSvc        DEBUG Recorded object @0xca4c60 with key ;66;aVersObj of type Foo(CLID 8101)
+ in DataObject @0xf5d410
  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 @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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=aVersObj, CLID=8101, containing data object @0xf78df0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5d820, recorded with key=;66;aVersObj, CLID=8101, containing data object @0xf5d410  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=;77;aVersObj, CLID=8101, containing data object @0xf5bc40  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=;88;aVersObj, CLID=8101, containing data object @0xcab300  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5d820, recorded with key=;66;aVersObj, CLID=8101, containing data object @0xf5d410  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=pSwapFoo1, CLID=8101, containing data object @0xf6fc10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xc9ff20, recorded with key=pSwapFoo2, CLID=8101, containing data object @0xf5d9b0  ... -> DONE
 *** test_DVL_conversions
-StoreGateSvc        DEBUG Recorded object @0x17eac60 with key contd of type CV(CLID 82734625)
- in DataObject @0x186d850
+StoreGateSvc        DEBUG Recorded object @0xf70560 with key contd of type CV(CLID 82734625)
+ in DataObject @0xc9ff20
  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 @0x17eb7e0 with key contd of type CL(CLID 82734626)
- in DataObject @0x17e3950
+StoreGateSvc        DEBUG Recorded object @0xfc13b0 with key contd of type CL(CLID 82734626)
+ in DataObject @0xf5d820
  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 @0x1861b70 with key dvl of type CV(CLID 82734625)
- in DataObject @0x181a7f0
+StoreGateSvc        DEBUG Recorded object @0xca8f50 with key dvl of type CV(CLID 82734625)
+ in DataObject @0xf63000
  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 @0x17e3420 with key dvl2 of type CV(CLID 82734625)
- in DataObject @0x17e33b0
+StoreGateSvc        DEBUG Recorded object @0xf79a20 with key dvl2 of type CV(CLID 82734625)
+ in DataObject @0xf64740
  object not modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object dvl2  of type CV(CLID 82734625)
-StoreGateSvc        DEBUG Recorded object @0x181aff0 with key dvl of type CL(CLID 82734626)
- in DataObject @0x17e81e0
+StoreGateSvc        DEBUG Recorded object @0xf5d8f0 with key dvl of type CL(CLID 82734626)
+ in DataObject @0xca42e0
  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 @0x17e8a60 with key dvl2 of type CL(CLID 82734626)
- in DataObject @0x17e89f0
+StoreGateSvc        DEBUG Recorded object @0xf57df0 with key dvl2 of type CL(CLID 82734626)
+ in DataObject @0xcabc20
  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 @0x17e8f40 with key x of type Athena_test::X(CLID 82734627)
- in DataObject @0x17e8ef0
+StoreGateSvc        DEBUG Recorded object @0xf65610 with key x of type Athena_test::X(CLID 82734627)
+ in DataObject @0xf5eaa0
  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
@@ -439,135 +437,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 @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
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0xc9ff20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0xf5d820  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0xf63000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0xf64740  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0xca42e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0xcabc20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0xf5eaa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0xcabbe0 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0xf5eaa0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e49e0 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0x17eadf0
+StoreGateSvc        DEBUG Recorded object @0xf5b220 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0xf5b520
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e4b20 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0x17e34e0
+StoreGateSvc        DEBUG Recorded object @0xcb13b0 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0xf63370
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d9860 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0x17ebc60
+StoreGateSvc        DEBUG Recorded object @0xf65890 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0xca39e0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-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      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf64740, recorded with key=LockDelete, CLID=8101, containing data object @0xf63370  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabc20, recorded with key=LockReset, CLID=8101, containing data object @0xf5eaa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=UnLockDelete, CLID=8101, containing data object @0xca39e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca42e0, recorded with key=UnLockReset, CLID=8101, containing data object @0xf5b520  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=UnLockDelete, CLID=8101, containing data object @0xca39e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabc20, recorded with key=LockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca42e0, recorded with key=UnLockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0xf655f0 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0xca53b0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e8610 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0x17e89a0
+StoreGateSvc        DEBUG Recorded object @0xfef610 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0xcabca0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d98b0 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0x18519d0
+StoreGateSvc        DEBUG Recorded object @0xf5e870 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0xf5da50
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e86e0 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0x17d9990
+StoreGateSvc        DEBUG Recorded object @0xf602a0 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0xf5d8a0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-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      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=LockDelete, CLID=8101, containing data object @0xf5da50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=LockReset, CLID=8101, containing data object @0xca53b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=UnLockDelete, CLID=8101, containing data object @0xf5d8a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=UnLockReset, CLID=8101, containing data object @0xcabca0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 
 *** StoreGateSvcClient_test Keys ENDS ***
 
 *** StoreGateSvcClient_test retrieveAux BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x17e8ca0 with key BVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x17e8190
+StoreGateSvc        DEBUG Recorded object @0xcabdb0 with key BVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0xf5b620
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x18607f0 with key BVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x17ebda0
+StoreGateSvc        DEBUG Recorded object @0xf65900 with key BVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0xf5d8a0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e49b0 with key CVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x17e8ea0
+StoreGateSvc        DEBUG Recorded object @0xf5ea50 with key CVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0xf647c0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x181afb0 with key CVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x17e37e0
+StoreGateSvc        DEBUG Recorded object @0xf9d7a0 with key CVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0xf74000
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e6d70 with key ErrorVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x17e88b0
+StoreGateSvc        DEBUG Recorded object @0xf79c20 with key ErrorVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0xca4a30
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x181ae00 with key BBVec of type TestVector<BBX>(CLID 125040193)
- in DataObject @0x17e3790
+StoreGateSvc        DEBUG Recorded object @0xfef5e0 with key BBVec of type TestVector<BBX>(CLID 125040193)
+ in DataObject @0xf740f0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17eb9d0 with key BBVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x17f3580
+StoreGateSvc        DEBUG Recorded object @0xfeca80 with key BBVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0xca4b20
  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)
@@ -586,11 +584,11 @@ StoreGateSvc      VERBOSE called associateAux_impl const for key ErrorVec
  to object of type TestVector<BX>(CLID 82735621) with key ErrorVec
 StoreGateSvc      WARNING 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1862c30 with key BStand of type BX(CLID 82835621)
- in DataObject @0x17e8770
+StoreGateSvc        DEBUG Recorded object @0xff07f0 with key BStand of type BX(CLID 82835621)
+ in DataObject @0xca8ff0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x185e810 with key BStandAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x181aea0
+StoreGateSvc        DEBUG Recorded object @0xcab020 with key BStandAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0xf5b520
  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)
@@ -599,88 +597,129 @@ StoreGateSvc        DEBUG Retrieved non-const handle to object BStand  of type B
 
 
 *** StoreGateSvcClient_test testBoundReset BEGINS ***
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17e4b20 with key testBoundReset of type int(CLID 244260744)
- in DataObject @0x17eb8b0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xf5e9c0 with key testBoundReset of type int(CLID 244260744)
+ in DataObject @0xcabd60
  object modifiable when retrieved
 
 *** StoreGateSvcClient_test testBoundReset OK ***
 
 
+
+*** StoreGateSvcClient_test testRecordObject BEGINS ***
+>>> test duplicate record1
+StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key obj101 and clid 8101
+ Pre-existing valid DataProxy @0xf63000 found in Store for key obj101 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf5e9a0
+ recorded with key obj101 of type Foo (CLID 8101) in DataObject @0xf72a60
+<<< test duplicate record1
+>>> test duplicate record2
+StoreGateSvc      WARNING record_impl: failed for key=obj999, type Foo (CLID 8101)
+ object @0xf73f40 already in store with key=obj101. Will not record a duplicate! 
+<<< test duplicate record2
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0xf63370  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf5d820, recorded with key=obj102, CLID=8101, containing data object @0xca50c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=BVec, CLID=82735621, containing data object @0xf5b620  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=CVec, CLID=82735621, containing data object @0xf647c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=ErrorVec, CLID=82735621, containing data object @0xca4a30  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca42e0, recorded with key=BStand, CLID=82835621, containing data object @0xca8ff0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=BBVecAux., CLID=125030194, containing data object @0xca4b20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabc20, recorded with key=BStandAux., CLID=125030194, containing data object @0xf5b520  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=BVecAux., CLID=125030194, containing data object @0xf5d8a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=CVecAux., CLID=125030194, containing data object @0xf74000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=BBVec, CLID=125040193, containing data object @0xf740f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf64740, recorded with key=testBoundReset, CLID=244260744, containing data object @0xcabd60  ... -> DONE
+
+*** StoreGateSvcClient_test testRecordObject OK ***
+
+*** StoreGateSvcClient_test testWriteAux BEGINS ***
+
+*** StoreGateSvcClient_test testWriteAux OK ***
 *** test_lock
-StoreGateSvc        DEBUG Recorded object @0x17e3fe0 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0x17e4e30
+StoreGateSvc        DEBUG Recorded object @0xf70ae0 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0xf74000
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-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      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf5d820, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf633f0, recorded with key=lockable1, CLID=82734636, containing data object @0xf74000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca42e0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf64740, recorded with key=testWriteAux, CLID=82835621, containing data object @0xf63370  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabc20, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xc9ff20, recorded with key=testWriteAuxAux., CLID=125030194, containing data object @0xf70760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0xf5e9a0 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0xf70760
+ object modifiable when retrieved
+StoreGateSvc      VERBOSE Finalizing StoreGateSvc - package version StoreGate-00-00-00
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5d820, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf633f0, recorded with key=lockable1, CLID=82734636, containing data object @0xf70760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf65760, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca42e0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf64740, recorded with key=testWriteAux, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabc20, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xc9ff20, recorded with key=testWriteAuxAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
 *** 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 @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
+ Pre-existing valid DataProxy @0xf79940 found in Store for key pFoo1 with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xca4480
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0xf72d70
 <<---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 @0x1819e00 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0xf64700 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 @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
+ Pre-existing valid DataProxy @0xca3910 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5e9a0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xcabaa0
 <<---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 @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
+ Pre-existing valid DataProxy @0xca3910 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5e870
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xf5da00
 <<---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 @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
+ Pre-existing valid DataProxy @0xca3910 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5ea10
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xcab370
 <<---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 @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
+ Pre-existing valid DataProxy @0xcabde0 found in Store for key Const with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5b5b0
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0xf5e7d0
 <<---Error Message Ends-------
 IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
 IOVSvcTool           INFO IOVRanges will be checked at every Event
-ClassIDSvc           INFO  getRegistryEntries: read 145 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 246 CLIDRegistry entries for module ALL
 *** StoreGateSvcClient_test records OK ***
 
 

AtlasTest/ControlTest/share/StoreGateTestCommon.txt

@@ -2,7 +2,7 @@
 
 // $Id: StoreGateTestCommon.txt,v 1.2 2008-05-30 22:53:11 calaf Exp $
 
-ApplicationMgr.ExtSvc += { "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore" };
+ApplicationMgr.ExtSvc += { "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore" };
 AuditorSvc.Auditors  += { "AlgContextAuditor"};
 StoreGateSvc.OutputLevel = 1;
 StoreGateSvc.ActivateHistory = false;

AtlasTest/ControlTest/share/StoreID_test.ref

+*** StoreID_test BEGINS ***
+
+
+Initializing Gaudi ApplicationMgr using job opts ../share/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # =======> /home/sss/nobackup/atlas/build-clang/../tests/../share/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore"]
+JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
+JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
+JobOptionsSvc        INFO # (8,1): StoreGateSvc.ActivateHistory = 0
+JobOptionsSvc        INFO # (9,1): CLIDSvc.OutputLevel = 2
+JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
+JobOptionsSvc        INFO Job options successfully read in from ../share/StoreGateTestCommon.txt
+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Sun Jun 12 23:09:39 2016
+====================================================================================================================================
+ApplicationMgr       INFO Application Manager Configured successfully
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 995 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-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        DEBUG Property update for OutputLevel : new value = 1
+StoreGateSvc        DEBUG Service base class initialized successfully
+StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
+StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
+*** StoreID_test OK ***

AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx

@@ -122,7 +122,7 @@ void testReadPrivate(StoreGateSvc& rSG) {
   SGASSERTERROR((rSG.readPrivateCopy<Foo>("NotThere")).get() != 0);
   
   apFoo=rSG.readUniquePrivateCopy<Foo>("diskFoo");
-  assert(0 != &*apFoo);
+  assert(0 != apFoo.get());
   assert(floatEQ(0, static_cast<float>(apFoo->a()))); //check that our Foo is the def constr one
 
   //now test the situation in which we have a transient obj in the way
@@ -132,11 +132,11 @@ void testReadPrivate(StoreGateSvc& rSG) {
   assert(rSG.overwrite(CxxUtils::make_unique<Foo>(6.28), "privFoo").isSuccess());
   
   apFoo=rSG.readUniquePrivateCopy<Foo>("privFoo");
-  assert(0 != &*apFoo);
+  assert(0 != apFoo.get());
   assert(floatNEQ(6.28f, static_cast<float>(apFoo->a()))); //check that our Foo is a different one
   apFoo->setA(3.14);
   std::unique_ptr<Foo> bpFoo(rSG.readUniquePrivateCopy<Foo>("privFoo"));
-  assert(0 != &*bpFoo);
+  assert(0 != bpFoo.get());
   assert(&*bpFoo != &*apFoo); //two independent instances
   assert(floatNEQ(6.28f, static_cast<float>(bpFoo->a()))); 
   assert(floatNEQ(3.14f, static_cast<float>(bpFoo->a()))); 

AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx

@@ -348,6 +348,10 @@ int main() {
   testRetrieveAux(*pStore);
   testBoundReset(*pStore);
 
+  testRecordObject(*pStore);
+
+  testWriteAux(*pStore);
+
   test_lock (*pStore);
 
   pStore->finalize().ignore();

AtlasTest/ControlTest/test/StoreID_test.cxx

+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/***************************************************************************
+ test the store ID setting
+ -------------------------------------------
+ ATLAS Collaboration
+ ***************************************************************************/
+
+// $Id: StoreID_test.cxx 753911 2016-06-09 13:40:32Z calaf $
+
+#include <iostream>
+
+#undef NDEBUG
+
+#include "StoreGate/StoreGateSvc.h"
+#include "StoreGate/SGtests.h"
+
+
+#ifndef NOGAUDI
+#include "TestTools/initGaudi.h"
+using namespace Athena_test;
+using namespace std;
+
+int main() {
+  cout << "*** StoreID_test BEGINS ***" <<endl;
+  ISvcLocator* pSvcLoc;
+  if (!initGaudi("StoreGateTestCommon.txt", pSvcLoc)) {
+    cerr << "This test can not be run" << endl;
+    return 0;
+  }  
+  assert(pSvcLoc);
+
+  StoreGateSvc* pStore(0);
+  static const bool CREATE(true);
+  assert((pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess());
+  assert(pStore);
+  
+  assert(pStore->storeID() == StoreID::EVENT_STORE);
+  pStore->setStoreID(StoreID::SPARE_STORE);
+  assert(pStore->storeID() == StoreID::SPARE_STORE);
+
+  assert((pSvcLoc->service("DetectorStore", pStore)).isSuccess());
+  assert(pStore);
+  assert(pStore->storeID() == StoreID::DETECTOR_STORE);
+  
+  assert((pSvcLoc->service("ConditionsStore", pStore, CREATE)).isSuccess());
+  assert(pStore);
+  assert(pStore->storeID() == StoreID::CONDITION_STORE);
+  
+  cout << "*** StoreID_test OK ***" <<endl;
+  return 0;
+}
+#endif /*NOGAUDI*/
+
+
+
+
+
+
+
+
+
+
+
+
+

AtlasTest/DatabaseTest/AthenaDBTestRec/CMakeLists.txt

+################################################################################
+# Package: AthenaDBTestRec
+################################################################################
+
+# Declare the package name:
+atlas_subdir( AthenaDBTestRec )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/AthenaBaseComps
+                          Control/AthenaKernel
+                          Control/CLIDSvc
+                          Control/SGTools
+                          Control/StoreGate
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          GaudiKernel
+                          PRIVATE
+                          Database/APR/CollectionBase
+                          Database/APR/CollectionUtilities
+                          Database/APR/POOLCore
+                          Database/APR/PersistencySvc
+                          Database/APR/StorageSvc
+                          Database/AthenaPOOL/AthenaPoolCnvSvc
+                          Database/CoraCool
+                          Database/PersistentDataModel
+                          Event/EventInfo )
+
+# External dependencies:
+find_package( Boost COMPONENTS filesystem thread system )
+find_package( COOL COMPONENTS CoolKernel CoolApplication )
+find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+include_directories(src)
+
+# Component(s) in the package:
+atlas_add_library( AthenaDBTestRecLib
+                   src/lib/*.cxx
+                   PUBLIC_HEADERS AthenaDBTestRec
+                   PRIVATE_INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                   LINK_LIBRARIES AthenaBaseComps AthenaKernel SGTools AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib
+                   PRIVATE_LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc CoraCool PersistentDataModel EventInfo )
+
+atlas_add_component( AthenaDBTestRec
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+
+atlas_add_poolcnv_library( AthenaDBTestRecPoolCnv
+                           src/*.cxx
+                           FILES AthenaDBTestRec/TestCoolRecPoolData.h AthenaDBTestRec/TestCoolRecPoolDataColl.h
+                           MULT_CHAN_TYPES TestCoolRecPoolDataColl
+                           INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                           LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+
+atlas_add_dictionary( AthenaDBTestRecDataDict
+                      AthenaDBTestRec/AthenaDBTestRecDataDict.h
+                      AthenaDBTestRec/selection.xml
+                      INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+
+atlas_add_executable( TestCoolRecWriter
+                      src/app/*.cxx
+                      INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${COOL_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc AthenaPoolCnvSvcLib CoraCool PersistentDataModel EventInfo AthenaDBTestRecLib )
+
+# Install files from the package:
+atlas_install_joboptions( share/*.py )
+

AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt

+################################################################################
+# Package: AthenaPoolTest
+################################################################################
+
+# Declare the package name:
+atlas_subdir( AthenaPoolTest )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+                          AtlasTest/DatabaseTest/AthenaPoolTestData
+                          Calorimeter/CaloDetDescr
+                          Calorimeter/CaloEvent
+                          Calorimeter/CaloIdentifier
+                          Control/AthenaBaseComps
+                          Control/AthenaKernel
+                          Control/StoreGate
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          DetectorDescription/GeoModel/GeoModelInterfaces
+                          DetectorDescription/GeoPrimitives
+                          DetectorDescription/Identifier
+                          Event/EventInfo
+                          Event/EventInfoMgt
+                          GaudiKernel
+                          InnerDetector/InDetDetDescr/InDetIdentifier
+                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
+                          InnerDetector/InDetRawEvent/InDetRawData
+                          InnerDetector/InDetRecEvent/InDetCompetingRIOsOnTrack
+                          InnerDetector/InDetRecEvent/InDetPrepRawData
+                          InnerDetector/InDetRecEvent/InDetRIO_OnTrack
+                          LArCalorimeter/LArRecEvent
+                          TestPolicy
+                          Tracking/TrkDetDescr/TrkSurfaces
+                          Tracking/TrkEvent/TrkCompetingRIOsOnTrack
+                          Tracking/TrkEvent/TrkEventPrimitives
+                          Tracking/TrkEvent/TrkMaterialOnTrack
+                          Tracking/TrkEvent/TrkParameters
+                          Tracking/TrkEvent/TrkTrack
+                          Tracking/TrkEvent/TrkVertexOnTrack )
+
+# External dependencies:
+find_package( Eigen )
+
+# Component(s) in the package:
+atlas_add_component( AthenaPoolTest
+                     src/AthenaPoolTestDataReader.cxx
+                     src/AthenaPoolTestDataWriter.cxx
+                     src/AthenaPoolTestAttrWriter.cxx
+                     src/AthenaPoolTestAttrReader.cxx
+                     src/InDetRawDataFakeReader.cxx
+                     src/InDetRawDataFakeWriter.cxx
+                     src/LArCellContFakeWriter.cxx
+                     src/LArCellContFakeReader.cxx
+                     src/EventInfoWriter.cxx
+                     src/EventInfoReader.cxx
+                     src/PileUpEventInfoWriter.cxx
+                     src/PileUpEventInfoReader.cxx
+                     src/TrkTrackFakeReader.cxx
+                     src/TrkTrackFakeWriter.cxx
+                     src/FakeTrackBuilder.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaPoolTestData CaloDetDescrLib CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GeoPrimitives Identifier EventInfo GaudiKernel InDetIdentifier InDetReadoutGeometry InDetRawData InDetCompetingRIOsOnTrack InDetPrepRawData InDetRIO_OnTrack LArRecEvent TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMaterialOnTrack TrkParameters TrkTrack TrkVertexOnTrack )
+
+# Install files from the package:
+atlas_install_headers( AthenaPoolTest )
+atlas_install_joboptions( share/*.py )
+

AtlasTest/DatabaseTest/AthenaPoolTest/src/InDetRawDataFakeWriter.cxx

@@ -328,8 +328,7 @@ StatusCode InDetRawDataFakeWriter::printRDOs() const
             rdo!=rdocoll->end() ; ++rdo) {
         
             ATH_MSG_DEBUG("RDO ID=" << m_sctId->show_to_string((*rdo)->identify()) 
-                          << "RDO grp=" << (*rdo)->getGroupSize() << " strip:" << 
-                          (*rdo)->getStrip() );
+                          << "RDO grp=" << (*rdo)->getGroupSize() );
         
         }
     }

AtlasTest/TestTools/CMakeLists.txt

+# $Id: CMakeLists.txt 744649 2016-05-03 19:33:39Z krasznaa $
 ################################################################################
 # Package: TestTools
 ################################################################################
@@ -6,25 +7,28 @@
 atlas_subdir( TestTools )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaCommon
-                          TestPolicy
-                          PRIVATE
-                          GaudiKernel )
+atlas_depends_on_subdirs(
+   PUBLIC
+   Control/AthenaCommon
+   TestPolicy
+   PRIVATE
+   GaudiKernel )
 
-# External dependencies:
-find_package( PythonLibs )
-
-# Component(s) in the package:
-atlas_add_library( TestTools
-                   src/*.cxx
-                   PUBLIC_HEADERS TestTools
-                   INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${PYTHON_LIBRARIES}
-                   PRIVATE_LINK_LIBRARIES GaudiKernel )
+# In standalone mode we just use the headers from the package. While in
+# offline mode we build a proper library.
+if( XAOD_STANDALONE )
+   atlas_add_library( TestTools
+      TestTools/*.h
+      INTERFACE
+      PUBLIC_HEADERS TestTools )
+else()
+   atlas_add_library( TestTools
+      TestTools/*.h src/*.cxx
+      PUBLIC_HEADERS TestTools
+      PRIVATE_LINK_LIBRARIES GaudiKernel )
+endif()
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_scripts( share/runUnitTests.sh share/post.sh )
-

AtlasTest/TestTools/cmt/requirements

@@ -43,4 +43,3 @@ macro_append DOXYGEN_INPUT " ../doc"
 macro_append DOXYGEN_INPUT " ../share" 
 macro_append DOXYGEN_FILE_PATTERNS    " *.sh"
 macro_append DOXYGEN_FILE_PATTERNS    " *.txt"
-

AtlasTest/TestTools/share/post.sh

@@ -145,6 +145,9 @@ PP="$PP"'|^ConditionStore +INFO Stop ConditionStore'
 # Differences between Gaudi versions.
 PP="$PP"'|DEBUG input handles:|DEBUG output handles:|DEBUG Data Deps for|DEBUG Property update for OutputLevel :|-ExtraInputs |-ExtraOutputs |-Cardinality |-IsClonable |-NeededResources |-Timeline '
 
+# StoreGate INFO messages changed to VERBOSE
+PP="$PP"'|^(StoreGateSvc|[^ ]+Store) +(INFO|VERBOSE) (Stop|stop|Start)'
+
 
 if [ "$extrapatterns" != "" ]; then
  PP="$PP""|$extrapatterns"

Build/AtlasCMake/AtlasCMakeConfig.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: AtlasCMakeConfig.cmake 746543 2016-05-12 11:31:22Z krasznaa $
+# $Id: AtlasCMakeConfig.cmake 756309 2016-06-20 15:39:40Z krasznaa $
 #
 # This file is used to make it possible to pull in the code of this package into
 # a top level CMake file using:
@@ -21,7 +21,7 @@
 
 # Print a status message that the file was found:
 if( NOT AtlasCMake_FIND_QUIETLY )
-   message( STATUS "AtlasCMake found with version: $Revision: 746543 $" )
+   message( STATUS "AtlasCMake found with version: $Revision: 756309 $" )
 endif()
 
 # Get the current directory:
@@ -43,7 +43,10 @@ set( ATLAS_DONT_PREPEND_PROJECT_MODULES TRUE
    CACHE BOOL "Prevent built projects from prepending to CMAKE_MODULE_PATH" )
 
 # Install the helper script(s) from the package:
-install( PROGRAMS ${_thisdir}/scripts/acmake.py DESTINATION bin )
+install( PROGRAMS ${_thisdir}/scripts/acmake.py
+   ${_thisdir}/scripts/cmakeNightlyInstall.sh
+   ${_thisdir}/scripts/cmakeReleaseInstall.sh
+   DESTINATION bin )
 install( DIRECTORY ${_thisdir}/cmt2cmake DESTINATION .
    USE_SOURCE_PERMISSIONS
    PATTERN ".*" EXCLUDE

Build/AtlasCMake/modules/AtlasCompilerSettings.cmake

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: AtlasCompilerSettings.cmake 744652 2016-05-03 19:40:31Z krasznaa $
+# $Id: AtlasCompilerSettings.cmake 782946 2016-11-08 12:41:46Z alibrari $
 #
 # This file collects settings fine-tuning all the compiler and linker options
 # used in an ATLAS build in one place. It is included by default when using
@@ -29,16 +29,7 @@ set( CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard used for the build" )
 set( CMAKE_CXX_EXTENSIONS FALSE CACHE BOOL "(Dis)allow using GNU extensions" )
 
 # Set the definitions needed everywhere:
-add_definitions( -DHAVE_PRETTY_FUNCTION
-   -DHAVE_EXPLICIT -DHAVE_MUTABLE -DHAVE_SIGNED -DHAVE_TYPENAME
-   -DHAVE_NEW_STYLE_CASTS -DHAVE_DYNAMIC_CAST -DHAVE_TYPEID
-   -DHAVE_ANSI_TEMPLATE_INSTANTIATION -DHAVE_TEMPLATE_DEFAULT_ARGS
-   -DHAVE_BROKEN_TEMPLATE_RESCOPE -DHAVE_TEMPLATE_NULL_ARGS
-   -DHAVE_TEMPLATE_NULL_SPEC -DHAVE_TEMPLATE_PARTIAL_SPEC
-   -DHAVE_MEMBER_TEMPLATES -DHAVE_ANSI_OPERATOR_ARROW
-   -DHAVE_NAMESPACES -DHAVE_NAMESPACE_STD
-   -DHAVE_OSTREAM_CHAR_OVERLOAD -DHAVE_ITERATOR_TRAITS -DHAVE_ITERATOR
-   -DHAVE_REVERSE_ITERATOR_STYLE -DHAVE_CXX_STDC_HEADERS )
+add_definitions( -DHAVE_PRETTY_FUNCTION )
 
 # Function helping with setting up variable type checks
 function( _check_for_type typeName definition )
@@ -48,10 +39,6 @@ function( _check_for_type typeName definition )
    endif()
 endfunction( _check_for_type )
 
-# Check for various C++ types:
-_check_for_type( "long long" LONG_LONG )
-_check_for_type( "bool" BOOL )
-
 # Function helping with setting up header checks
 function( _check_for_include include definition )
    check_include_file_cxx( ${include} ${definition} )
@@ -60,9 +47,6 @@ function( _check_for_include include definition )
    endif()
 endfunction( _check_for_include )
 
-# Check for various C++ includes:
-_check_for_include( "iostream" HAVE_NEW_IOSTREAMS )
-
 # Clean up:
 unset( _check_for_type )
 unset( _check_for_include )
@@ -116,6 +100,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
       _add_flag( CMAKE_CXX_FLAGS_${mode} "-Wextra" )
       _add_flag( CMAKE_CXX_FLAGS_${mode} "-Werror=return-type" )
    endforeach()
+   _add_flag( CMAKE_CXX_FLAGS_DEBUG "-fsanitize=undefined" )
 endif()
 foreach( mode RELEASE RELWITHDEBINFO DEBUG )
    _add_flag( CMAKE_CXX_FLAGS_${mode} "-pedantic" )