Keep Tag data store, because some clients depend on it.

Former-commit-id: f86b079e

Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx

@@ -48,6 +48,7 @@ EventSelectorAthenaPool::EventSelectorAthenaPool(const std::string& name, ISvcLo
 	m_beginIter(0),
 	m_endIter(0),
 	m_activeStoreSvc("ActiveStoreSvc", name),
+	m_tagDataStore("StoreGateSvc/TagMetaDataStore", name),
 	m_poolCollectionConverter(0),
 	m_headerIterator(0),
 	m_guid(),
@@ -158,6 +159,11 @@ StatusCode EventSelectorAthenaPool::initialize() {
       ATH_MSG_FATAL("Cannot get " << m_athenaPoolCnvSvc.typeAndName() << ".");
       return(StatusCode::FAILURE);
    }
+   // Get TagMetaDataStore
+   if (!m_tagDataStore.retrieve().isSuccess()) {
+      ATH_MSG_FATAL("Cannot get " << m_tagDataStore.typeAndName() << ".");
+      return(StatusCode::FAILURE);
+   }
    // Get CounterTool (if configured)
    if (!m_counterTool.empty() && !m_counterTool.retrieve().isSuccess()) {
       ATH_MSG_FATAL("Cannot get CounterTool.");
@@ -272,8 +278,8 @@ StatusCode EventSelectorAthenaPool::reinit() {
    if (m_poolCollectionConverter == 0) {
       ATH_MSG_INFO("No Events found in any Input Collections");
       if (m_processMetadata.value()) {
-	m_inputCollectionsIterator = m_inputCollectionsProp.value().end();
-	if (m_inputCollectionsProp.value().size() > 0) m_inputCollectionsIterator--;
+	 m_inputCollectionsIterator = m_inputCollectionsProp.value().end();
+	 if (m_inputCollectionsProp.value().size() > 0) m_inputCollectionsIterator--;
 	//NOTE (wb may 2016): this will make the FirstInputFile incident correspond to last file in the collection ... if want it to be first file then move iterator to begin and then move above two lines below this incident firing
          if (m_collectionType.value() == "ImplicitROOT" && !m_firedIncident && m_inputCollectionsProp.value().size() > 0) {
             FileIncident firstInputFileIncident(name(), "FirstInputFile", *m_inputCollectionsIterator);
@@ -445,9 +451,9 @@ StatusCode EventSelectorAthenaPool::finalize() {
          ATH_MSG_WARNING("Failed to preFinalize() CounterTool");
       }
       for (const auto& tool : m_helperTools) {
-        if (!tool->preFinalize().isSuccess()) {
-          ATH_MSG_WARNING("Failed to preFinalize() " << tool->name());
-        }
+         if (!tool->preFinalize().isSuccess()) {
+            ATH_MSG_WARNING("Failed to preFinalize() " << tool->name());
+         }
       }
    }
    delete m_beginIter; m_beginIter = 0;
@@ -468,6 +474,10 @@ StatusCode EventSelectorAthenaPool::finalize() {
    if (!m_helperTools.release().isSuccess()) {
       ATH_MSG_WARNING("Cannot release " << m_helperTools);
    }
+   // Release TagMetaDataStore
+   if (!m_tagDataStore.release().isSuccess()) {
+      ATH_MSG_WARNING("Cannot release " << m_tagDataStore.typeAndName() << ".");
+   }
    // Release AthenaPoolCnvSvc
    if (!m_athenaPoolCnvSvc.release().isSuccess()) {
       ATH_MSG_WARNING("Cannot release " << m_athenaPoolCnvSvc.typeAndName() << ".");

Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h

@@ -145,6 +145,7 @@ private: // data
    EventContextAthenaPool*      m_endIter;
 
    ServiceHandle<ActiveStoreSvc> m_activeStoreSvc;
+   ServiceHandle<StoreGateSvc> m_tagDataStore;
 
    mutable PoolCollectionConverter* m_poolCollectionConverter;
    mutable pool::ICollectionCursor* m_headerIterator;