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( AnalysisTop_EMPFlowData
-   LOG_IGNORE_PATTERN "Cannot interpolate outside histogram domain" # ANALYSISTO-1165
-   SCRIPT CI_EMPFlowDatatest.py )
+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( AnalysisTop_EMPFlowMC
-   SCRIPT CI_EMPFlowMCtest.py )
+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( AnalysisTop_EMPFlowData22
-   SCRIPT CI_EMPFlowData22test.py )
+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 )
 
-atlas_add_citest( AnalysisTop_EMPFlowMC21
-   SCRIPT CI_EMPFlowMC21test.py )
 
 #################################################################################
 # SUSYTools
 #################################################################################
 
 atlas_add_citest( SUSYTools_data18_PHYS
-   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/data18_13TeV.00356250_p5855.PHYS.pool.root maxEvents=500 isData=1 isAtlfast=0 Debug=0"
+   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/data18_13TeV.39757132_p6266.PHYS.pool.root maxEvents=500 isData=1 isAtlfast=0 Debug=0"
    )
 
 atlas_add_citest( SUSYTools_data22_PHYS
-   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/data22_13p6TeV.00440543_p5858.PHYS.pool.root maxEvents=1000 isData=1 isAtlfast=0 Debug=0"
+   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/data22_13p6TeV.39672246_p6269.PHYS.pool.root maxEvents=1000 isData=1 isAtlfast=0 Debug=0"
    )
 
 atlas_add_citest( SUSYTools_mc20e_PHYS
-   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/mc20_13TeV.410470.FS_mc20e_p5855.PHYS.pool.root maxEvents=100 isData=0 isAtlfast=0 Debug=0 NoSyst=0 ilumicalcFile=GoodRunsLists/data18_13TeV/20190318/ilumicalc_histograms_None_348885-364292_OflLumi-13TeV-010.root"
+   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/DAOD_PHYS.mc20_13TeV.410470.FS_mc20e_p6266.PHYS.pool.root maxEvents=100 isData=0 isAtlfast=0 Debug=0 NoSyst=0 ilumicalcFile=GoodRunsLists/data18_13TeV/20190318/ilumicalc_histograms_None_348885-364292_OflLumi-13TeV-010.root"
    )
 
 atlas_add_citest( SUSYTools_mc23a_PHYS
-   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/mc23_13p6TeV.601229.FS_mc23a_p5855.PHYS.pool.root maxEvents=100 isData=0 isAtlfast=0 Debug=0 NoSyst=0 ilumicalcFile=GoodRunsLists/data22_13p6TeV/20230116/ilumicalc_histograms_None_431810-440613_OflLumi-Run3-002.root"
+   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/mc23_13p6TeV.601229.FS_mc23a_p6266.PHYS.pool.root maxEvents=100 isData=0 isAtlfast=0 Debug=0 NoSyst=0 ilumicalcFile=GoodRunsLists/data22_13p6TeV/20230116/ilumicalc_histograms_None_431810-440613_OflLumi-Run3-002.root"
    )
 
 atlas_add_citest( SUSYTools_mc23a_PHYSLITE
-   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/mc23_13p6TeV.601229.FS_mc23a_p5855.PHYSLITE.pool.root maxEvents=100 isData=0 isAtlfast=0 Debug=0 NoSyst=0 ilumicalcFile=GoodRunsLists/data22_13p6TeV/20230116/ilumicalc_histograms_None_431810-440613_OflLumi-Run3-002.root"
-   )
+   SCRIPT "SUSYToolsTester /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SUSYTools/mc23_13p6TeV.601229.FS_mc23a_p6266.PHYSLITE.pool.root maxEvents=100 isData=0 isAtlfast=0 Debug=0 NoSyst=0 ilumicalcFile=GoodRunsLists/data22_13p6TeV/20230116/ilumicalc_histograms_None_431810-440613_OflLumi-Run3-002.root"
+   )
\ No newline at end of file

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/README.md

@@ -4,10 +4,15 @@ these as they have a significant impact on the CI turnaround time.
 [TOC]
 
 # Running the tests
-After compiling this package locally, individual tests can be run specifying the test name (supports regex):
+Once you have made the local modifications to the code that you wish to test, compile them locally alongside this package. Remain in the build directory. Individual tests can then be run by specifying the test name (supports regex):
 ```sh
 ctest -R CITest_RecoRun2Data
 ```
+or
+```sh
+ctest -R LuminosityCondAlgConfig_test
+```
+for a test defined in `LumiBlockComps/CMakeLists.txt` with the name `LuminosityCondAlgConfig_test`.  
 
 For builds involving several packages, tests can be selected/excluded using the "CITest" label:
 ```sh
@@ -15,6 +20,8 @@ ctest -L CITest   # run all CI tests
 ctest -LE CITest  # run all tests, except CI tests
 ```
 
+This runs the test job and compares the output with the reference file, whose locations are specified in the `CMakeLists.txt` file. The results of the test are written to a temporary directory as reported by the job's message to the command prompt. The output of the test job itself is embedded in this file and so the relevant lines can be extracted in case you need to update the reference file.
+
 # Adding new tests
 - Test are defined in separate files for each project (e.g. [`Athena.cmake`](Athena.cmake)).
 - Tests should have a short self-explanatory name. Do not add the word "test" to the name itself.

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/CITest/test/FastChain.sh

 #!/usr/bin/bash
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 FastChain_tf.py \
-    --CA \
     --simulator ATLFAST3F_G4MS \
     --useISF True \
     --randomSeed 123 \
@@ -12,7 +11,7 @@ FastChain_tf.py \
     --maxEvents 2 \
     --skipEvents 0 \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
-    --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-09'  \
+    --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-12'  \
     --preInclude 'Campaigns.MC20a' 'Campaigns.MC16SimulationNoIoV' \
     --postInclude 'PyJobTransforms.UseFrontier' \
     --imf False

AtlasTest/ControlTest/CMakeLists.txt

-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ControlTest )
@@ -51,23 +51,6 @@ atlas_add_test( ElementLinkVector_test
    LOG_IGNORE_PATTERN "0x[0-9a-fA-F]{4,}|ERROR.*known CLID.*7368883"  # duplicate CLID defined by test
    ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
 
-atlas_add_test( StoreGateSvcClient_test
-   SOURCES test/StoreGateSvcClient_test.cxx
-   LINK_LIBRARIES TestTools AthContainers AthenaKernel SGTools SGtests StoreGateLib CxxUtils
-   LOG_IGNORE_PATTERN "0x[0-9a-fA-F]{4,}"
-   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
-
-atlas_add_test( ClearStore_test
-   SOURCES test/ClearStore_test.cxx
-   LINK_LIBRARIES TestTools StoreGateLib SGtests
-   LOG_IGNORE_PATTERN "0x[0-9a-fA-F]{4,}"
-   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
-
-atlas_add_test( StoreID
-   SOURCES test/StoreID_test.cxx
-   LINK_LIBRARIES TestTools StoreGateLib
-   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
-
 atlas_add_test( FortranAlgorithm
    SCRIPT test/FortranAlgorithm.sh )
 
@@ -94,13 +77,6 @@ atlas_add_test( StoreGateDFlow
 atlas_add_test( test_interactive_athena
    SCRIPT athena.py ControlTest/test_interactive_athena.py )
 
-atlas_add_test( test_cfgItemList
-                SCRIPT python -m ControlTest.test_cfgItemList
-                LOG_IGNORE_PATTERN "../FooFoo at 0x" )
-
-atlas_add_test( test_keyStore
-                SCRIPT python -m ControlTest.test_keyStore )
-
 atlas_add_test( test_handleTest
                 SCRIPT athena.py AthExStoreGateExample/HandleTest_jobOptions.py )
 
@@ -109,5 +85,4 @@ atlas_add_test( test_decorHandleTest
                 LOG_SELECT_PATTERN "testalg.testool" )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/StoreGateTestCommon.txt share/DataLink_test.txt share/*.py )

AtlasTest/ControlTest/python/__init__.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# hook for the ControlTest py-module

AtlasTest/ControlTest/python/test_cfgItemList.py

-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.Constants import VERBOSE,INFO
-from AthenaCommon.KeyStore import CfgItemList
-
-from AthenaCommon.Logging import logging
-msg = logging.getLogger( 'ItemList' )
-msg.setLevel( VERBOSE )
-
-msg = logging.getLogger( 'Athena' )
-msg.setLevel( INFO )
-
-msg.info( "[CfgItemList] test running..." )
-esdList = CfgItemList( "esd" )
-
-inDetEsdList = CfgItemList( "InDetEsd" )
-inDetEsdList.add( "VxContainer#Conversions" )
-
-esdList += inDetEsdList
-
-esdList += CfgItemList( 
-    "CaloEsd", 
-    items = [ "CaloCellContainer#Boo",
-              "CaloClusterContainer#BooBoo" ] 
-    )
-assert( esdList.CaloEsd() == [ "CaloCellContainer#Boo",
-                               "CaloClusterContainer#BooBoo"] )
-
-esdList += CfgItemList(
-    "TrigEsd",
-    items = [ "JetCollection#HLT_AutoKey*" ],
-    allowWildCard = True
-    )
-assert( esdList.TrigEsd() == [ "JetCollection#HLT_AutoKey*" ] )
-
-msg.info( "Should see a warning about attempt at adding invalid element..." )
-foo = CfgItemList(
-    "Foo",
-    items = [ "Bla#Blah*" ]
-    )
-assert( foo() == [] )
-del foo
-
-## FIXME: AthenaPoolOutputStream is bringing theApp into our namespace...
-msg.info( "Creating an AthenaPoolOutputStream..." )
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-StreamESD = AthenaPoolOutputStream( "StreamESD" )
-StreamESD.ItemList = esdList()
-
-msg.info( "ESD item list: %r", esdList() )
-
-msg.info( "removing TrigEsd item list" )
-del esdList.TrigEsd
-StreamESD.ItemList = esdList()
-msg.info( "ESD item list: %r",StreamESD.ItemList )
-
-caught = False
-try:
-    esdList += AthenaPoolOutputStream( "FooFoo" )
-except TypeError as err:
-    caught = True
-    msg.info( err )
-    msg.info( "Error has been caught, good" )
-assert(caught)
-
-msg.info( "ESD item list: %r", esdList() )
-
-inDetEsdList.add( "AnotherVxContainer#Conversions" )
-
-msg.info( "InDet list: %r",inDetEsdList() )
-msg.info( "ESD item list: %r", esdList() )
-assert( set(esdList()) == set([
-    'CaloCellContainer#Boo',
-    'CaloClusterContainer#BooBoo', 'VxContainer#Conversions',
-    'AnotherVxContainer#Conversions'])
-    )
-
-msg.info( "[CfgItemList] test SUCCESSFULL" )

AtlasTest/ControlTest/python/test_keyStore.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-from __future__ import print_function
-
-from AthenaCommon.Constants import VERBOSE,INFO
-from AthenaCommon.KeyStore import CfgKeyStore
-
-
-from AthenaCommon.Logging import logging
-msg = logging.getLogger( 'KeyStore' )
-msg.setLevel( VERBOSE )
-
-msg = logging.getLogger( 'Athena' )
-msg.setLevel( INFO )
-
-msg.info( "[KeyStore] test running..." )
-ks = CfgKeyStore( "KeyStore" )
-print (ks)
-
-msg.info( "[KeyStore] test SUCCESSFULL" )
-

AtlasTest/ControlTest/share/CircularDep_test.ref

@@ -35,8 +35,6 @@ 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
 StoreGateSvc        DEBUG Recorded object @0xfe61c0 with key circVector of type CircularVector(CLID 218202856) 
  in DataObject @0xfe62d0 
  object modifiable when retrieved

AtlasTest/ControlTest/share/ElementLinkVector_test.ref

@@ -32,8 +32,6 @@ 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
 *** ElementLinkVector_test vector starts ***
 
 

AtlasTest/ControlTest/share/ElementLink_test.ref

@@ -32,8 +32,6 @@ 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
  ************* Starting Test 1 
 StoreGateSvc        DEBUG Recorded object @0x15c61d0 with key fooVec of type DataVector<Foo>(CLID 1234)
  in DataObject @0x15c6160

AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref

 
 
-Initializing Gaudi ApplicationMgr using job opts ../share/ProxyProviderSvc_test.txt
-JobOptionsSvc        INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ControlTest/StoreGateTestCommon.txt
-JobOptionsSvc        INFO # (3,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionStore"]
-JobOptionsSvc        INFO # (4,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
-JobOptionsSvc        INFO # (5,1): StoreGateSvc.OutputLevel = 1
-JobOptionsSvc        INFO # (6,1): StoreGateSvc.ActivateHistory = 0
-JobOptionsSvc        INFO # (7,1): ClassIDSvc.CLIDDBFiles = {}
-JobOptionsSvc        INFO # (8,1): MessageSvc.useColors = 1
-JobOptionsSvc        INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ToyConversion/ToyConversionOpts.txt
-JobOptionsSvc        INFO # (5,1): EventPersistencySvc.CnvServices += ["ToyConversionSvc"]
-JobOptionsSvc        INFO # =======> /home/sss/nobackup/atlas/build-dvtest/../tests/../share/ProxyProviderSvc_test.txt
-JobOptionsSvc        INFO # (7,1): ProxyProviderSvc.OutputLevel = 1
-JobOptionsSvc        INFO # (9,1): ClassIDSvc.OutputLevel = 2
-JobOptionsSvc        INFO # (10,1): MessageSvc.setVerbose = ["DataProxy", "EventPersistencySvc", "ToyConversionSvc", "StoreGateSvc", "EventDataSvc", "HistogramDataSvc", "ServiceManager", "HistogramPersistencySvc", "HistoryStore", "DetectorStore", "ApplicationMgr", "ProxyProviderSvc"]
-JobOptionsSvc        INFO # (11,1): MessageSvc.setDebug = ["ClassIDSvc"]
-JobOptionsSvc        INFO Job options successfully read in from ../share/ProxyProviderSvc_test.txt
-ApplicationMgr      DEBUG Getting my own properties
-ApplicationMgr    SUCCESS 
-====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Wed Jan 18 16:14:34 2023
-====================================================================================================================================
-ApplicationMgr       INFO Application Manager Configured successfully
-ServiceManager      DEBUG Initializing service DetectorStore
-DetectorStore       DEBUG Service base class initialized successfully
-DetectorStore     VERBOSE Initializing DetectorStore
-DetectorStore       DEBUG trying to create store SGImplSvc/DetectorStore_Impl
-DetectorStore_Impl  DEBUG Property update for OutputLevel : new value = 1
-DetectorStore_ImplVERBOSE Initializing DetectorStore_Impl
-DetectorStore_Impl  DEBUG Service base class initialized successfully
-EventPersistenc...  DEBUG  'CnvServices':[ 'ToyConversionSvc' ]
-EventPersistenc...  DEBUG Service base class initialized successfully
-DetectorStore_ImplVERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-ClassIDSvc          DEBUG Service base class initialized successfully
-ClassIDSvc           INFO getRegistryEntries: read 816 CLIDRegistry entries for module ALL
-DetectorStore_ImplVERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-ProxyProviderSvc  VERBOSE Initializing ProxyProviderSvc
-ProxyProviderSvc  VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-ProxyProviderSvc    DEBUG Service base class initialized successfully
-ServiceManager      DEBUG Initializing service HistoryStore
-HistoryStore        DEBUG Service base class initialized successfully
-HistoryStore      VERBOSE Initializing HistoryStore
-HistoryStore        DEBUG trying to create store SGImplSvc/HistoryStore_Impl
-HistoryStore_Impl   DEBUG Property update for OutputLevel : new value = 1
-HistoryStore_Impl VERBOSE Initializing HistoryStore_Impl
-HistoryStore_Impl   DEBUG Service base class initialized successfully
-HistoryStore_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-HistoryStore_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-ServiceManager      DEBUG Initializing service ConditionStore
-ServiceManager      DEBUG Initializing service AppMgrRunable
-ServiceManager      DEBUG Initializing service EventLoopMgr
-EventDataSvc        DEBUG Service base class initialized successfully
-EventDataSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-EventLoopMgr      WARNING Unable to locate service "EventSelector" 
-EventLoopMgr      WARNING No events will be processed from external input.
-HistogramDataSvc    DEBUG Service base class initialized successfully
-HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-HistogramPersis...  DEBUG Service base class initialized successfully
-HistogramPersis...  DEBUG Histograms saving not required.
-HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
-ApplicationMgr       INFO Application Manager Initialized successfully
+ApplicationMgr       INFO Application Manager Configured successfully
+ProxyProviderSvc  VERBOSE Initializing ProxyProviderSvc
+EventLoopMgr      WARNING Unable to locate service "EventSelector" 
+EventLoopMgr      WARNING No events will be processed from external input.
+ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc      VERBOSE Initializing StoreGateSvc
-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
-ClassIDSvc           INFO getRegistryEntries: read 1031 CLIDRegistry entries for module ALL
-StoreGateSvc_Impl   DEBUG  Bound handle 0x7ffd14df99d0 to proxy 0x244dd40
-ToyConversionSvc    DEBUG Service base class initialized successfully
-EventPersistenc...VERBOSE ServiceLocatorHelper::service: found service ToyConversionSvc
-EventPersistenc...   INFO Added successfully Conversion service:ToyConversionSvc
-ClassIDSvc           INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL
-<<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
-SGImplSvc(StoreGateSvc_Impl)::dump():
-Found 1 proxy for ClassID 8107 (Bar): 
- flags: (  valid,   locked,  reset) --- data:  0x4750630 --- key: aBar
-<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
-
-StoreGateSvc        DEBUG Retrieved const pointer to object aFoo  of type Foo(CLID 8101)
+StoreGateSvc      VERBOSE Initializing StoreGateSvc
+StoreGateSvc      VERBOSE Initializing StoreGateSvc
+EventPersistenc...VERBOSE ServiceLocatorHelper::service: found service ToyConversionSvc
+StoreGateSvc: <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
+StoreGateSvc: StoreGateSvc()::dump() which is NOT LOADED 
+StoreGateSvc: Found 1 proxy for ClassID 8107 (Bar): 
+StoreGateSvc: <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
+
+StoreGateSvc        DEBUG Retrieved const pointer to object aFoo  of type Foo(CLID 8101)
 Now we expect to see an error message:
 ----Error Message Starts--->>
-ToyConversionSvc     INFO No converter for object   CLID= 8109
-DataProxy         WARNING accessData: conversion failed for data object 8109/aFooBar
- Returning NULL DataObject pointer  
-SG::DataProxy_castWARNING this proxy 0x42e3920 has a NULL data object ptr
+ToyConversionSvc     INFO No converter for object   CLID= 8109
+DataProxy         WARNING accessData: conversion failed for data object 8109/aFooBar
+ Returning NULL DataObject pointer  
 <<---Error Message Ends-------
 *** ProxyProviderSvc_test OK ***
 *** ProxyProviderSvc_test RecordBeforeRead BEGINS ***
-StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  reset object aBar CLID 8107 address 0x4750630
-DataProxy         VERBOSE requestRelease():  reset object aFoo CLID 8101 address 0x47654a0
-DataProxy         VERBOSE requestRelease():  reset object aFooBar CLID 8109 address 0
-StoreGateSvc_Impl WARNING record_impl: you are recording an object with key existingFoo, type Foo (CLID 8101)
- There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated.
-StoreGateSvc        DEBUG Recorded object @0x249cbe0 with key existingFoo of type Foo(CLID 8101)
- in DataObject @0x488d0e0
- object modifiable when retrieved
-StoreGateSvc        DEBUG Retrieved const pointer to object existingFoo  of type Foo(CLID 8101)
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
+StoreGateSvc WARNING record_impl: you are recording an object with key existingFoo, type Foo (CLID 8101)
+ There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated.
+ object modifiable when retrieved
+StoreGateSvc        DEBUG Retrieved const pointer to object existingFoo  of type Foo(CLID 8101)
 6.28
 *** ProxyProviderSvc_test RecordBeforeRead OK ***
 
 
 *** ProxyProviderSvc_test HLTAutoKeyReset BEGINS ***
-StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=1
-DataProxy         VERBOSE requestRelease():  release  object aBar CLID 8107 address 0
-DataProxy         VERBOSE requestRelease():  release  object existingFoo CLID 8101 address 0x488d0e0
-DataProxy         VERBOSE requestRelease():  release  object aFooBar CLID 8109 address 0
-DataProxy         VERBOSE requestRelease():  release  object aFoo CLID 8101 address 0
-StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_1 CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  reset object NOT_HLTAutoKey_3 CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_2 CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_3 CLID 8101 address 0
+StoreGateSvc        DEBUG Clearing store with forceRemove=1
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
 *** ProxyProviderSvc_test HLTAutoKeyReset OK ***
 
 
 *** ProxyProviderSvc_test Overwrite starts ***
 
 
-StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=1
-DataProxy         VERBOSE requestRelease():  release  object NOT_HLTAutoKey_3 CLID 8101 address 0
-DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_1 CLID 8101 address 0
+StoreGateSvc        DEBUG Clearing store with forceRemove=1
 =============Event #0 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0x457c490 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x48f6940
- object modifiable when retrieved
+ object modifiable when retrieved
 Overwritten FooBar i=0
-StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x48f6940
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
 FooBar i=0 deleted
 =============Event #1 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0x457c490 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x48f6940
- object modifiable when retrieved
+ object modifiable when retrieved
 Overwritten FooBar i=1
-StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x48f6940
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
 FooBar i=1 deleted
 =============Event #2 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0x457c490 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x48f6940
- object modifiable when retrieved
+ object modifiable when retrieved
 Overwritten FooBar i=2
-StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x48f6940
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
 FooBar i=2 deleted
 *** ProxyProviderSvc_test Overwrite OK ***
 
 
-StoreGateSvc_Impl   DEBUG Clearing store with forceRemove=1
+StoreGateSvc        DEBUG Clearing store with forceRemove=1

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/share/SGDataLink_test.ref

@@ -29,8 +29,6 @@ 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
 StoreGateSvc        DEBUG Recorded object @0x4ce3340 with key foo2 of type Foo(CLID 8101)
  in DataObject @0x4ce45a0
  object modifiable when retrieved