.vscode/c_cpp_properties.json

@@ -10,8 +10,11 @@
             "cStandard": "c11",
             "cppStandard": "c++20",
             "intelliSenseMode": "gcc-x64",
-            "compileCommands": "${workspaceFolder}/../build/compile_commands.json"
+            "compileCommands": [
+                "${workspaceFolder}/../build/compile_commands.json"
+            ],
+            "configurationProvider": "ms-vscode.cmake-tools"
         }
     ],
     "version": 4
-}
+}
\ No newline at end of file

AsgExternal/Asg_Test/CMakeLists.txt

@@ -14,9 +14,9 @@ string( STRIP "${ASG_TEST_FILE_DATA}" ASG_TEST_FILE_DATA )
 file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileMC.txt
    ASG_TEST_FILE_MC )
 string( STRIP "${ASG_TEST_FILE_MC}" ASG_TEST_FILE_MC )
-file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileMCAFII.txt
-   ASG_TEST_FILE_MC_AFII )
-string( STRIP "${ASG_TEST_FILE_MC_AFII}" ASG_TEST_FILE_MC_AFII )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileMCFastSim.txt
+   ASG_TEST_FILE_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_MC_FASTSIM}" ASG_TEST_FILE_MC_FASTSIM )
 
 file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteData.txt
    ASG_TEST_FILE_LITE_DATA )
@@ -24,18 +24,29 @@ string( STRIP "${ASG_TEST_FILE_LITE_DATA}" ASG_TEST_FILE_LITE_DATA )
 file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMC.txt
    ASG_TEST_FILE_LITE_MC )
 string( STRIP "${ASG_TEST_FILE_LITE_MC}" ASG_TEST_FILE_LITE_MC )
-file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMCAFII.txt
-   ASG_TEST_FILE_LITE_MC_AFII )
-string( STRIP "${ASG_TEST_FILE_LITE_MC_AFII}" ASG_TEST_FILE_LITE_MC_AFII )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMCFastSim.txt
+   ASG_TEST_FILE_LITE_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_LITE_MC_FASTSIM}" ASG_TEST_FILE_LITE_MC_FASTSIM )
 
-# currently we only have full sim
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3Data.txt
+   ASG_TEST_FILE_RUN3_DATA )
+string( STRIP "${ASG_TEST_FILE_RUN3_DATA}" ASG_TEST_FILE_RUN3_DATA )
 file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3MC.txt
    ASG_TEST_FILE_RUN3_MC )
 string( STRIP "${ASG_TEST_FILE_RUN3_MC}" ASG_TEST_FILE_RUN3_MC )
+ file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3MCFastSim.txt
+   ASG_TEST_FILE_RUN3_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_RUN3_MC_FASTSIM}" ASG_TEST_FILE_RUN3_MC_FASTSIM )
 
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3Data.txt
+   ASG_TEST_FILE_LITE_RUN3_DATA )
+string( STRIP "${ASG_TEST_FILE_LITE_RUN3_DATA}" ASG_TEST_FILE_LITE_RUN3_DATA )
 file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3MC.txt
    ASG_TEST_FILE_LITE_RUN3_MC )
 string( STRIP "${ASG_TEST_FILE_LITE_RUN3_MC}" ASG_TEST_FILE_LITE_RUN3_MC )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3MCFastSim.txt
+   ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM}" ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM )
 
 set( ROOTCORE_TEST_FILE ${ASG_TEST_FILE_MC} )
 

AsgExternal/Asg_Test/cmake/Asg_TestEnvironmentConfig.cmake.in

@@ -8,11 +8,16 @@ set( ASG_TESTENVIRONMENT_ENVIRONMENT
    FORCESET ROOTCORE_RELEASE_SERIES @ROOTCORE_RELEASE_SERIES@
    FORCESET ASG_TEST_FILE_DATA         @ASG_TEST_FILE_DATA@
    FORCESET ASG_TEST_FILE_MC           @ASG_TEST_FILE_MC@
-   FORCESET ASG_TEST_FILE_MC_AFII      @ASG_TEST_FILE_MC_AFII@
+   FORCESET ASG_TEST_FILE_MC_FASTSIM   @ASG_TEST_FILE_MC_FASTSIM@
    FORCESET ASG_TEST_FILE_LITE_DATA    @ASG_TEST_FILE_LITE_DATA@
    FORCESET ASG_TEST_FILE_LITE_MC      @ASG_TEST_FILE_LITE_MC@
-   FORCESET ASG_TEST_FILE_LITE_MC_AFII @ASG_TEST_FILE_LITE_MC_AFII@
+   FORCESET ASG_TEST_FILE_LITE_MC_FASTSIM @ASG_TEST_FILE_LITE_MC_FASTSIM@
+   FORCESET ASG_TEST_FILE_RUN3_DATA    @ASG_TEST_FILE_RUN3_DATA@
    FORCESET ASG_TEST_FILE_RUN3_MC      @ASG_TEST_FILE_RUN3_MC@
+   FORCESET ASG_TEST_FILE_RUN3_MC_FASTSIM   @ASG_TEST_FILE_RUN3_MC_FASTSIM@
+   FORCESET ASG_TEST_FILE_LITE_RUN3_DATA    @ASG_TEST_FILE_LITE_RUN3_DATA@
+   FORCESET ASG_TEST_FILE_LITE_RUN3_MC      @ASG_TEST_FILE_LITE_RUN3_MC@
+   FORCESET ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM  @ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM@
    FORCESET ROOTCORE_TEST_FILE @ROOTCORE_TEST_FILE@
    FORCESET ROOTCORE_TEST_DATA @ROOTCORE_TEST_DATA@ )
 

AsgExternal/Asg_Test/cmt/TestFileLiteR3Data.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6482/data23_13p6TeV.00456749.physics_Main.deriv.DAOD_PHYSLITE.r15774_p6304_p6482/DAOD_PHYSLITE.41588921._000002.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteR3MCFastSim.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6491/mc23_13p6TeV.522036.aMCPy8EG_NNPDF30NLO_A14N23LO_ttZqq_run3.deriv.DAOD_PHYSLITE.e8558_e8528_a911_s4114_r15224_r15225_p6491/DAOD_PHYSLITE.41633196._000004.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileR3Data.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6482/data23_13p6TeV.00456749.physics_Main.deriv.DAOD_PHYS.r15774_p6304_p6482/DAOD_PHYS.41588921._000003.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileR3MCFastSim.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6491/mc23_13p6TeV.522036.aMCPy8EG_NNPDF30NLO_A14N23LO_ttZqq_run3.deriv.DAOD_PHYS.e8558_e8528_a911_s4114_r15224_r15225_p6491/DAOD_PHYS.41633196._000006.pool.root.1

AtlasTest/CITest/AnalysisBase.cmake

-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 #
 # CI test definitions for the AnalysisBase project
 # --> README.md before you modify this file
 #
+#################################################################################
+# CP Algorithms
+#################################################################################
+atlas_add_citest( CPAlgorithmsRun2Data_PHYS_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --run 2 --no-systematics --direct-driver )
+atlas_add_citest( CPAlgorithmsRun2Data_PHYS_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --run 2 --no-systematics --text-config AnalysisAlgorithmsConfig/test_configuration_Run2.yaml )
+atlas_add_citest( CPAlgorithmsRun2Data_PHYS_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun2Data_PHYS_Block/submitDir/data-ANALYSIS/data.root ../CPAlgorithmsRun2Data_PHYS_Text/submitDir/data-ANALYSIS/data.root
+   DEPENDS_SUCCESS CPAlgorithmsRun2Data_PHYS_Block CPAlgorithmsRun2Data_PHYS_Text )
+
+atlas_add_citest( CPAlgorithmsRun3Data_PHYS_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --run 3 --no-systematics --direct-driver )
+atlas_add_citest( CPAlgorithmsRun3Data_PHYS_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --run 3 --no-systematics --text-config AnalysisAlgorithmsConfig/test_configuration_Run3.yaml )
+atlas_add_citest( CPAlgorithmsRun3Data_PHYS_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun3Data_PHYS_Block/submitDir/data-ANALYSIS/data.root ../CPAlgorithmsRun3Data_PHYS_Text/submitDir/data-ANALYSIS/data.root
+   DEPENDS_SUCCESS CPAlgorithmsRun3Data_PHYS_Block CPAlgorithmsRun3Data_PHYS_Text )
+
+atlas_add_citest( CPAlgorithmsRun2FullSim_PHYS_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fullsim --run 2 --direct-driver )
+atlas_add_citest( CPAlgorithmsRun2FullSim_PHYS_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fullsim --run 2 --text-config AnalysisAlgorithmsConfig/test_configuration_Run2.yaml )
+atlas_add_citest( CPAlgorithmsRun2FullSim_PHYS_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun2FullSim_PHYS_Block/submitDir/data-ANALYSIS/fullsim.root ../CPAlgorithmsRun2FullSim_PHYS_Text/submitDir/data-ANALYSIS/fullsim.root
+   DEPENDS_SUCCESS CPAlgorithmsRun2FullSim_PHYS_Block CPAlgorithmsRun2FullSim_PHYS_Text )
+
+atlas_add_citest( CPAlgorithmsRun3FullSim_PHYS_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fullsim --run 3 --direct-driver )
+atlas_add_citest( CPAlgorithmsRun3FullSim_PHYS_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fullsim --run 3 --text-config AnalysisAlgorithmsConfig/test_configuration_Run3.yaml )
+atlas_add_citest( CPAlgorithmsRun3FullSim_PHYS_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun3FullSim_PHYS_Block/submitDir/data-ANALYSIS/fullsim.root ../CPAlgorithmsRun3FullSim_PHYS_Text/submitDir/data-ANALYSIS/fullsim.root
+   DEPENDS_SUCCESS CPAlgorithmsRun3FullSim_PHYS_Block CPAlgorithmsRun3FullSim_PHYS_Text )
+
+atlas_add_citest( CPAlgorithmsRun2FastSim_PHYS_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fastsim --run 2 --direct-driver )
+atlas_add_citest( CPAlgorithmsRun2FastSim_PHYS_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fastsim --run 2 --text-config AnalysisAlgorithmsConfig/test_configuration_Run2.yaml )
+atlas_add_citest( CPAlgorithmsRun2FastSim_PHYS_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun2FastSim_PHYS_Block/submitDir/data-ANALYSIS/fastsim.root ../CPAlgorithmsRun2FastSim_PHYS_Text/submitDir/data-ANALYSIS/fastsim.root
+   DEPENDS_SUCCESS CPAlgorithmsRun2FastSim_PHYS_Block CPAlgorithmsRun2FastSim_PHYS_Text )
+
+atlas_add_citest( CPAlgorithmsRun3FastSim_PHYS_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fastsim --run 3 --direct-driver )
+atlas_add_citest( CPAlgorithmsRun3FastSim_PHYS_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fastsim --run 3 --text-config AnalysisAlgorithmsConfig/test_configuration_Run3.yaml )
+atlas_add_citest( CPAlgorithmsRun3FastSim_PHYS_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun3FastSim_PHYS_Block/submitDir/data-ANALYSIS/fastsim.root ../CPAlgorithmsRun3FastSim_PHYS_Text/submitDir/data-ANALYSIS/fastsim.root
+   DEPENDS_SUCCESS CPAlgorithmsRun3FastSim_PHYS_Block CPAlgorithmsRun3FastSim_PHYS_Text )
+
+atlas_add_citest( CPAlgorithmsRun2Data_PHYSLITE_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --run 2 --physlite --no-systematics --direct-driver )
+atlas_add_citest( CPAlgorithmsRun2Data_PHYSLITE_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --run 2 --physlite --no-systematics --text-config AnalysisAlgorithmsConfig/test_configuration_Run2.yaml )
+atlas_add_citest( CPAlgorithmsRun2Data_PHYSLITE_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun2Data_PHYSLITE_Block/submitDir/data-ANALYSIS/data.root ../CPAlgorithmsRun2Data_PHYSLITE_Text/submitDir/data-ANALYSIS/data.root
+   DEPENDS_SUCCESS CPAlgorithmsRun2Data_PHYSLITE_Block CPAlgorithmsRun2Data_PHYSLITE_Text )
+
+atlas_add_citest( CPAlgorithmsRun3Data_PHYSLITE_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --run 3 --physlite --no-systematics --direct-driver )
+atlas_add_citest( CPAlgorithmsRun3Data_PHYSLITE_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --run 3 --physlite --no-systematics --text-config AnalysisAlgorithmsConfig/test_configuration_Run3.yaml )
+atlas_add_citest( CPAlgorithmsRun3Data_PHYSLITE_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun3Data_PHYSLITE_Block/submitDir/data-ANALYSIS/data.root ../CPAlgorithmsRun3Data_PHYSLITE_Text/submitDir/data-ANALYSIS/data.root
+   DEPENDS_SUCCESS CPAlgorithmsRun3Data_PHYSLITE_Block CPAlgorithmsRun3Data_PHYSLITE_Text )
+
+atlas_add_citest( CPAlgorithmsRun2FullSim_PHYSLITE_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fullsim --run 2 --physlite --direct-driver )
+atlas_add_citest( CPAlgorithmsRun2FullSim_PHYSLITE_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fullsim --run 2 --physlite --text-config AnalysisAlgorithmsConfig/test_configuration_Run2.yaml )
+atlas_add_citest( CPAlgorithmsRun2FullSim_PHYSLITE_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun2FullSim_PHYSLITE_Block/submitDir/data-ANALYSIS/fullsim.root ../CPAlgorithmsRun2FullSim_PHYSLITE_Text/submitDir/data-ANALYSIS/fullsim.root
+   DEPENDS_SUCCESS CPAlgorithmsRun2FullSim_PHYSLITE_Block CPAlgorithmsRun2FullSim_PHYSLITE_Text )
+
+atlas_add_citest( CPAlgorithmsRun3FullSim_PHYSLITE_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fullsim --run 3 --physlite --direct-driver )
+atlas_add_citest( CPAlgorithmsRun3FullSim_PHYSLITE_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fullsim --run 3 --physlite --text-config AnalysisAlgorithmsConfig/test_configuration_Run3.yaml )
+atlas_add_citest( CPAlgorithmsRun3FullSim_PHYSLITE_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun3FullSim_PHYSLITE_Block/submitDir/data-ANALYSIS/fullsim.root ../CPAlgorithmsRun3FullSim_PHYSLITE_Text/submitDir/data-ANALYSIS/fullsim.root
+   DEPENDS_SUCCESS CPAlgorithmsRun3FullSim_PHYSLITE_Block CPAlgorithmsRun3FullSim_PHYSLITE_Text )
+
+atlas_add_citest( CPAlgorithmsRun2FastSim_PHYSLITE_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fastsim --run 2 --physlite --direct-driver )
+atlas_add_citest( CPAlgorithmsRun2FastSim_PHYSLITE_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fastsim --run 2 --physlite --text-config AnalysisAlgorithmsConfig/test_configuration_Run2.yaml )
+atlas_add_citest( CPAlgorithmsRun2FastSim_PHYSLITE_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun2FastSim_PHYSLITE_Block/submitDir/data-ANALYSIS/fastsim.root ../CPAlgorithmsRun2FastSim_PHYSLITE_Text/submitDir/data-ANALYSIS/fastsim.root
+   DEPENDS_SUCCESS CPAlgorithmsRun2FastSim_PHYSLITE_Block CPAlgorithmsRun2FastSim_PHYSLITE_Text )
+
+atlas_add_citest( CPAlgorithmsRun3FastSim_PHYSLITE_Block
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fastsim --run 3 --physlite --direct-driver )
+atlas_add_citest( CPAlgorithmsRun3FastSim_PHYSLITE_Text
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fastsim --run 3 --physlite --text-config AnalysisAlgorithmsConfig/test_configuration_Run3.yaml )
+atlas_add_citest( CPAlgorithmsRun3FastSim_PHYSLITE_Comparison
+   SCRIPT compareFlatTrees --require-same-branches analysis ../CPAlgorithmsRun3FastSim_PHYSLITE_Block/submitDir/data-ANALYSIS/fastsim.root ../CPAlgorithmsRun3FastSim_PHYSLITE_Text/submitDir/data-ANALYSIS/fastsim.root
+   DEPENDS_SUCCESS CPAlgorithmsRun3FastSim_PHYSLITE_Block CPAlgorithmsRun3FastSim_PHYSLITE_Text )
+
+# special test for only nominal overlap removal
+atlas_add_citest( CPAlgorithmsRun2FullSim_PHYS_OnlyNominalOR
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fullsim --run 2 --only-nominal-or --direct-driver )
+atlas_add_citest( CPAlgorithmsRun3FastSim_PHYSLITE_OnlyNominalOR
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type fastsim --run 3 --physlite --only-nominal-or --direct-driver )
+
+# this test is for testing that the algorithm monitors defined in EventLoop
+# don't break a job of reasonable complexity.  they are tested here instead of
+# in the EventLoop package, because we have a much more complex payload here.
+atlas_add_citest( CPAlgorithmsRun2Data_PHYS_Benchmark
+   SCRIPT FullCPAlgorithmsTest_eljob.py --data-type data --run 2 --no-systematics --direct-driver --algorithm-timer --algorithm-memory )
+
 
 #################################################################################
 # SUSYTools

AtlasTest/CITest/AthSimulation.cmake

@@ -31,6 +31,16 @@ atlas_add_citest( SimulationRun3FullSimChecks
    LOG_IGNORE_PATTERN "WARNING FPE"  # ignore FPEs from Geant4
    DEPENDS_SUCCESS SimulationRun3FullSim )
 
+atlas_add_citest( SimulationRun3FullSimSQLiteGeo
+   SCRIPT RunWorkflowTests_Run3.py --CI -s -w FullSim -a s4454 --threads 4 -e '--maxEvents 50 --geometrySQLiteFullPath /cvmfs/atlas.cern.ch/repo/sw/database/GroupData/Geometry/ATLAS-R3S-2021-03-02-00-DEV01.db' --run-only
+   LOG_IGNORE_PATTERN "WARNING FPE"  # ignore FPEs from Geant4
+   PROPERTIES PROCESSORS 4 )
+
+atlas_add_citest( SimulationRun3FullSimSQLiteGeoChecks
+   SCRIPT RunWorkflowTests_Run3.py --CI -s -w FullSim -a s4454 --checks-only --output-path ../SimulationRun3FullSimSQLiteGeo
+   LOG_IGNORE_PATTERN "WARNING FPE"  # ignore FPEs from Geant4
+   DEPENDS_SUCCESS SimulationRun3FullSimSQLiteGeo )
+
 atlas_add_citest( SimulationRun4FullSim
    SCRIPT RunWorkflowTests_Run4.py --CI -s -w FullSim --threads 4 -e '--maxEvents 10' --run-only
    LOG_IGNORE_PATTERN "WARNING FPE"  # ignore FPEs from Geant4

AtlasTest/CITest/scripts/CopyCIArtifact.sh

@@ -10,7 +10,7 @@
 # Multiple files can be passed to the command
 #   CopyCIArtifact.sh FILE...
 # Files are copied to
-#   /eos/atlas/atlascerngroupdisk/proj-sit/gitlabci/MR<number>_<hash>/<test_name>
+#   /eos/atlas/atlascerngroupdisk/proj-ascig/gitlabci/MR<number>_<hash>/<test_name>
 #
 
 # exit on failure
@@ -36,7 +36,7 @@ if [[ -z ${1+x} ]]; then
 fi
 
 # check if we have EOS access
-base_folder="/eos/atlas/atlascerngroupdisk/proj-sit/gitlabci"
+base_folder="/eos/atlas/atlascerngroupdisk/proj-ascig/gitlabci"
 if [[ ! -d "${base_folder}" ]]; then
   echo "Error: CI artifacts area is not accessible" 1>&2
   exit 2

AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref

 
 
-ApplicationMgr      DEBUG Getting my own properties
 ApplicationMgr       INFO Application Manager Configured successfully
-DetectorStore     VERBOSE Initializing DetectorStore
-DetectorStore_ImplVERBOSE Initializing DetectorStore_Impl
 ProxyProviderSvc  VERBOSE Initializing ProxyProviderSvc
-HistoryStore      VERBOSE Initializing HistoryStore
-HistoryStore_Impl VERBOSE Initializing HistoryStore_Impl
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
-HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
 StoreGateSvc      VERBOSE Initializing StoreGateSvc

AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt

 // job opts for ProxyProviderSvc unit test
 
-// $Id: ProxyProviderSvc_test.txt,v 1.3 2007/11/09 23:56:59 calaf Exp $
-
 #include "ControlTest/StoreGateTestCommon.txt"
 #include "ToyConversion/ToyConversionOpts.txt"
-ProxyProviderSvc.OutputLevel = 1;
-//MessageSvc.OutputLevel = 1;
-ClassIDSvc.OutputLevel = 2;
-MessageSvc.setVerbose = ["DataProxy", "EventPersistencySvc", "ToyConversionSvc", "StoreGateSvc", "EventDataSvc", "HistogramDataSvc", "ServiceManager", "HistogramPersistencySvc", "HistoryStore", "DetectorStore", "ApplicationMgr", "ProxyProviderSvc"];
-MessageSvc.setDebug = ["ClassIDSvc"];
 
+MessageSvc.setVerbose = ["DataProxy", "EventPersistencySvc", "ToyConversionSvc", "StoreGateSvc", "ProxyProviderSvc"];

AtlasTest/ControlTest/test/DataProxy_test.cxx

 /*
-  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -16,6 +16,7 @@
 #include "AthenaKernel/CLASS_DEF.h"
 #include "SGTools/T2pMap.h"
 #include "SGTools/TransientAddress.h"
+#include "SGTools/DataProxy_cast.h"
 #include <iostream>
 
 #include <cassert>

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
 

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/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