Re-introduce current StoreGate name check in EvtIdModifierSvc

Control/AthenaServices/src/EvtIdModifierSvc.cxx

@@ -260,22 +260,21 @@ EvtIdModifierSvc::run_number_list() const
 void
 EvtIdModifierSvc::modify_evtid(EventID*& evt_id, bool consume_stream)
 {
-  // REVIEW Is this really necessary?
-  // // only when consuming stream is required do we check for a matching
-  // // active-store name (ie: typically the case of being called from a T/P cnv)
-  // if (consume_stream) {
-  //   StoreGateSvc *active = m_activeStore->activeStore();
-  //   if (!active) {
-  //     ATH_MSG_INFO("could not retrieve the active evtstore - bailing out");
-  //     return;
-  //   }
-
-  //   const std::string& evtStoreName = active->name();
-  //   ATH_MSG_DEBUG("active store: [" << evtStoreName << "]");
-  //   if (evtStoreName != m_evtStoreName) {
-  //     return;
-  //   }
-  // }
+  // only when consuming stream is required do we check for a matching
+  // current StoreGate name (ie: typically the case of being called from a T/P cnv)
+  if (consume_stream) {
+    StoreGateSvc *active = StoreGateSvc::currentStoreGate();
+    if (!active) {
+      ATH_MSG_INFO("could not retrieve the active evtstore - bailing out");
+      return;
+    }
+
+    const std::string& evtStoreName = active->name();
+    ATH_MSG_DEBUG("active store: [" << evtStoreName << "]");
+    if (evtStoreName != m_evtStoreName) {
+      return;
+    }
+  }
 
   ATH_MSG_DEBUG
     ( "evtid before massaging: "