Merge branch 'master' into ImproveJetChainParts

AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoRead.ref

 TagInfoMgr          DEBUG initialize()
-TagInfoMgr          DEBUG OverrideEventInfoTags    'OverrideEventInfoTags':True
-TagInfoMgr          DEBUG TagInfoKey               'TagInfoKey':'ProcessingTags'
 TagInfoMgr          DEBUG ExtraTagValuePairs 
-TagInfoMgr          DEBUG  Value/tag pair: AtlasRelease Athena-22.0.21
 TagInfoMgr          DEBUG in queryInterface()
 TagInfoMgr          DEBUG in queryInterface()
 TagInfoMgr          DEBUG in queryInterface()
@@ -18,23 +15,21 @@ TagInfoMgr          DEBUG removeTagFromInput - adding tag name to be removed: /L
 TagInfoMgr          DEBUG addTag - adding name/value pairs: /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
 TagInfoMgr          DEBUG removeTagFromInput - adding tag name to be removed: /LAR/Identifier/OnOffIdMap
 TagInfoMgr          DEBUG removeTagFromInput - adding tag name to be removed: /TagInfo
-TagInfoMgr          DEBUG preLoadAddresses - add transient address for TagInfo to detector store
-TagInfoMgr          DEBUG preLoadAddresses - Found CLID: 61780915 key from ioa ProcessingTags
+TagInfoMgr          DEBUG in queryInterface()
+TagInfoMgr          DEBUG matched ITagInfoMgr
+TagInfoMgr          DEBUG adding IOV callback object to DetStore
+TagInfoMgr          DEBUG Registered IOV callback for TagInfo changes
 TagInfoMgr          DEBUG in queryInterface()
 TagInfoMgr          DEBUG matched ITagInfoMgr
 TagInfoMgr          DEBUG start()
 TagInfoMgr          DEBUG Registered checkTagInfo callback for  /TagInfo 
 TagInfoMgr          DEBUG handle: entering handle(), incidence type BeginInputFile from EventSelector
 TagInfoMgr          DEBUG handle: entering handle(), incidence type BeginRun from AthenaEventLoopMgr
-TagInfoMgr          DEBUG handle: First BeginRun incident - Event ID: [1,1:0] 
+TagInfoMgr          DEBUG handle: BeginRun incident - Event ID: [1,1:0] 
 TagInfoMgr          DEBUG handle: currentRun = 1
 TagInfoMgr          DEBUG Signaled begin run to IOVDbSvc [1,1:0]
-TagInfoMgr          DEBUG Retrieve tag info 
-TagInfoMgr          DEBUG in queryInterface()
-TagInfoMgr          DEBUG in queryInterface()
-TagInfoMgr          DEBUG in queryInterface()
-TagInfoMgr          DEBUG createObj: get TagInfo
-TagInfoMgr          DEBUG createObj: Retrieved TagInfo meta data from detStore. size 1
+TagInfoMgr          DEBUG updateTagInfo: getting /TagInfo
+TagInfoMgr          DEBUG updateTagInfo: Retrieved TagInfo meta data from detStore. size 1
 TagInfoMgr          DEBUG fillTagInfo: 
 TagInfoMgr          DEBUG fillTagInfo: - tags coming from COOL file meta data
 TagInfoMgr          DEBUG fillTagInfo: Did NOT add tag - on remove list: name/tag: /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
@@ -43,8 +38,6 @@ TagInfoMgr          DEBUG fillTagInfo: Did NOT add tag - on remove list: name/ta
 TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
 TagInfoMgr          DEBUG fillTagInfo: Did NOT add tag - on remove list: name/tag: /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
 TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
-TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo AtlasRelease Athena-22.0.21
-TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag AtlasRelease Athena-22.0.21
 TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo IOVDbGlobalTag OFLCOND-SDR-BS7T-04-00
 TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag IOVDbGlobalTag OFLCOND-SDR-BS7T-04-00
 TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo TagA1 A1
@@ -58,20 +51,19 @@ TagInfoMgr          DEBUG TagInfo tag:
 TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
 TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
 TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
-TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: AtlasRelease Athena-22.0.21
 TagInfoMgr          DEBUG fillTagInfo: print out tags
 TagInfoMgr          DEBUG TagInfo tag: 
-TagInfoMgr          DEBUG createObj: Filled TagInfo from file meta data 
+TagInfoMgr          DEBUG updateTagInfo: Filled TagInfo from file meta data 
 TagInfoMgr          DEBUG entering fillMetaData
 TagInfoMgr          DEBUG fillMetaData: Adding value/tag pairs to file meta data: 
 TagInfoMgr          DEBUG /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
 TagInfoMgr          DEBUG /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
 TagInfoMgr          DEBUG /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
-TagInfoMgr          DEBUG AtlasRelease Athena-22.0.21
 TagInfoMgr          DEBUG IOVDbGlobalTag OFLCOND-SDR-BS7T-04-00
 TagInfoMgr          DEBUG TagA1 A1
 TagInfoMgr          DEBUG TagB1 B1
 TagInfoMgr          DEBUG TagD1 D1
+TagInfoMgr          DEBUG IOV minRange from IOVMetaData: {[1,0] - [3,0]}
 TagInfoMgr          DEBUG fillMetaData: run number is in previous IOVRange: 1 {[1,0] - [3,0]}
 TagInfoMgr          DEBUG fillMetaData: start, stop: [1,0] [3,0]
 TagInfoMgr.IOVD...  DEBUG begin registerFolder 
@@ -81,16 +73,14 @@ TagInfoMgr.IOVD...  DEBUG IOVMetaDataContainer  for folder /TagInfo has been reg
 TagInfoMgr.IOVD...  DEBUG begin addPayload 
 TagInfoMgr.IOVD...  DEBUG Retrieved IOVMetaDataContainer from MetaDataStore for folder /TagInfo
 TagInfoMgr.IOVD...  DEBUG Could not add new payload for folder /TagInfo (may be duplicate payload).
-TagInfoMgr          DEBUG createObj: Wrote TagInfo to MetaDataStore 
-TagInfoMgr          DEBUG createObj:  created new TagInfo object 
-TagInfoMgr          DEBUG Retrieved tag info 
+TagInfoMgr          DEBUG updateTagInfo: Wrote TagInfo to MetaDataStore 
 TagInfoMgr          DEBUG handle: TagInfo successfully processed by IOVDbSvc to register callback
-TagInfoMgr          DEBUG checkTagInfo: entering checkTagInfo
-TagInfoMgr          DEBUG checkTagInfo: retrieved TagInfo to save its contents
-TagInfoMgr          DEBUG checkTagInfo: saved TagInfo contents
-TagInfoMgr          DEBUG checkTagInfo: reset TagInfo
-TagInfoMgr          DEBUG createObj: get TagInfo
-TagInfoMgr          DEBUG createObj: Retrieved TagInfo meta data from detStore. size 1
+TagInfoMgr          DEBUG updateAddress
+TagInfoMgr          DEBUG IOV callback
+TagInfoMgr          DEBUG notifyListeners  (1 registered)
+TagInfoMgr          DEBUG checkTagInfo IOV callback
+TagInfoMgr          DEBUG updateTagInfo: getting /TagInfo
+TagInfoMgr          DEBUG updateTagInfo: Retrieved TagInfo meta data from detStore. size 1
 TagInfoMgr          DEBUG fillTagInfo: 
 TagInfoMgr          DEBUG fillTagInfo: - tags coming from COOL file meta data
 TagInfoMgr          DEBUG fillTagInfo: Did NOT add tag - on remove list: name/tag: /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
@@ -99,8 +89,6 @@ TagInfoMgr          DEBUG fillTagInfo: Did NOT add tag - on remove list: name/ta
 TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
 TagInfoMgr          DEBUG fillTagInfo: Did NOT add tag - on remove list: name/tag: /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
 TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
-TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo AtlasRelease Athena-22.0.21
-TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag AtlasRelease Athena-22.0.21
 TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo IOVDbGlobalTag OFLCOND-SDR-BS7T-04-00
 TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag IOVDbGlobalTag OFLCOND-SDR-BS7T-04-00
 TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo TagA1 A1
@@ -114,16 +102,14 @@ TagInfoMgr          DEBUG TagInfo tag:
 TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
 TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
 TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
-TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: AtlasRelease Athena-22.0.21
 TagInfoMgr          DEBUG fillTagInfo: print out tags
 TagInfoMgr          DEBUG TagInfo tag: 
-TagInfoMgr          DEBUG createObj: Filled TagInfo from file meta data 
+TagInfoMgr          DEBUG updateTagInfo: Filled TagInfo from file meta data 
 TagInfoMgr          DEBUG entering fillMetaData
 TagInfoMgr          DEBUG fillMetaData: Adding value/tag pairs to file meta data: 
 TagInfoMgr          DEBUG /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
 TagInfoMgr          DEBUG /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
 TagInfoMgr          DEBUG /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
-TagInfoMgr          DEBUG AtlasRelease Athena-22.0.21
 TagInfoMgr          DEBUG IOVDbGlobalTag OFLCOND-SDR-BS7T-04-00
 TagInfoMgr          DEBUG TagA1 A1
 TagInfoMgr          DEBUG TagB1 B1
@@ -137,19 +123,41 @@ TagInfoMgr.IOVD...  DEBUG IOVMetaDataContainer  for folder /TagInfo has been reg
 TagInfoMgr.IOVD...  DEBUG begin addPayload 
 TagInfoMgr.IOVD...  DEBUG Retrieved IOVMetaDataContainer from MetaDataStore for folder /TagInfo
 TagInfoMgr.IOVD...  DEBUG Could not add new payload for folder /TagInfo (may be duplicate payload).
-TagInfoMgr          DEBUG createObj: Wrote TagInfo to MetaDataStore 
-TagInfoMgr          DEBUG createObj:  created new TagInfo object 
-TagInfoMgr          DEBUG checkTagInfo: retrieved TagInfo
+TagInfoMgr          DEBUG updateTagInfo: Wrote TagInfo to MetaDataStore 
 TagInfoMgr          DEBUG handle: entering handle(), incidence type BeginRun from AthenaEventLoopMgr
-TagInfoMgr          DEBUG handle: secondary BeginRun incident - Event ID: [2,1:85] 
+TagInfoMgr          DEBUG handle: BeginRun incident - Event ID: [2,1:85] 
 TagInfoMgr          DEBUG handle: currentRun = 2
-TagInfoMgr          DEBUG handle - BeginRun: Retrieved TagInfo meta data from detStore
+TagInfoMgr          DEBUG updateTagInfo: getting /TagInfo
+TagInfoMgr          DEBUG updateTagInfo: Retrieved TagInfo meta data from detStore. size 1
+TagInfoMgr          DEBUG fillTagInfo: 
+TagInfoMgr          DEBUG fillTagInfo: - tags coming from COOL file meta data
+TagInfoMgr          DEBUG fillTagInfo: Did NOT add tag - on remove list: name/tag: /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
+TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
+TagInfoMgr          DEBUG fillTagInfo: Did NOT add tag - on remove list: name/tag: /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
+TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
+TagInfoMgr          DEBUG fillTagInfo: Did NOT add tag - on remove list: name/tag: /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
+TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
+TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo IOVDbGlobalTag OFLCOND-SDR-BS7T-04-00
+TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag IOVDbGlobalTag OFLCOND-SDR-BS7T-04-00
+TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo TagA1 A1
+TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag TagA1 A1
+TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo TagB1 B1
+TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag TagB1 B1
+TagInfoMgr          DEBUG fillTagInfo: Added name/tag to TagInfo TagD1 D1
+TagInfoMgr          DEBUG fillTagInfo: Added value/tag to TagInfo as input tag TagD1 D1
+TagInfoMgr          DEBUG fillTagInfo: print out tags before adding extra tags
+TagInfoMgr          DEBUG TagInfo tag: 
+TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
+TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
+TagInfoMgr          DEBUG fillTagInfo: Adding extra value/tag pair: /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
+TagInfoMgr          DEBUG fillTagInfo: print out tags
+TagInfoMgr          DEBUG TagInfo tag: 
+TagInfoMgr          DEBUG updateTagInfo: Filled TagInfo from file meta data 
 TagInfoMgr          DEBUG entering fillMetaData
 TagInfoMgr          DEBUG fillMetaData: Adding value/tag pairs to file meta data: 
 TagInfoMgr          DEBUG /LAR/Identifier/CalibIdMap LARIdentifierCalibIdMap-012
 TagInfoMgr          DEBUG /LAR/Identifier/FebRodMap LARIdentifierFebRodMap-005
 TagInfoMgr          DEBUG /LAR/Identifier/OnOffIdMap LARIdentifierOnOffIdMap-012
-TagInfoMgr          DEBUG AtlasRelease Athena-22.0.21
 TagInfoMgr          DEBUG IOVDbGlobalTag OFLCOND-SDR-BS7T-04-00
 TagInfoMgr          DEBUG TagA1 A1
 TagInfoMgr          DEBUG TagB1 B1
@@ -163,5 +171,5 @@ TagInfoMgr.IOVD...  DEBUG IOVMetaDataContainer  for folder /TagInfo has been reg
 TagInfoMgr.IOVD...  DEBUG begin addPayload 
 TagInfoMgr.IOVD...  DEBUG Retrieved IOVMetaDataContainer from MetaDataStore for folder /TagInfo
 TagInfoMgr.IOVD...  DEBUG Could not add new payload for folder /TagInfo (may be duplicate payload).
-TagInfoMgr          DEBUG handle - BeginRun: Wrote TagInfo to MetaDataStore 
+TagInfoMgr          DEBUG updateTagInfo: Wrote TagInfo to MetaDataStore 
 TagInfoMgr          DEBUG finalize()

AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoReader.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -9,9 +9,6 @@
  * geometry and conditions tags in EventInfo, checks tags on reading
  *
  * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: EventInfoReader.cxx,v 1.10 2007-04-07 17:48:49 schaffer Exp $
- *
  */
 
 #include "EventInfoReader.h"
@@ -20,16 +17,13 @@
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventID.h"
 #include "EventInfo/EventType.h"
-#include "EventInfo/TagInfo.h"
-
-// GeoModel
-#include "GeoModelInterfaces/IGeoModelSvc.h"
 
 // Constructor with parameters:
 EventInfoReader::EventInfoReader(const std::string &name, 
 				 ISvcLocator *pSvcLocator) :
     AthAlgorithm(name,pSvcLocator),
-    m_geoModel("GeoModelSvc", name)
+    m_geoModel("GeoModelSvc", name),
+    m_tagInfoMgr("TagInfoMgr", name)
 {}
 
 // Initialize method:
@@ -37,6 +31,7 @@ StatusCode EventInfoReader::initialize()
 {
     ATH_MSG_INFO( "EventInfoReader::initialize()"  );
     ATH_CHECK( m_geoModel.retrieve() );
+    ATH_CHECK( m_tagInfoMgr.retrieve() );
     return StatusCode::SUCCESS;
 }
 
@@ -66,29 +61,13 @@ StatusCode EventInfoReader::execute()
 	ATH_MSG_DEBUG( name << " : " << tag );
     }
 
-
-
-    // Get TagInfo and add tags
-
-    TagInfo tagInfo_local;
-    const TagInfo* tagInfo = 0;
-    // Try to get tagInfo if there, otherwise create
-    if (detStore()->retrieve( tagInfo ).isFailure()) {
-	ATH_MSG_DEBUG("No TagInfo in DetectorStore - creating one" );
-	tagInfo = &tagInfo_local;
-    } 
-    else {
-	ATH_MSG_DEBUG("Retrieved TagInfo" );
-    } 
-
-    // Dump out contents of TagInfo
-    ATH_MSG_DEBUG("Tags from  TagInfo:" );
-    tagInfo->printTags(msg());
+    // Dump out Tags
+    ATH_MSG_DEBUG("Tags from TagInfoMgr:");
+    ATH_MSG_DEBUG( m_tagInfoMgr->dumpTagInfoToStr() );
     
     // Print out current Release version 
-    std::string releaseVersion;
-    tagInfo->findTag("AtlasRelease", releaseVersion);
-    ATH_MSG_DEBUG( "Found Release version from TagInfo: "  << releaseVersion  );
+    std::string releaseVersion = m_tagInfoMgr->findTag("AtlasRelease");
+    ATH_MSG_DEBUG("Found Release version from TagInfoMgr: " << releaseVersion);
 
     return StatusCode::SUCCESS;
 }

AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoReader.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SRC_EVENTINFOREADER_H
@@ -12,9 +12,6 @@
  * geometry and conditions tags in EventInfo, checks tags on reading
  *
  * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: EventInfoReader.h,v 1.3 2005-03-16 14:54:02 schaffer Exp $
- *
  */
 
 /**
@@ -26,10 +23,13 @@
  */
 
 #include "GaudiKernel/ServiceHandle.h"
-
 #include "AthenaBaseComps/AthAlgorithm.h"
+
+#include "EventInfoMgt/ITagInfoMgr.h"
+// GeoModel
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 
+
 class EventInfoReader : public AthAlgorithm {
 public:
 
@@ -65,6 +65,8 @@ private:
 private:
     /// Access to GeoModelSvc for tags
     ServiceHandle<IGeoModelSvc> m_geoModel;
+    /// Access to TagInfoMgr for tags
+    ServiceHandle<ITagInfoMgr> m_tagInfoMgr;
 };
 
 

AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoWriter.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -9,9 +9,6 @@
  * geometry and conditions tags in EventInfo, writes extra tags.
  *
  * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: EventInfoWriter.cxx,v 1.9 2009-04-29 07:49:45 schaffer Exp $
- *
  */
 
 //<<<<<< INCLUDES                                                       >>>>>>
@@ -22,7 +19,6 @@
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventID.h"
 #include "EventInfo/EventType.h"
-#include "EventInfo/TagInfo.h"
 #include "EventInfoMgt/ITagInfoMgr.h"
 
 // Constructor with parameters:
@@ -116,54 +112,16 @@ StatusCode EventInfoWriter::execute()
         if (m_tagInfoMgr->addTag("TagD1", "D2").isFailure()) {
             ATH_MSG_WARNING("TagD1 NOT added");
 	} 
-
-ATH_MSG_DEBUG("execute: reset TagInfo proxy");
-
-        SG::DataProxy* tagInfoProxy = 
-            detStore()->proxy( ClassID_traits<TagInfo>::ID() );
-
-        if (0 == tagInfoProxy) {
-            ATH_MSG_ERROR("execute: Unable to retrieve TagInfo object with clid/key: " 
-                            << ClassID_traits<TagInfo>::ID());
-            return StatusCode::FAILURE;
-        }
-        // reset and retrieve
-        tagInfoProxy->reset();
-        const TagInfo* tagInfo = 0;
-        if (detStore()->retrieve( tagInfo ).isFailure() ) {
-            ATH_MSG_ERROR("execute: Could not retrieve TagInfo object from the detector store");      
-            return StatusCode::FAILURE;
-        }
-        else {
-            ATH_MSG_DEBUG("execute: retrieved TagInfo");
-        }
-
     }
 
-
-    // Get TagInfo and add tags
-
-    TagInfo tagInfo_local;
-    const TagInfo* tagInfo = 0;
-    // Try to get tagInfo if there, otherwise create
-    if (detStore()->retrieve( tagInfo ).isFailure()) {
-	ATH_MSG_DEBUG("No TagInfo in DetectorStore - creating one");
-	tagInfo = &tagInfo_local;
-    } 
-    else {
-	ATH_MSG_DEBUG("Retrieved TagInfo");
-    } 
-
-    // Dump out contents of TagInfo
-    ATH_MSG_DEBUG("Tags from  TagInfo:");
+    // Dump out Tags
+    ATH_MSG_DEBUG("Tags from TagInfoMgr:");
     MsgStream log(msgSvc(), name());
-    tagInfo->printTags(log);
+    m_tagInfoMgr->printTags(log);
     
     // Print out current Release version 
-    std::string releaseVersion;
-    tagInfo->findTag("AtlasRelease", releaseVersion);
-    ATH_MSG_DEBUG("Found Release version from TagInfo: " 
-	<< releaseVersion);
+    std::string releaseVersion = m_tagInfoMgr->findTag("AtlasRelease");
+    ATH_MSG_DEBUG("Found Release version from TagInfoMgr: " << releaseVersion);
 
     return StatusCode::SUCCESS;
 }
@@ -214,16 +172,4 @@ EventInfoWriter::fillTagInfo    () const
     }
         
     return StatusCode::SUCCESS;
-
 }
-
-
-
-StatusCode
-EventInfoWriter::checkTagInfo(IOVSVC_CALLBACK_ARGS)
-{
-    // Get the messaging service, print where you are
-    ATH_MSG_DEBUG("EventInfoWriter::checkTagInfo - called by IOVSvc");
-    return (fillTagInfo());
-}
-

AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoWriter.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SRC_EVENTINFOWRITER_H
@@ -12,9 +12,6 @@
  * geometry and conditions tags in EventInfo, writes extra tags.
  *
  * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: EventInfoWriter.h,v 1.6 2009-04-29 07:49:45 schaffer Exp $
- *
  */
 
 /**
@@ -28,7 +25,6 @@
 
 //<<<<<< INCLUDES                                                       >>>>>>
 
-#include "AthenaKernel/IOVSvcDefs.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 
 //<<<<<< PUBLIC TYPES                                                   >>>>>>
@@ -53,9 +49,6 @@ public:
     /// Algorithm finalize at end of job
     virtual StatusCode finalize();
   
-    /// Callback method for TagInfo access
-    StatusCode         checkTagInfo(IOVSVC_CALLBACK_ARGS);
-
     ///////////////////////////////////////////////////////////////////
     // Private methods:
     ///////////////////////////////////////////////////////////////////

AtlasTest/TestTools/share/post.sh

@@ -265,6 +265,12 @@ PP="$PP"'|MetaInputLoader *INFO ( address|.*is still valid for|.*and sid)'
 # Message useless for judging test success
 PP="$PP"'|^FileMgr +DEBUG Successfully registered handler for tech'
 
+# TagInfoMgr not longer a ConversionSvc
+# this line is gone
+PP="$PP"'|Added successfully Conversion service:TagInfoMgr'
+# this line moved around
+PP="$PP"'|Added successfully Conversion service:AthenaPoolCnvSvc'
+
 ########################################### END #####################################################
 
 # Always use default ignore list
@@ -305,6 +311,7 @@ else
            fi
        fi
 
+       echo "Reference log taken from: $reflog" 
        if [ -r $reflog ]; then
            jobdiff=${joblog}-todiff
            refdiff=`basename ${reflog}`-todiff

Calorimeter/CaloCnv/CaloAthenaPool/CMakeLists.txt

@@ -15,6 +15,7 @@ atlas_add_poolcnv_library( CaloAthenaPoolPoolCnv
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
+atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 
 # Find the helper code for the T/P tests:
 find_package( AthenaPoolUtilitiesTest )
@@ -23,16 +24,16 @@ find_package( AthenaPoolUtilitiesTest )
 if( ATHENAPOOLUTILITIESTEST_FOUND )
   set( CALOATHENAPOOL_REFERENCE_TAG
        CaloAthenaPoolReference-01-00-00 )
-  run_tpcnv_legacy_test( CaloTPCnv_14.5.0   AOD-14.5.0-full
+  run_tpcnv_test( CaloTPCnv_14.5.0   AOD-14.5.0-full
                    REFERENCE_TAG ${CALOATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( CaloTPCnv_15.1.0   AOD-15.1.0-full
+  run_tpcnv_test( CaloTPCnv_15.1.0   AOD-15.1.0-full
                    REFERENCE_TAG ${CALOATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( CaloTPCnv_15.5.0   AOD-15.5.0-full
+  run_tpcnv_test( CaloTPCnv_15.5.0   AOD-15.5.0-full
                    REFERENCE_TAG ${CALOATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( CaloTPCnv_18.0.0   ESD-18.0.0
+  run_tpcnv_test( CaloTPCnv_18.0.0   ESD-18.0.0
                    REFERENCE_TAG ${CALOATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( CaloTPCnv_20.1.7.2 ESD-20.1.7.2
+  run_tpcnv_test( CaloTPCnv_20.1.7.2 ESD-20.1.7.2
                    REFERENCE_TAG ${CALOATHENAPOOL_REFERENCE_TAG} )
 else()
    message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
-endif()   
+endif()

Calorimeter/CaloCnv/CaloAthenaPool/src/CaloTopoTowerContainerCnv.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloTopoTowerContainerCnv.h"
@@ -10,6 +10,7 @@
 // Gaudi
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/IToolSvc.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 
 // Athena
 #include "CaloUtils/CaloTopoTowerBuilderToolBase.h"
@@ -70,6 +71,7 @@ CaloTopoTowerContainer* CaloTopoTowerContainerCnv::createTransient() {
     Cont->init();
 
     // rebuild the CaloTopoTowers in the container.
+    const EventContext& ctx = Gaudi::Hive::currentContext();
 
     m_TopoTowerBldr= getTool("CaloTopoTowerBuilderTool","TopoTowerTwrBldr");
     if(!m_TopoTowerBldr){
@@ -77,7 +79,7 @@ CaloTopoTowerContainer* CaloTopoTowerContainerCnv::createTransient() {
       return 0;
     }
     if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << "creating CaloTopoTowerContainerCnv::PoolToDataObject" << endmsg; 
-    StatusCode scfcal = m_TopoTowerBldr->execute(Cont);
+    StatusCode scfcal = m_TopoTowerBldr->execute(ctx, Cont);
     if (log.level() <= MSG::DEBUG) log<<MSG::DEBUG<<" TopoTowers rebuild m_TopoTowerBldr->execute(Cont); Successful "<<endmsg; 
     if (scfcal.isFailure()) {
       log<<MSG::ERROR<<" TopoTowers rebuild failed "<<endmsg; 

Calorimeter/CaloCnv/CaloAthenaPool/src/CaloTowerContainerCnv.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "CaloTowerContainerCnv.h"
@@ -10,6 +10,7 @@
 // Gaudi
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/IToolSvc.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 
 // Athena
 #include "CaloUtils/CaloTowerBuilderToolBase.h"
@@ -48,6 +49,7 @@ CaloTowerContainerCnv::~CaloTowerContainerCnv()
 
 //StatusCode CaloTowerContainerCnv::PoolToDataObject(DataObject*& pObj,const std::string &token)
 CaloTowerContainer* CaloTowerContainerCnv::createTransient() {
+    const EventContext& ctx = Gaudi::Hive::currentContext();
     MsgStream log(msgSvc(), "CaloTowerContainerCnv::createTransient" );
     CaloTowerContainer* Cont = 0;
 
@@ -106,7 +108,7 @@ CaloTowerContainer* CaloTowerContainerCnv::createTransient() {
 	    }
 	  }
          if (log.level() <= MSG::DEBUG)  log<<MSG::DEBUG<<" Towers rebuild for FCAL "<<endmsg; 
-	  StatusCode scfcal = m_fcalTowerBldr->execute(Cont); 
+          StatusCode scfcal = m_fcalTowerBldr->execute(ctx, Cont); 
 	  if (scfcal.isFailure()) {
 	    log<<MSG::ERROR<<" Towers rebuild for FCAL failed "<<endmsg; 
 	  }
@@ -122,7 +124,7 @@ CaloTowerContainer* CaloTowerContainerCnv::createTransient() {
 	    }
 	  }
           if (log.level() <= MSG::DEBUG) log<<MSG::DEBUG<<" Towers rebuild for Tile "<<endmsg; 
-	  StatusCode sctile=m_tileTowerBldr->execute(Cont); 
+	  StatusCode sctile=m_tileTowerBldr->execute(ctx, Cont); 
 	  if (sctile.isFailure()) {
 	    log<<MSG::ERROR<<" Towers rebuild for Tile failed "<<endmsg; 
 	  }
@@ -142,7 +144,7 @@ CaloTowerContainer* CaloTowerContainerCnv::createTransient() {
 	  }
           if (log.level() <= MSG::DEBUG) log<<MSG::DEBUG<<" Towers rebuild for EM and/or HEC "<<endmsg; 
 	  m_emHecTowerBldr->setCalos(EmHec); 
-	  StatusCode scemHec=m_emHecTowerBldr->execute(Cont); 
+	  StatusCode scemHec=m_emHecTowerBldr->execute(ctx, Cont);
 	  if (scemHec.isFailure()) {
 	    log<<MSG::ERROR<<" Towers rebuild for EM and/or HEC failed "<<endmsg; 
 	  }

Calorimeter/CaloCnv/CaloAthenaPool/test/CaloTPCnv_14.5.0_test.py

+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+    infile = 'aod/AOD-14.5.0/AOD-14.5.0-full.pool.root'
+
+    keys = [
+        #CaloCellLinkContainer_p2
+        'MuonClusterCollection_Link',
+        'egClusterCollection_Link',
+
+        #CaloClusterContainer_p4
+        'HLT@10',
+        'LArClusterEMFrwd@10',
+        'MuonClusterCollection@10',
+        'Tau1P3PCellCluster@10',
+        'Tau1P3PCellEM012ClusterContainer@10',
+        'Tau1P3PPi0ClusterContainer@10',
+        'LArClusterEMSofte@10',
+        'egClusterCollection@10',
+        'HLT_TrigCaloClusterMaker@10',
+        'EMTopoCluster430@10',
+        'CaloCalTopoCluster@10',
+
+        #CaloTowerContainer_p1
+        'HLT_TrigCaloTowerMaker',
+
+        #CaloCompactCellContainer
+        #'AODCellContainer',
+    ]
+
+    TPCnvTest(infile, keys, useGeoModelSvc=True)

Calorimeter/CaloCnv/CaloAthenaPool/test/CaloTPCnv_15.1.0_test.py

+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+    infile = 'aod/AOD-15.1.0/AOD-15.1.0-full.pool.root'
+
+    keys = [
+        #CaloCellLinkContainer_p2
+        'MuonClusterCollection_Link',
+        'egClusterCollection_Link',
+
+        #CaloClusterContainer_p5
+        'HLT@10',
+        'Tau1P3PCellEM012ClusterContainer@10',
+        'Tau1P3PCellCluster@10',
+        'Tau1P3PPi0ClusterContainer@10',
+        'LArClusterEMFrwd@10',
+        'MuonClusterCollection@10',
+        'egClusterCollection@10',
+        'LArClusterEMSofte@10',
+        'EMTopoCluster430@10',
+        'HLT_TrigCaloClusterMaker@10',
+        'CaloCalTopoCluster@10',
+
+        #CaloShowerContainer_p2
+        'HLT',
+
+        #CaloCompactCellContainer
+        #'AODCellContainer',
+    ]
+
+    TPCnvTest(infile, keys, useGeoModelSvc=True)

Calorimeter/CaloCnv/CaloAthenaPool/test/CaloTPCnv_15.5.0_test.py

+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+    infile = 'aod/AOD-15.5.0/AOD-15.5.0-full.pool.root'
+
+    keys = [
+        #CaloCellLinkContainer_p2
+        'MuonClusterCollection_Link',
+        'egClusterCollection_Link',
+
+        #CaloClusterContainer_p6
+        'HLT@10',
+        'HLT_TrigCaloClusterMaker@10',
+        'Tau1P3PCellEM012ClusterContainer@10',
+        'Tau1P3PCellCluster@10',
+        'MuonClusterCollection@10',
+        'LArClusterEMFrwd@10',
+        'Tau1P3PPi0ClusterContainer@10',
+        'LArClusterEMSofte@10',
+        'HLT_TrigCaloClusterMaker_slw@10',
+        'egClusterCollection@10',
+        'EMTopoCluster430@10',
+        'HLT_TrigCaloClusterMaker_topo@10',
+        'CaloCalTopoCluster@10',
+
+        #CaloShowerContainer_p2
+        'HLT',
+
+        #CaloCompactCellContainer
+        'AODCellContainer',
+    ]
+
+    TPCnvTest(infile, keys, useGeoModelSvc=True, doLAr=True, doTile=True)

Calorimeter/CaloCnv/CaloAthenaPool/test/CaloTPCnv_18.0.0_test.py

+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+    infile = 'esd/ESD-18.0.0.pool.root'
+
+    keys = [
+        #CaloCellLinkContainer_p2
+        'LArClusterEMFrwd_Link',
+        'LArClusterEM_Link',
+        'egClusterCollection_Link',
+        'EMTopoSW35_Link',
+        'MuonClusterCollection_Link',
+        'LArClusterEM7_11Nocorr_Link',
+        'LArClusterEMSofte_Link',
+        'Tau1P3PCellEM012ClusterContainer_Link',
+        'Tau1P3PCellCluster_Link',
+        'TauPi0BonnClusterContainer_Link',
+        'HLT_TrigCaloClusterMaker_topo_Link',
+        'CaloCalTopoCluster_Link',
+
+        #CaloClusterContainer_p7
+        'HLT@10',
+        'LArClusterEMFrwd@10',
+        'MuonClusterCollection@10',
+        'Tau1P3PCellEM012ClusterContainer@10',
+        'Tau1P3PCellCluster@10',
+        'HLT_TrigT2Calo@10',
+        'HLT_TrigCaloClusterMaker_slw@10',
+        'LArClusterEMSofte@10',
+        'LArClusterEM7_11Nocorr@10',
+        'LArClusterEM@10',
+        'egClusterCollection@10',
+        'TauPi0BonnClusterContainer@10',
+        'EMTopoSW35@10',
+        'HLT_TrigCaloClusterMaker_topo@10',
+        'HLT_TrigCaloClusterMaker@10',
+        'CaloCalTopoCluster@10',
+
+        #CaloShowerContainer_p2
+        'HLT@10',
+        'MuonClusterCollection_Data@10',
+        'LArClusterEM_Data@10',
+        'LArClusterEM7_11Nocorr_Data@10',
+        'egClusterCollection_Data@10',
+        'Tau1P3PCellEM012ClusterContainer_Data@10',
+        'LArClusterEMSofte_Data@10',
+        'EMTopoSW35_Data@10',
+        'Tau1P3PCellCluster_Data@10',
+        'TauPi0BonnClusterContainer_Data@10',
+        'CaloCalTopoCluster_Data@10',
+
+        #CaloTopoTowerContainer_p1
+        'TopoTower',
+
+        #CaloTowerContainer_p1
+        'CombinedTower',
+    ]
+
+    TPCnvTest(infile, keys, useGeoModelSvc=True, doLAr=True, doTile=True)

Calorimeter/CaloCnv/CaloAthenaPool/test/CaloTPCnv_20.1.7.2_test.py

+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+    infile = 'esd/ESD-20.1.7.2.pool.root'
+
+    keys = [
+        #CaloClusterCellLinkContainer
+        'InDetTrackParticlesAssociatedClusters_links@10',
+        'MuonClusterCollection_links@10',
+        'LArClusterEM_links@10',
+        'egammaClusters_links@10',
+        'LArClusterEM7_11Nocorr_links@10',
+        'CaloCalTopoClusters_links@10',
+    ]
+
+    TPCnvTest(infile, keys, useGeoModelSvc=True, doLAr=True, doTile=True)