AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeFactory.h

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef GEOMODELENVELOPES_FORDETENVELOPEFACTORY_H
@@ -12,36 +12,36 @@ class StoreGateSvc;
 class StoredMaterialManager;
 class GeoShape;
 
-class ForDetEnvelopeFactory final : public GeoVDetectorFactory  
+class ForDetEnvelopeFactory final : public GeoVDetectorFactory
 {
  public:
-  
+
   // Constructor:
   ForDetEnvelopeFactory(StoreGateSvc *pDetStore);
-  
+
   // Destructor:
-  ~ForDetEnvelopeFactory();
-  
+  ~ForDetEnvelopeFactory() = default;
+
   // Creation of geometry:
   virtual void create(GeoPhysVol *world) override;
-  
+
   // Access to the results:
   virtual const ForDetEnvelopeManager * getDetectorManager() const override;
-  
- private:  
+
+ private:
 
   // Illegal operations:
   const ForDetEnvelopeFactory & operator=(const ForDetEnvelopeFactory &right);
   ForDetEnvelopeFactory(const ForDetEnvelopeFactory &right);
-  
+
   // The manager:
   ForDetEnvelopeManager*   m_detectorManager;
-   
+
   StoredMaterialManager* m_materialManager;
   StoreGateSvc*             m_detectorStore;
 };
 
-// Class ForDetEnvelopeFactory 
+// Class ForDetEnvelopeFactory
 #endif
 
 

AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeManager.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 "GeoModelEnvelopes/ForDetEnvelopeManager.h"
@@ -23,7 +23,7 @@ PVConstLink ForDetEnvelopeManager::getTreeTop(unsigned int i) const
   return m_volume[i];
 }
 
-void  ForDetEnvelopeManager::addTreeTop(PVLink vol)
+void  ForDetEnvelopeManager::addTreeTop(const PVLink& vol)
 {
   m_volume.push_back(vol);
 }

AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.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 "ForDetEnvelopeTool.h"
-#include "ForDetEnvelopeFactory.h" 
-#include "GeoModelEnvelopes/ForDetEnvelopeManager.h" 
+#include "ForDetEnvelopeFactory.h"
+#include "GeoModelEnvelopes/ForDetEnvelopeManager.h"
 #include "GeoModelUtilities/GeoModelExperiment.h"
 
 #include "StoreGate/StoreGateSvc.h"
@@ -12,30 +12,25 @@
 #include "AthenaKernel/ClassID_traits.h"
 #include "SGTools/DataProxy.h"
 
-ForDetEnvelopeTool::ForDetEnvelopeTool(const std::string& type, 
-				       const std::string& name, 
-				       const IInterface* parent): 
+ForDetEnvelopeTool::ForDetEnvelopeTool(const std::string& type,
+				       const std::string& name,
+				       const IInterface* parent):
   GeoModelTool(type,name,parent),
-  m_manager(0)
+  m_manager(nullptr)
 {
 }
 
-ForDetEnvelopeTool::~ForDetEnvelopeTool()
-{
-}
-
-
 StatusCode ForDetEnvelopeTool::create()
-{ 
+{
   ATH_MSG_INFO("Building Forward Detectors Envelope");
 
-  GeoModelExperiment* theExpt; 
-  if (StatusCode::SUCCESS != detStore()->retrieve(theExpt,"ATLAS")) { 
+  GeoModelExperiment* theExpt;
+  if (StatusCode::SUCCESS != detStore()->retrieve(theExpt,"ATLAS")) {
     ATH_MSG_ERROR("Could not find GeoModelExperiment ATLAS");
-    return StatusCode::FAILURE; 
-  } 
+    return StatusCode::FAILURE;
+  }
 
-  if(0==m_manager) {
+  if(nullptr==m_manager) {
     GeoPhysVol *world=&*theExpt->getPhysVol();
 
     ForDetEnvelopeFactory theFactory(detStore().operator->());
@@ -45,10 +40,10 @@ StatusCode ForDetEnvelopeTool::create()
     theExpt->addManager(m_manager);
     StatusCode sc = detStore()->record(m_manager,
 			  m_manager->getName());
-    
+
     if (sc.isFailure()) {
       ATH_MSG_ERROR("Could not register ForDetEnvelope detector manager");
-      return StatusCode::FAILURE; 
+      return StatusCode::FAILURE;
     }
     return StatusCode::SUCCESS;
   }
@@ -60,7 +55,7 @@ StatusCode ForDetEnvelopeTool::clear()
   SG::DataProxy* proxy = detStore()->proxy(ClassID_traits<ForDetEnvelopeManager>::ID(),m_manager->getName());
   if(proxy) {
     proxy->reset();
-    m_manager = 0;
+    m_manager = nullptr;
   }
   return StatusCode::SUCCESS;
 }

AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.h

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef ForDetEnvelopeTool_h 
+#ifndef ForDetEnvelopeTool_h
 #define ForDetEnvelopeTool_h 1
 
 #include "GeoModelUtilities/GeoModelTool.h"
 class ForDetEnvelopeManager;
 
-class ForDetEnvelopeTool final : public GeoModelTool 
+class ForDetEnvelopeTool final : public GeoModelTool
 {
  public:
 
@@ -16,7 +16,7 @@ class ForDetEnvelopeTool final : public GeoModelTool
   ForDetEnvelopeTool( const std::string& type, const std::string& name, const IInterface* parent );
 
   // Standard Destructor
-  virtual ~ForDetEnvelopeTool() override final;
+  virtual ~ForDetEnvelopeTool() override final = default;
 
   virtual StatusCode create() override final;
   virtual StatusCode clear() override final;
@@ -24,4 +24,4 @@ class ForDetEnvelopeTool final : public GeoModelTool
   const ForDetEnvelopeManager* m_manager;
 };
 
-#endif 
+#endif

AtlasGeometryCommon/SubDetectorEnvelopes/src/DetDescrDBEnvelopeSvc.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
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -258,7 +258,7 @@ StatusCode DetDescrDBEnvelopeSvc::retrieveRZBoundary( std::string  &node,
     double curR = (*recIt)->getDouble("R") * CLHEP::mm;
     double curZ = (*recIt)->getDouble("Z") * CLHEP::mm;
     // store (r,z) duplet locally
-    rzVec.push_back( RZPair(curR, curZ) );
+    rzVec.emplace_back(curR, curZ );
   }
 
   return StatusCode::SUCCESS;
@@ -286,7 +286,7 @@ StatusCode DetDescrDBEnvelopeSvc::fallbackRZBoundary( FallbackDoubleVector &r,
     double curR = r[pos];
     double curZ = z[pos];
     // store (r,z) duplet locally
-    rzVec.push_back( RZPair(curR, curZ) );
+    rzVec.emplace_back(curR, curZ );
   }
 
   return StatusCode::SUCCESS;

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/AthGeneration.cmake

-# Copyright (C) 2002-2022 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 AthGeneration project
 # --> README.md before you modify this file
@@ -8,6 +8,9 @@ atlas_add_citest( DuplicateClass
    SCRIPT python -c 'import ROOT'
    PROPERTIES FAIL_REGULAR_EXPRESSION "class .* is already in" )
 
+atlas_add_citest( DuplicateComponent
+   SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/DuplicateComponentsCheck.py )
+
 atlas_add_citest( Generation_PhPy8_13p6TeV
    SCRIPT RunWorkflowTests_Run3.py --CI -g --dsid 421356 )
 
@@ -23,8 +26,15 @@ atlas_add_citest( Generation_Sherpa_13p6TeV
 atlas_add_citest( Generation_ParticleGun_13p6TeV
    SCRIPT RunWorkflowTests_Run3.py --CI -g --dsid 421119 )
 
+atlas_add_citest( Generation_JetFilter_13p6TeV
+   SCRIPT RunWorkflowTests_Run3.py --CI -g --dsid 421114 )
+
 atlas_add_citest( Generation_PhPy8_13TeV
    SCRIPT RunWorkflowTests_Run2.py --CI -g --dsid 421356 )
 
 atlas_add_citest( Generation_PhPy8_14TeV
    SCRIPT RunWorkflowTests_Run4.py --CI -g --dsid 421356 )
+
+# CA Config
+atlas_add_citest( Generation_CA_ParticleGun_13p6TeV
+   SCRIPT RunWorkflowTests_Run3.py --CI -g --dsid Test950555 -e '--CA True' )

AtlasTest/CITest/AthSimulation.cmake

@@ -8,6 +8,9 @@ atlas_add_citest( DuplicateClass
    SCRIPT python -c 'import ROOT'
    PROPERTIES FAIL_REGULAR_EXPRESSION "class .* is already in" )
 
+atlas_add_citest( DuplicateComponent
+   SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/DuplicateComponentsCheck.py )
+
 atlas_add_citest( SimulationRun2FullSim
    SCRIPT RunWorkflowTests_Run2.py --CI -s -w FullSim --threads 4 -e '--maxEvents 10' --run-only
    LOG_IGNORE_PATTERN "WARNING FPE"  # ignore FPEs from Geant4
@@ -28,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/DuplicateComponentsCheck.py

+#!/usr/bin/env python
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+
+import sys
+from AthenaCommon.ConfigurableDb import cfgDb, getConfigurable
+
+getConfigurable('xAODMaker::EventInfoCnvAlg')
+
+if cfgDb.duplicates():
+    sys.exit(1)

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