AtlasTest/ControlTest/share/StoreGateSvcClient_test.txt

-#include "ControlTest/StoreGateTestCommon.txt"

AtlasTest/ControlTest/share/StoreID.ref

@@ -29,6 +29,4 @@ StoreGateSvc        DEBUG trying to create store SGImplSvc/StoreGateSvc_Impl
 StoreGateSvc_Impl   DEBUG Property update for OutputLevel : new value = 1
 StoreGateSvc_Impl VERBOSE Initializing StoreGateSvc_Impl
 StoreGateSvc_Impl   DEBUG Service base class initialized successfully
-StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
 *** StoreID_test OK ***

AtlasTest/ControlTest/test/CircularDep_test.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -44,10 +44,8 @@ int main() {
   }  
 
   assert(pSvcLoc);
-  StoreGateSvc* pSG;
-  
-  const bool CREATEIF(true);
-  assert((pSvcLoc->service("StoreGateSvc", pSG, CREATEIF)).isSuccess());
+
+  SmartIF<StoreGateSvc> pSG(pSvcLoc->service("StoreGateSvc"));
   assert(pSG);
 
   Circular *circ0(new Circular), *circ1(new Circular);

AtlasTest/ControlTest/test/DataProxy_test.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -16,12 +16,11 @@
 #include "AthenaKernel/CLASS_DEF.h"
 #include "SGTools/T2pMap.h"
 #include "SGTools/TransientAddress.h"
+#include "SGTools/DataProxy_cast.h"
 #include <iostream>
 
 #include <cassert>
 
-const bool CREATEIF(true);
-
 struct Bla{
   Bla(): i(0) {}
   Bla(int m): i(m) {}
@@ -85,9 +84,7 @@ int main() {
   assert( (DataProxy_cast<Bla>(&transientProxy))->i == 77 );
 
 
-  IConversionSvc* pIConvSvc(nullptr);
-  StatusCode cs((pSvcLoc->service("EventPersistencySvc", pIConvSvc, CREATEIF)));
-  assert(cs.isSuccess());
+  SmartIF<IConversionSvc> pIConvSvc(pSvcLoc->service("EventPersistencySvc"));
   assert(pIConvSvc);
   // create a transient address with IOA.
   TransientAddress* tGen = new TransientAddress(ClassID_traits<Foo>::ID(),
@@ -114,9 +111,7 @@ int main() {
   fptr->doNothing(); //remove warning
 
 
-  IProxyProviderSvc* pIPPSvc(nullptr);
-  StatusCode psc(pSvcLoc->service("ProxyProviderSvc", pIPPSvc, CREATEIF));
-  assert( psc.isSuccess() );
+  SmartIF<IProxyProviderSvc> pIPPSvc(pSvcLoc->service("ProxyProviderSvc"));
   assert( pIPPSvc );
 
   TransientAddress* tad = new TransientAddress(ClassID_traits<Bla>::ID(), "bla");

AtlasTest/ControlTest/test/ElementLinkVector_test.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TestTools/SGassert.h"
@@ -133,10 +133,8 @@ int main() {
     return 0;
   }  
   assert(pSvcLoc);
-  StoreGateSvc* pSG;
-  
-  const bool CREATEIF(true);
-  assert((pSvcLoc->service("StoreGateSvc", pSG, CREATEIF)).isSuccess());
+
+  SmartIF<StoreGateSvc> pSG(pSvcLoc->service("StoreGateSvc"));
   assert(pSG);
 
   linkVector(*pSG);

AtlasTest/ControlTest/test/ElementLink_test.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TestTools/FLOATassert.h"
@@ -134,9 +134,7 @@ int main(int argc, char** argv) {
     std::cerr << " This test cannot be run without init Gaudi" << endl;
   }
   assert(pSvcLoc);
-  StoreGateSvc* pSG;
-  const bool CREATEIF(true);
-  assert((pSvcLoc->service("StoreGateSvc", pSG, CREATEIF)).isSuccess());
+  SmartIF<StoreGateSvc> pSG(pSvcLoc->service("StoreGateSvc"));
   assert(pSG);
 
   StatusCode sc;

AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file ProxyProviderSvc_test.cxx
@@ -61,13 +61,8 @@ private:
 CLASS_DEF(FooBar, 8109, 0)
 
 template <typename PROXIED>
-class TestProvider : public IAddressProvider {
+class TestProvider : public implements<IAddressProvider> {
 public:
-  virtual unsigned long addRef() override { std::abort(); }
-  virtual unsigned long release() override { std::abort(); }
-  virtual StatusCode queryInterface(const InterfaceID &/*ti*/, void** /*pp*/) override
-  { std::abort(); }
-
   TestProvider(const std::string& key) :
     m_ID(ClassID_traits<PROXIED>::ID()), m_key(key)
   {  }
@@ -180,12 +175,9 @@ int main ATLAS_NOT_THREAD_SAFE () {
   }  
   assert( pSvcLoc );
 
-  StoreGateSvc* pStore(nullptr);
-  static const bool CREATE(true);
-  assert( (pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess() );
+  SmartIF<StoreGateSvc> pStore(pSvcLoc->service("StoreGateSvc"));
   assert( pStore );
-  IProxyProviderSvc* pIPPSvc;
-  assert( (pSvcLoc->service("ProxyProviderSvc", pIPPSvc, CREATE)).isSuccess() );
+  SmartIF<IProxyProviderSvc> pIPPSvc(pSvcLoc->service("ProxyProviderSvc"));
   assert( pIPPSvc );
 
   pIPPSvc->addProvider(new TestProvider<Foo>("aFoo"));

AtlasTest/ControlTest/test/SGDataLink_test.cxx

@@ -217,6 +217,8 @@ namespace Athena_test
     DataLink<Bar> fLink("a Bar");
     assert(fLink.isValid());
     assert(pBar == &*fLink);
+    // cppcheck-suppress memleak; pBar not really leaked
+    pBar = nullptr;
 
     //a link to an element
     IntVector* pvint(new IntVector);
@@ -230,7 +232,6 @@ namespace Athena_test
     assert(liint.index() == 1);
     assert(liint.dataID() == "a vector");
     cout << "*** DataLink_test StoreGate OK ***\n\n" <<endl;
-    // cppcheck-suppress memleak; false positive
   }
 
   void dummyToRemoveWarning(const Foo&) 
@@ -334,7 +335,7 @@ namespace Athena_test
     std::cout << "xxx " << der << " " << link.cptr() << "\n";
     //assert (link.cptr() == der);
     cout << "*** DataLink_test FwdBase OK ***\n\n" <<endl;
-    // cppcheck-suppress memleak; false positive
+    // cppcheck-suppress memleak; der not really leaked
   }
 } //end namespace
 
@@ -349,10 +350,7 @@ int main() {
   errorcheck::ReportMessage::hideErrorLocus();
 
   assert(pSvcLoc);
-  StoreGateSvc* pSG;
-  
-  const bool CREATEIF(true);
-  assert((pSvcLoc->service("StoreGateSvc", pSG, CREATEIF)).isSuccess());
+  SmartIF<StoreGateSvc> pSG(pSvcLoc->service("StoreGateSvc"));
   assert(pSG);
 
   Foo* pFoo = new Foo;

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 770224 2016-08-26 01:59:31Z ssnyder $
-
-#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(nullptr);
-  static const bool CREATE(true);
-  assert((pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess());
-  assert(pStore);
-  
-  assert(pStore->storeID() == StoreID::EVENT_STORE);
-
-  assert((pSvcLoc->service("DetectorStore", pStore)).isSuccess());
-  assert(pStore);
-  assert(pStore->storeID() == StoreID::DETECTOR_STORE);
-  
-  assert((pSvcLoc->service("ConditionStore", pStore, CREATE)).isSuccess());
-  assert(pStore);
-  assert(pStore->storeID() == StoreID::CONDITION_STORE);
-  
-  cout << "*** StoreID_test OK ***" <<endl;
-  return 0;
-}
-#endif /*NOGAUDI*/
-
-
-
-
-
-
-
-
-
-
-
-
-

AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt

-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( AthenaPoolTest )
@@ -15,8 +15,6 @@ atlas_add_component( AthenaPoolTest
                      src/LArCellContFakeReader.cxx
                      src/EventInfoWriter.cxx
                      src/EventInfoReader.cxx
-                     src/PileUpEventInfoWriter.cxx
-                     src/PileUpEventInfoReader.cxx
                      src/TrkTrackFakeReader.cxx
                      src/TrkTrackFakeWriter.cxx
                      src/FakeTrackBuilder.cxx

AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoReadWrite.py

@@ -57,7 +57,14 @@ def eventInfoTestCfg(step=1):
     acc.addEventAlgo(writer,sequenceName = 'AthAlgSeq')
 
     from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-    acc.merge(OutputStreamCfg(flags, StreamName, ItemList=[]))
+    acc.merge(
+        OutputStreamCfg(
+            flags,
+            StreamName,
+            ItemList=[],
+            MetadataItemList=["IOVMetaDataContainer#*"],
+        )
+    )
 
     # Change output file catalog to avoid races.
     acc.getService("PoolSvc").WriteCatalog = 'file:EventInfoTests_catalog.xml'

AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWrite.py

@@ -62,7 +62,14 @@ acc.merge(TagInfoMgrCfg(flags))
 acc.addEventAlgo(CompFactory.EventInfoWriter(),sequenceName = 'AthAlgSeq')
 
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-acc.merge(OutputStreamCfg(flags, StreamName, ItemList=[]))
+acc.merge(
+    OutputStreamCfg(
+        flags,
+        StreamName,
+        ItemList=[],
+        MetadataItemList=["IOVMetaDataContainer#*"],
+    )
+)
 
 # Change output file catalog to avoid races.
 acc.getService("PoolSvc").WriteCatalog = 'file:EventInfoTests_catalog.xml'

AtlasTest/DatabaseTest/AthenaPoolTest/python/InDetRawDataWriter.py

@@ -28,12 +28,21 @@ acc.addEventAlgo( CompFactory.InDetRawDataFakeWriter(OutputLevel = DEBUG),
                   sequenceName = 'AthAlgSeq' )
 
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-acc.merge( OutputStreamCfg(flags, "InDetRDO", disableEventTag = True,
-                           ItemList = ["PixelRDO_Container#*",
-                                       "SCT_RDO_Container#*",
-                                       "TRT_RDO_Container#*",
-                                       "EventInfo#*",
-                                       "PixelRDOElemLinkVec#*"]) )
+acc.merge(
+    OutputStreamCfg(
+        flags,
+        "InDetRDO",
+        disableEventTag=True,
+        ItemList=[
+            "PixelRDO_Container#*",
+            "SCT_RDO_Container#*",
+            "TRT_RDO_Container#*",
+            "EventInfo#*",
+            "PixelRDOElemLinkVec#*",
+        ],
+        MetadataItemList=["IOVMetaDataContainer#*"],
+    )
+)
 
 # Run
 import sys

AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadAfterCopy.ref

@@ -88,7 +88,6 @@ AthenaPoolCnvSvc     INFO Loading POOL XMLAuthenticationService.
 InputMetaDataStore   INFO Initializing InputMetaDataStore - package version StoreGate-02-20-04
 EventSelector        INFO Create PoolCollectionConverter -  CollectionType: ImplicitROOT Connection:  InputCollection: SimplePoolFile2.root
 SimplePoolFile2.root   Always Root file version:51400
-EventSelector        INFO EventSelection with query  'Query':
 EventSelector        INFO ----- EventSelectorAthenaPool Initialized Properly
 StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-20-04
 DetDescrCnvSvc       INFO  initializing 

AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadDoubleSelector.ref

 SecondaryEventS...  DEBUG Initializing secondary event selector SecondaryEventSelector
 SecondaryEventS...  DEBUG reinitialization...
-SecondaryEventS...   INFO EventSelection with query 
 SecondaryEventS...  DEBUG EventSelectorAthenaPool::nextWithSkip
 AthenaPoolTestD...  DEBUG Executing AthenaPoolTestDataReader
 AthenaPoolTestD...  DEBUG Collection of A's

AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.ref

 SecondaryEventS...  DEBUG Initializing secondary event selector SecondaryEventSelector
 SecondaryEventS...  DEBUG reinitialization...
-SecondaryEventS...   INFO EventSelection with query 
 SecondaryEventS...  DEBUG EventSelectorAthenaPool::nextWithSkip
 AthenaPoolTestD...  DEBUG Executing AthenaPoolTestDataWriter
 AthenaPoolTestD...  DEBUG Collection of A's

AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.ref

 SecondaryEventS...  DEBUG Initializing secondary event selector SecondaryEventSelector
 SecondaryEventS...  DEBUG reinitialization...
-SecondaryEventS...   INFO EventSelection with query 
 Stream1.Stream1...   INFO Initializing Stream1.Stream1Tool
 AthenaPoolAddre...  DEBUG Cannot retrieve DataHeader from DetectorStore.
 AthenaPoolAddre...  DEBUG Cannot retrieve DataHeader from DetectorStore.

AtlasTest/DatabaseTest/AthenaPoolTest/share/PileUpEventInfoRead.py

-###############################################################
-#
-# Job options file
-#
-## @file AthenaPoolTestRead.py
-##
-## @brief For Athena POOL test: read back AthenaPoolTest data objects 
-##
-## @author RD Schaffer <R.D.Schaffer@cern.ch>
-#
-#==============================================================
-
-## basic job configuration
-import AthenaCommon.AtlasUnixStandardJob
-
-## get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-## get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-## get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-#--------------------------------------------------------------
-# Load POOL support
-#--------------------------------------------------------------
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-#--------------------------------------------------------------
-# Define the output Db parameters (the default value are shown)
-#--------------------------------------------------------------
-
-svcMgr.EventSelector.InputCollections        = [ "SimplePoolFile.root" ]
-
-#--------------------------------------------------------------
-# Event related parameters
-#--------------------------------------------------------------
-theApp.EvtMax = 5
-#--------------------------------------------------------------
-# Application: AthenaPoolTest options
-#--------------------------------------------------------------
-# Load "user algorithm" top algorithms to be run, and the libraries that house them
-from AthenaPoolTest.AthenaPoolTestConf import PileUpEventInfoReader
-topSequence += PileUpEventInfoReader( "PileUpEventInfoReader" )
-
-#--------------------------------------------------------------
-# Input options
-#--------------------------------------------------------------
-
-#--------------------------------------------------------------
-# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = WARNING
-svcMgr.MessageSvc.debugLimit  = 100000
-PileUpEventInfoReader.OutputLevel = DEBUG
-
-# No stats printout
-include( "AthenaPoolTest/NoStats_jobOptions.py" )
-
-#==============================================================
-#
-# End of job options file
-#
-###############################################################

AtlasTest/DatabaseTest/AthenaPoolTest/share/ReadRDODoubleSelector.ref

 SecondaryEventS...  DEBUG Initializing secondary event selector SecondaryEventSelector
 SecondaryEventS...  DEBUG reinitialization...
-SecondaryEventS...   INFO EventSelection with query 
 RDOReaderDouble...   INFO RDOReaderDoubleSelector::initialize()
 SecondaryEventS...  DEBUG EventSelectorAthenaPool::nextWithSkip
 RDOReaderDouble...  DEBUG RDOReaderDoubleSelector::execute()

AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoWriter.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -21,15 +21,8 @@
 // Constructor with parameters:
 EventInfoWriter::EventInfoWriter(const std::string &name, 
 				 ISvcLocator *pSvcLocator) :
-        AthAlgorithm(name,pSvcLocator),
-        m_createDummyTags(false),
-        m_removeDummyTags(false),
-        m_createDummyOverrideTags(false),
-        m_tagInfoMgr(nullptr)
+        AthAlgorithm(name,pSvcLocator)
 {
-    declareProperty("CreateDummyTags", m_createDummyTags);
-    declareProperty("RemoveDummyTags", m_removeDummyTags);
-    declareProperty("CreateDummyOverrideTags", m_createDummyOverrideTags);
 }
 
 // Initialize method:
@@ -42,12 +35,8 @@ StatusCode EventInfoWriter::initialize()
     ATH_MSG_DEBUG("RemoveDummyTags         " << m_removeDummyTags);
     ATH_MSG_DEBUG("CreateDummyOverrideTags " << m_createDummyOverrideTags);
 
-
     // get TagInfoMgr service
-    if (service("TagInfoMgr", m_tagInfoMgr).isFailure()) {
-	ATH_MSG_FATAL("TagInfoMgr service not found !");
-	return StatusCode::FAILURE;
-    } 
+    ATH_CHECK(m_tagInfoMgr.retrieve());
 
     // Insert a dummy tag into the TagInfoMgr
     if (m_tagInfoMgr->addTag("EventInfoWriterTag", "EIW-00-00-01").isFailure()) {