diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/CMakeLists.txt b/AtlasTest/DatabaseTest/TagCollectionTest/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8eae14a596c53da56d8f0bc39bd9336701eacd1d
--- /dev/null
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/CMakeLists.txt
@@ -0,0 +1,17 @@
+################################################################################
+# Package: TagCollectionTest
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TagCollectionTest )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Control/MinimalRunTime
+ TestPolicy
+ Tools/AtlasDoxygen )
+
+# Install files from the package:
+atlas_install_headers( TagCollectionTest )
+atlas_install_joboptions( share/*.py )
+
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection2_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection2_test.ref
index 5eafa93d662db9b3b6a2c215889ed7f1470f3c7e..66e6f1714be9c7f6867fabc209adf981e758806a 100755
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection2_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection2_test.ref
@@ -760,6 +760,7 @@ RegStream1.Regi...VERBOSE ServiceLocatorHelper::service: found service StoreGate
ApplicationMgr INFO Application Manager Stopped successfully
EventTagWriter DEBUG Finalizing EventTagWriter
DefaultCollMeta DEBUG In finalize
+EventTagWriter DEBUG Calling destructor
DefaultCollMeta DEBUG Calling destructor
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection3_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection3_test.ref
index f86ea0f843004be10cd86c4df5619ac24d11db10..abc0525ce89bb9fe16ca276ac9483e89ff5532c4 100755
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection3_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection3_test.ref
@@ -1390,6 +1390,7 @@ RegStream1.Regi...VERBOSE ServiceLocatorHelper::service: found service StoreGate
ApplicationMgr INFO Application Manager Stopped successfully
EventTagWriter DEBUG Finalizing EventTagWriter
DefaultCollMeta DEBUG In finalize
+EventTagWriter DEBUG Calling destructor
DefaultCollMeta DEBUG Calling destructor
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection7_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection7_test.ref
index 8aa3135b576a0c3a0cc59dd7a637c6efd3282efd..fd3aaad0f1de510c9af1ab358535b32aff2bdd6d 100644
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection7_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection7_test.ref
@@ -786,6 +786,7 @@ RegStream3.TagT...VERBOSE ServiceLocatorHelper::service: found service StoreGate
ApplicationMgr INFO Application Manager Stopped successfully
EventTagWriter DEBUG Finalizing EventTagWriter
DefaultCollMeta DEBUG In finalize
+EventTagWriter DEBUG Calling destructor
DefaultCollMeta DEBUG Calling destructor
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection_test.ref
index d3e8dc3c8654284f0e9f7ae05d0d79c6e1018174..04095fb60b557d44167d1927b9245b92328cb556 100755
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeDummyRootCollection_test.ref
@@ -883,6 +883,7 @@ DefaultCollMeta DEBUG In finalize
RegStream2 DEBUG In finalize
RegStream2.Regi... DEBUG In finalize: 5
RegStream2.Regi... DEBUG Calling destructor
+EventTagWriter DEBUG Calling destructor
DefaultCollMeta DEBUG Calling destructor
RegStream2.RegS... DEBUG Calling destructor
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeGlobalEventRootCollection_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeGlobalEventRootCollection_test.ref
index 144570c79dcca863d5d6399006549ea19b912ab5..740f4b8632342024b477f6054266eb5f4168bf24 100644
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeGlobalEventRootCollection_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/MakeGlobalEventRootCollection_test.ref
@@ -386,6 +386,7 @@ RegStream1.Regi... DEBUG Closed collection
GlobalEventTagB... DEBUG in stop()
GlobalEventTagB... INFO Event sum copied to MetaDataStore for GlobalEventTagBuilder.GlobalEventTagTool
ApplicationMgr INFO Application Manager Stopped successfully
+GlobalEventTagB... DEBUG Calling destructor
RegStream1 DEBUG In finalize
RegStream1.Regi... DEBUG In finalize: 5
RegStream1.Regi... DEBUG Calling destructor
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/PoolFileCatalog.xml b/AtlasTest/DatabaseTest/TagCollectionTest/test/PoolFileCatalog.xml
index c4704e38204f229d7ae83164faf7d249d2113d34..a76643b47ca217b31d90b56fca5b467c4c9d9a13 100755
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/PoolFileCatalog.xml
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/PoolFileCatalog.xml
@@ -3702,84 +3702,156 @@
- <File ID="5CA019FC-ED82-0A46-8A0B-888137179C5F">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <File ID="66E0FD80-DC39-C245-BFB0-0415AD509BAD">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:EventTagCollection"/>
</physical>
<logical/>
</File>
- <File ID="D3DDD95D-B2F4-DE41-9249-0ADF6D67E9CE">
+ <File ID="6A982C19-4943-4140-9982-C6C1241FDABB">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:NoMetadata"/>
</physical>
<logical/>
</File>
- <File ID="E85AC413-C2E5-FE49-9D08-F599323FECDD">
+ <File ID="471A9C8F-546A-E74F-9699-B177D24D3B1E">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:EventInfoTagCollection.root"/>
</physical>
<logical/>
</File>
- <File ID="E5EA306D-CA84-A14F-89E3-88F0E19C198C">
+ <File ID="C3CE7BFE-46B0-D045-BEE5-546D0B848251">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:EventTagCollection2.root"/>
</physical>
<logical/>
</File>
- <File ID="7CDF59CC-7A83-824E-A5BC-CD55EED65878">
+ <File ID="1AA9EE14-BB75-F546-9313-7200F274FBF4">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:EventTagCollection3.root"/>
</physical>
<logical/>
</File>
- <File ID="5419D359-D5D3-8D4F-BCBC-EB682D782ED1">
+ <File ID="A35E79A8-A073-E84A-9894-B3512A5AD3BE">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:EventTagCollection4.root"/>
</physical>
<logical/>
</File>
- <File ID="E704AA45-1388-8D4D-8BC3-023B23F1BA0D">
+ <File ID="EC303C3A-FBF7-9C43-9B21-1AFB7340556F">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:EventTagCollection5.root"/>
</physical>
<logical/>
</File>
- <File ID="EDE7CA09-7FB9-284F-9309-31B77C81EE4C">
+ <File ID="67E76D4A-89FF-A04A-997C-0D1E7090C4C2">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:EventTagCollection6.root"/>
</physical>
<logical/>
</File>
- <File ID="5F6C4747-D100-0149-8C8E-209BC4E1B0B4">
+ <File ID="70CF1328-491C-2041-B73B-843F016DC1DD">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:EventTagCollection7.root"/>
</physical>
<logical/>
</File>
- <File ID="172B1D3C-ED2C-C74D-8F08-7B5A46417689">
+ <File ID="15E55000-E5AE-814F-9E05-E28E775BEB11">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:ToolSupremacy.root"/>
</physical>
<logical/>
</File>
- <File ID="52307D02-B2DC-2B46-B27D-986A4F373BBA">
+ <File ID="7EA107E1-9DB2-E248-B555-E12BABE47D8E">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:TagTool.root"/>
</physical>
<logical/>
</File>
- <File ID="17899E8C-BB8A-234B-8BED-8ABCFE4EDFD5">
+ <File ID="21C6C98B-FC4D-D347-BE74-45D50C1A0C49">
<physical>
<pfn filetype="PoolCollection" name="RootCollection||PFN:GlobalEventTagCollection.root"/>
</physical>
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection2_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection2_test.ref
index 736e1955933f9bff71237bb5ca38e80c645b69de..2c534e39ce33210dcf7bf9dbc434df5d144dbf68 100755
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection2_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection2_test.ref
@@ -452,5 +452,6 @@ EventTagReader DEBUG NAME TEST2_ref TYPE string VALUE TEST2_ref (string) :
EventTagReader DEBUG NAME eventRef TYPE string VALUE eventRef (string) : [DB=7C35CFCE-CB62-DA11-8DA1-000E0C4DE51A][CNT=POOLContainer(DataHeader)][CLID=D82968A1-CF91-4320-B2DD-E0F739CBC7E6][TECH=00000202][OID=0000000000000005-0000000000000004]
ApplicationMgr INFO Application Manager Stopped successfully
EventTagReader DEBUG Finalizing EventTagReader
+EventTagReader DEBUG Calling destructor
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection3_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection3_test.ref
index 6baa30c930eac9c5beed4b87deb701d544cb28e4..f46d7d882928a013c4fb9758e41a38a8c5e74dd5 100755
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection3_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection3_test.ref
@@ -1021,5 +1021,6 @@ EventTagReader DEBUG NAME TEST1_ref TYPE string VALUE TEST1_ref (string) :
EventTagReader DEBUG NAME eventRef TYPE string VALUE eventRef (string) : [DB=1CC9C496-5A51-DA11-92B0-0002B3D87B0F][CNT=POOLContainer(DataHeader)][CLID=D82968A1-CF91-4320-B2DD-E0F739CBC7E6][TECH=00000202][OID=0000000000000005-0000000000000004]
ApplicationMgr INFO Application Manager Stopped successfully
EventTagReader DEBUG Finalizing EventTagReader
+EventTagReader DEBUG Calling destructor
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection_test.ref
index e6a227173e6620bc61125ce23c84716ccdb6ba7f..899cc7f04a0b0f00286766425cd45b4376bca7ed 100755
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadDummyRootCollection_test.ref
@@ -452,5 +452,6 @@ EventTagReader DEBUG NAME TEST1_ref TYPE string VALUE TEST1_ref (string) :
EventTagReader DEBUG NAME eventRef TYPE string VALUE eventRef (string) : [DB=1CC9C496-5A51-DA11-92B0-0002B3D87B0F][CNT=POOLContainer(DataHeader)][CLID=D82968A1-CF91-4320-B2DD-E0F739CBC7E6][TECH=00000202][OID=0000000000000005-0000000000000004]
ApplicationMgr INFO Application Manager Stopped successfully
EventTagReader DEBUG Finalizing EventTagReader
+EventTagReader DEBUG Calling destructor
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadGlobalEventRootCollection_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadGlobalEventRootCollection_test.ref
index 41d204bd71e757045b43b34a841e3dae269fea82..e7e1b80eaaa3fe2753c6cd10d3d3ca9032d5707b 100644
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadGlobalEventRootCollection_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadGlobalEventRootCollection_test.ref
@@ -194,5 +194,6 @@ EventTagReader DEBUG NAME TEST1_ref TYPE string VALUE TEST1_ref (string) :
EventTagReader DEBUG NAME eventRef TYPE string VALUE eventRef (string) : [DB=1CC9C496-5A51-DA11-92B0-0002B3D87B0F][CNT=POOLContainer(DataHeader)][CLID=D82968A1-CF91-4320-B2DD-E0F739CBC7E6][TECH=00000202][OID=0000000000000005-0000000000000004]
ApplicationMgr INFO Application Manager Stopped successfully
EventTagReader DEBUG Finalizing EventTagReader
+EventTagReader DEBUG Calling destructor
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadNoMetaRootCollection_test.ref b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadNoMetaRootCollection_test.ref
index f66d4c4abdc93686f1d989c8edcb2daa86213f1f..23be4d4fb1d7c9afa952aad7ded5856473b25021 100644
--- a/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadNoMetaRootCollection_test.ref
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/test/ReadNoMetaRootCollection_test.ref
@@ -589,5 +589,6 @@ EventTagReader DEBUG NAME TEST1_ref TYPE string VALUE TEST1_ref (string) :
EventTagReader DEBUG NAME eventRef TYPE string VALUE eventRef (string) : [DB=1CC9C496-5A51-DA11-92B0-0002B3D87B0F][CNT=POOLContainer(DataHeader)][CLID=D82968A1-CF91-4320-B2DD-E0F739CBC7E6][TECH=00000202][OID=0000000000000005-0000000000000004]
ApplicationMgr INFO Application Manager Stopped successfully
EventTagReader DEBUG Finalizing EventTagReader
+EventTagReader DEBUG Calling destructor
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully