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-2018 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 : public GeoModelTool 
+class ForDetEnvelopeTool final : public GeoModelTool
 {
  public:
 
@@ -16,7 +16,7 @@ class ForDetEnvelopeTool : 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 : public GeoModelTool
   const ForDetEnvelopeManager* m_manager;
 };
 
-#endif 
+#endif

AtlasGeometryCommon/Interpreters/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( Interpreters )
-
-# Install files from the package:
-atlas_install_scripts( share/physh share/totalphysh share/athenash.py )

AtlasGeometryCommon/Interpreters/share/athenash.py

-#!/bin/sh
-
-
-"""date"      # executable for the shell, but a string block to python 
-exec `which python` -t "$0" "$@"               # exec, as required for gdb 
-"""           # python execution starts here, the shell never reaches this
-
-
-__version__ = '3.0.0'
-__author__  = 'Joe Boudreau (boudreau@pitt.edu) based upon work of Wim Lavrijsen (WLavrijsen@lbl.gov)'
-__doc__     = 'No Doc.  Sorry'
-
-import sys, os
-import getopt, string
-
-
-runBatch=1
-   
-### python interpreter configuration -----------------------------------------
-if not os.getcwd() in sys.path:
-   sys.path = [ os.getcwd() ] + sys.path
-
-if not '' in sys.path:
-   sys.path = [ '' ] + sys.path
-
-
-### logging and messages -----------------------------------------------------
-from AthenaCommon.Logging import *
-
-### file inclusion and tracing -----------------------------------------------
-from AthenaCommon.Include import Include, IncludeError, include
-include.setShowIncludes( False )
-
-### gaudi --------------------------------------------------------------------
-from GaudiPython import *
-
-from AthenaCommon.Configurable import *
-from AthenaCommon.OldStyleConfig import *
-from AthenaCommon.Constants import *
-
-preconfig = "AthenaCommon"
-### Athena configuration -----------------------------------------------------
-theApp = iService( "ApplicationMgr" )       # proxy
-theApp.Dlls += [ 'AthenaServices' ]
-include( "%s/Bootstrap.py" % preconfig )
-
-## create the application manager and start in a non-initialised state
-from AthenaCommon.AppMgr import theApp, ToolSvc, ServiceMgr, theAuditorSvc
-
-
-## basic job configuration
-include( "AthenaCommon/Atlas.UnixStandardJob.py" )
-include.block( "AthenaCommon/Atlas.UnixStandardJob.py" )
-
-
-EventLoopMgr = iService( 'EventLoopMgr' )
-AthenaEventLoopMgr = EventLoopMgr                       # for historic reasons
-
-### execution ----------------------------------------------------------------
-from AthenaCommon.ResourceLimits import SetMaxLimits
-SetMaxLimits()
-del SetMaxLimits
-
-include( sys.argv[1] )
-try:
-   theApp.run()     # runs until theApp.EvtMax events reached
-except RuntimeError, e:
-   print 'RuntimeError:', str(e)
-theApp.exit()    # exits program, yields theApp._exitstate on shell    
-

AtlasGeometryCommon/Interpreters/share/physh

-#!/usr/bin/env python
-import sys,os
-
-os.execvpe('athenash.py', sys.argv ,os.environ)

AtlasGeometryCommon/Interpreters/share/totalphysh

-#!/bin/bash
-totalview  python -a  `which athenash.py` $@
-
-

AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 """
 SubDetectorEnvelopes configurations for AtlasGeometryCommon
 Elmar Ritsch, 27/09/2013
 """
 
-def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
-    kwargs.setdefault("DBInDetNode"       , 'InDetEnvelope'    )
-    kwargs.setdefault("DBBeamPipeNode"    , 'BeamPipeEnvelope' )
-    kwargs.setdefault("DBCaloNode"        , 'CaloEnvelope'     )
-    kwargs.setdefault("DBMSNode"          , 'MuonEnvelope'     )
-    kwargs.setdefault("DBCavernNode"      , 'CavernEnvelope'   )
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaConfiguration.Enums import BeamType, LHCPeriod
+from AthenaConfiguration.AccumulatorCache import AccumulatorCache
+
+
+@AccumulatorCache
+def EnvelopeDefSvcCfg(flags, name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
+    result = ComponentAccumulator()
+
+    kwargs.setdefault("DBBeamPipeNode", 'BeamPipeEnvelope')
+    kwargs.setdefault("DBInDetNode"   , 'InDetEnvelope'
+                                        if flags.Beam.Type is BeamType.TestBeam or flags.GeoModel.Run < LHCPeriod.Run4
+                                        else 'ITkEnvelope')
+    kwargs.setdefault("DBCaloNode"    , 'CaloEnvelope'    )
+    kwargs.setdefault("DBMSNode"      , 'MuonEnvelope'    )
+    kwargs.setdefault("DBCavernNode"  , 'CavernEnvelope'  )
 
     # allow for python-based envelope definitions (see below)
     #  -> TODO: set this to False once the envelope definitions are tagged in the DDDB
@@ -18,13 +29,12 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
 
     # setup fallback BeamPipeEnvelope
     BeamPipe = Volume()
-    BeamPipe.addRZ(   34.3,   3475.0 )
-    from AthenaCommon.DetFlags import DetFlags
-    if hasattr(DetFlags.simulate, 'HGTD_on') and DetFlags.simulate.HGTD_on():
-        BeamPipe.addRZ(   47.0,   3475.0 )
-        BeamPipe.addRZ(   47.0,   3535.0 )
-        BeamPipe.addRZ(  120.0,   3535.0 )
+
+    if flags.Beam.Type is not BeamType.TestBeam and flags.GeoModel.Run >= LHCPeriod.Run4:
+        BeamPipe.addRZ(   28.8,   3545.0 )
+        BeamPipe.addRZ(  120.0,   3545.0 )
     else:
+        BeamPipe.addRZ(   34.3,   3475.0 )
         BeamPipe.addRZ(  120.0,   3475.0 )
     BeamPipe.addRZ(  120.0,   4185.0 )
     BeamPipe.addRZ(   41.0,   4185.0 )
@@ -45,21 +55,25 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
 
     # setup fallback IDEnvelope
     InDet = Volume()
-    InDet.addRZ( 1148.,  3475. )
-    InDet.addRZ(  34.3,  3475. )
+    # InDet should include HGTD when it's turned on
+    if flags.Beam.Type is not BeamType.TestBeam and flags.GeoModel.Run >= LHCPeriod.Run4:
+        InDet.addRZ( 1148.,  3545. )
+        InDet.addRZ(  28.8,  3545. )
+    else:
+        InDet.addRZ( 1148.,  3475. )
+        InDet.addRZ(  34.3,  3475. )
     kwargs.setdefault("FallbackInDetR"  , InDet.getRs()        )
     kwargs.setdefault("FallbackInDetZ"  , InDet.getZs()        )
 
 
     # setup fallback CaloEnvelope
     Calo = Volume()
-    Calo.addRZ( 1148.0,  3475.0 )
-    from AthenaCommon.DetFlags import DetFlags
-    if hasattr(DetFlags.simulate, 'HGTD_on') and DetFlags.simulate.HGTD_on():
-        Calo.addRZ(   47.0,  3475.0 )
-        Calo.addRZ(   47.0,  3535.0 )
-        Calo.addRZ(  120.0,  3535.0 )
+
+    if flags.Beam.Type is not BeamType.TestBeam and flags.GeoModel.Run >= LHCPeriod.Run4:
+        Calo.addRZ( 1148.0,  3545.0 )
+        Calo.addRZ(  120.0,  3545.0 )
     else:
+        Calo.addRZ( 1148.0,  3475.0 )
         Calo.addRZ(  120.0,  3475.0 )
     Calo.addRZ(  120.0,  4185.0 )
     Calo.addRZ(   41.0,  4185.0 )
@@ -121,8 +135,7 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     Cavern.addRZ(     0.0 , 26046.0 ) #
 
     # the outer dimesions differ between collision and cosmics jobs
-    from AthenaCommon.BeamFlags import jobproperties
-    if jobproperties.Beam.beamType() != 'cosmics':
+    if flags.Beam.Type is not BeamType.Cosmics:
       #  -> for collision jobs the 'cavern' envelope is much smaller
       Cavern.addRZ(      0.0 , 500000.0 ) # z= +500m
       Cavern.addRZ( 500000.0  , 500000.0 ) # r=  500m
@@ -135,8 +148,14 @@ def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
     kwargs.setdefault("FallbackCavernR"   , Cavern.getRs()        )
     kwargs.setdefault("FallbackCavernZ"   , Cavern.getZs()        )
 
-    from SubDetectorEnvelopes.SubDetectorEnvelopesConf import DetDescrDBEnvelopeSvc
-    return DetDescrDBEnvelopeSvc(name, **kwargs)
+    #set the GeoModelSvc
+    from AtlasGeoModel.GeoModelConfig import GeoModelCfg
+    acc = GeoModelCfg(flags)
+    kwargs.setdefault("GeoModelSvc", acc.getService("GeoModelSvc").getFullJobOptName())
+    result.merge(acc)
+
+    result.addService(CompFactory.DetDescrDBEnvelopeSvc(name, **kwargs),primary=True)
+    return result
 
 
 # class used for more readable definitions of envelope volumes
@@ -157,128 +176,3 @@ class Volume:
 
   def getZs(self):
     return self.z
-
-# For new configuration - doesn't have access to DetFlags as of writing, so all HGTD stuff is missing.
-# Just copied from above.
-
-#New configuration in SubDetectorEnvelopesConfigNew.py
-def EnvelopeDefSvc(flags,  **kwargs):
-    kwargs.setdefault("DBInDetNode"       , 'InDetEnvelope'    )
-    kwargs.setdefault("DBBeamPipeNode"    , 'BeamPipeEnvelope' )
-    kwargs.setdefault("DBCaloNode"        , 'CaloEnvelope'     )
-    kwargs.setdefault("DBMSNode"          , 'MuonEnvelope'     )
-    kwargs.setdefault("DBCavernNode"      , 'CavernEnvelope'   )
-
-    # allow for python-based envelope definitions (see below)
-    #  -> TODO: set this to False once the envelope definitions are tagged in the DDDB
-    kwargs.setdefault("EnableFallback"  , True             )
-
-    # setup fallback BeamPipeEnvelope
-    BeamPipe = Volume()
-    BeamPipe.addRZ(   34.3,   3475.0 )
-    BeamPipe.addRZ(  120.0,   3475.0 ) # TODO - re-add HGTD stuff once we can configure 
-    BeamPipe.addRZ(  120.0,   4185.0 )
-    BeamPipe.addRZ(   41.0,   4185.0 )
-    BeamPipe.addRZ(   41.0,   6783.0 )
-    BeamPipe.addRZ(   70.0,   6783.0 )
-    BeamPipe.addRZ(   70.0,  12900.0 )
-    BeamPipe.addRZ(  279.0,  12900.0 )
-    BeamPipe.addRZ(  279.0,  18650.0 )
-    BeamPipe.addRZ(  436.0,  18650.0 )
-    BeamPipe.addRZ(  436.0,  22030.0 )
-    BeamPipe.addRZ( 1050.0,  22030.0 )
-    BeamPipe.addRZ( 1050.0,  26046.0 )
-    BeamPipe.addRZ(    0.0,  26046.0 )
-
-    kwargs.setdefault("FallbackBeamPipeR"    ,  BeamPipe.getRs()        )
-    kwargs.setdefault("FallbackBeamPipeZ"    ,  BeamPipe.getZs()        )
-
-
-    # setup fallback IDEnvelope
-    InDet = Volume()
-    InDet.addRZ( 1148.,  3475. )
-    InDet.addRZ(  34.3,  3475. )
-    kwargs.setdefault("FallbackInDetR"  , InDet.getRs()        )
-    kwargs.setdefault("FallbackInDetZ"  , InDet.getZs()        )
-
-
-    # setup fallback CaloEnvelope
-    Calo = Volume()
-    Calo.addRZ( 1148.0,  3475.0 )
-    Calo.addRZ(  120.0,  3475.0 ) # TODO - re-add HGTD stuff once we can configure 
-    Calo.addRZ(  120.0,  4185.0 )
-    Calo.addRZ(   41.0,  4185.0 )
-    Calo.addRZ(   41.0,  6783.0 )
-    Calo.addRZ(  420.0,  6783.0 )
-    Calo.addRZ(  420.0,  6736.0 )
-    Calo.addRZ( 3800.0,  6736.0 )
-    Calo.addRZ( 3800.0,  6550.0 )
-    Calo.addRZ( 4255.0,  6550.0 )
-
-    kwargs.setdefault("FallbackCaloR"   , Calo.getRs()        )
-    kwargs.setdefault("FallbackCaloZ"   , Calo.getZs()        )
-
-
-    # setup fallback MuonEnvelope
-    Muon = Volume()
-    Muon.addRZ(  4255.0 ,  4000.0 )
-    Muon.addRZ(  4255.0 ,  6550.0 )
-    Muon.addRZ(  3800.0 ,  6550.0 )
-    Muon.addRZ(  3800.0 ,  6736.0 )
-    Muon.addRZ(   420.0 ,  6736.0 )
-    Muon.addRZ(   420.0 ,  6783.0 )
-    Muon.addRZ(    70.0 ,  6783.0 )
-    Muon.addRZ(    70.0 , 12900.0 )
-    Muon.addRZ(   279.0 , 12900.0 )
-    Muon.addRZ(   279.0 , 18650.0 )
-    Muon.addRZ(   436.7 , 18650.0 )
-    Muon.addRZ(   436.7 , 22030.0 )
-    Muon.addRZ(  1050.0 , 22030.0 )
-    Muon.addRZ(  1050.0 , 26046.0 )
-    Muon.addRZ(  1500.0 , 26046.0 )
-    Muon.addRZ(  1500.0 , 23001.0 )
-    Muon.addRZ(  2750.0 , 23001.0 )
-    Muon.addRZ(  2750.0 , 22030.0 )
-    Muon.addRZ( 12650.0 , 22030.0 )
-    Muon.addRZ( 12650.0 , 18650.0 )
-    Muon.addRZ( 13400.0 , 18650.0 )
-    Muon.addRZ( 13400.0 , 12900.0 )
-    Muon.addRZ( 14200.0 , 12900.0 )
-    Muon.addRZ( 14200.0 ,  4000.0 )
-    Muon.addRZ( 13000.0 ,  4000.0 )
-    kwargs.setdefault("FallbackMuonR"   , Muon.getRs()        )
-    kwargs.setdefault("FallbackMuonZ"   , Muon.getZs()        )
-
-
-    # setup fallback CavernEnvelope
-    Cavern = Volume()
-    Cavern.addRZ( 13000.0 , 4000.0 )
-    Cavern.addRZ( 14200.0 , 4000.0 )
-    Cavern.addRZ( 14200.0 , 12900.0 ) # boundary with MS
-    Cavern.addRZ( 13400.0 , 12900.0 ) # boundary with MS
-    Cavern.addRZ( 13400.0 , 18650.0 ) # boundary with MS
-    Cavern.addRZ( 12650.0 , 18650.0 ) # boundary with MS
-    Cavern.addRZ( 12650.0 , 22030.0 ) # boundary with MS
-    Cavern.addRZ(  2750.0 , 22030.0 ) # boundary with MS
-    Cavern.addRZ(  2750.0 , 23001.0 ) # boundary with MS
-    Cavern.addRZ(  1500.0 , 23001.0 ) # boundary with MS
-    Cavern.addRZ(  1500.0 , 26046.0 ) # boundary with MS
-    Cavern.addRZ(     0.0 , 26046.0 ) #
-
-    # the outer dimesions differ between collision and cosmics jobs
-    if flags.Beam.Type != 'cosmics':
-      #  -> for collision jobs the 'cavern' envelope is much smaller
-      Cavern.addRZ(      0.0 , 500000.0 ) # z= +500m
-      Cavern.addRZ( 500000.0  , 500000.0 ) # r=  500m
-    else:
-      #  -> for cosmics simulation the 'cavern' envelope spans much further
-      kwargs.setdefault("DBCavernNode"    , 'CavernEnvelopeNONE'   )
-      kwargs.setdefault("EnableFallback"  , True                   )
-      Cavern.addRZ(       0.0 , 3000000.0 ) # z= +3km
-      Cavern.addRZ( 3000000.0 , 3000000.0 ) # r=  3km
-    kwargs.setdefault("FallbackCavernR"   , Cavern.getRs()        )
-    kwargs.setdefault("FallbackCavernZ"   , Cavern.getZs()        )
-
-    from SubDetectorEnvelopes.SubDetectorEnvelopesConf import DetDescrDBEnvelopeSvc
-    return DetDescrDBEnvelopeSvc(**kwargs)
-    

AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-"""
-Configuration database for SubDetectorEnvelopes
-Elmar Ritsch, 27/09/2013
-"""
-
-from AthenaCommon.CfgGetter import addService
-
-# Common tools, services and algorithms used by jobs:
-addService("SubDetectorEnvelopes.SubDetectorEnvelopesConfig.getEnvelopeDefSvc", "AtlasGeometry_EnvelopeDefSvc")

AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigNew.py

-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-"""
-SubDetectorEnvelopes configurations for AtlasGeometryCommon
-Elmar Ritsch, 27/09/2013
-"""
-
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from AthenaConfiguration.ComponentFactory import CompFactory
-
-DetDescrDBEnvelopeSvc=CompFactory.DetDescrDBEnvelopeSvc
-
-def EnvelopeDefSvcCfg(ConfigFlags, name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
-    result = ComponentAccumulator()
-
-    kwargs.setdefault("DBInDetNode"       , 'InDetEnvelope'    )
-    kwargs.setdefault("DBBeamPipeNode"    , 'BeamPipeEnvelope' )
-    kwargs.setdefault("DBCaloNode"        , 'CaloEnvelope'     )
-    kwargs.setdefault("DBMSNode"          , 'MuonEnvelope'     )
-    kwargs.setdefault("DBCavernNode"      , 'CavernEnvelope'   )
-
-    # allow for python-based envelope definitions (see below)
-    #  -> TODO: set this to False once the envelope definitions are tagged in the DDDB
-    kwargs.setdefault("EnableFallback"  , True             )
-
-    # setup fallback BeamPipeEnvelope
-    BeamPipe = Volume()
-    BeamPipe.addRZ(   34.3,   3475.0 )
-
-    if ConfigFlags.Detector.SimulateHGTD:
-        BeamPipe.addRZ(   47.0,   3475.0 )
-        BeamPipe.addRZ(   47.0,   3535.0 )
-        BeamPipe.addRZ(  120.0,   3535.0 )
-    else:
-        BeamPipe.addRZ(  120.0,   3475.0 )
-    BeamPipe.addRZ(  120.0,   4185.0 )
-    BeamPipe.addRZ(   41.0,   4185.0 )
-    BeamPipe.addRZ(   41.0,   6783.0 )
-    BeamPipe.addRZ(   70.0,   6783.0 )
-    BeamPipe.addRZ(   70.0,  12900.0 )
-    BeamPipe.addRZ(  279.0,  12900.0 )
-    BeamPipe.addRZ(  279.0,  18650.0 )
-    BeamPipe.addRZ(  436.0,  18650.0 )
-    BeamPipe.addRZ(  436.0,  22030.0 )
-    BeamPipe.addRZ( 1050.0,  22030.0 )
-    BeamPipe.addRZ( 1050.0,  26046.0 )
-    BeamPipe.addRZ(    0.0,  26046.0 )
-
-    kwargs.setdefault("FallbackBeamPipeR"    ,  BeamPipe.getRs()        )
-    kwargs.setdefault("FallbackBeamPipeZ"    ,  BeamPipe.getZs()        )
-
-
-    # setup fallback IDEnvelope
-    InDet = Volume()
-    InDet.addRZ( 1148.,  3475. )
-    InDet.addRZ(  34.3,  3475. )
-    kwargs.setdefault("FallbackInDetR"  , InDet.getRs()        )
-    kwargs.setdefault("FallbackInDetZ"  , InDet.getZs()        )
-
-
-    # setup fallback CaloEnvelope
-    Calo = Volume()
-    Calo.addRZ( 1148.0,  3475.0 )
-
-    if ConfigFlags.Detector.SimulateHGTD:
-        Calo.addRZ(   47.0,  3475.0 )
-        Calo.addRZ(   47.0,  3535.0 )
-        Calo.addRZ(  120.0,  3535.0 )
-    else:
-        Calo.addRZ(  120.0,  3475.0 )
-    Calo.addRZ(  120.0,  4185.0 )
-    Calo.addRZ(   41.0,  4185.0 )
-    Calo.addRZ(   41.0,  6783.0 )
-    Calo.addRZ(  420.0,  6783.0 )
-    Calo.addRZ(  420.0,  6736.0 )
-    Calo.addRZ( 3800.0,  6736.0 )
-    Calo.addRZ( 3800.0,  6550.0 )
-    Calo.addRZ( 4255.0,  6550.0 )
-
-    kwargs.setdefault("FallbackCaloR"   , Calo.getRs()        )
-    kwargs.setdefault("FallbackCaloZ"   , Calo.getZs()        )
-
-
-    # setup fallback MuonEnvelope
-    Muon = Volume()
-    Muon.addRZ(  4255.0 ,  4000.0 )
-    Muon.addRZ(  4255.0 ,  6550.0 )
-    Muon.addRZ(  3800.0 ,  6550.0 )
-    Muon.addRZ(  3800.0 ,  6736.0 )
-    Muon.addRZ(   420.0 ,  6736.0 )
-    Muon.addRZ(   420.0 ,  6783.0 )
-    Muon.addRZ(    70.0 ,  6783.0 )
-    Muon.addRZ(    70.0 , 12900.0 )
-    Muon.addRZ(   279.0 , 12900.0 )
-    Muon.addRZ(   279.0 , 18650.0 )
-    Muon.addRZ(   436.7 , 18650.0 )
-    Muon.addRZ(   436.7 , 22030.0 )
-    Muon.addRZ(  1050.0 , 22030.0 )
-    Muon.addRZ(  1050.0 , 26046.0 )
-    Muon.addRZ(  1500.0 , 26046.0 )
-    Muon.addRZ(  1500.0 , 23001.0 )
-    Muon.addRZ(  2750.0 , 23001.0 )
-    Muon.addRZ(  2750.0 , 22030.0 )
-    Muon.addRZ( 12650.0 , 22030.0 )
-    Muon.addRZ( 12650.0 , 18650.0 )
-    Muon.addRZ( 13400.0 , 18650.0 )
-    Muon.addRZ( 13400.0 , 12900.0 )
-    Muon.addRZ( 14200.0 , 12900.0 )
-    Muon.addRZ( 14200.0 ,  4000.0 )
-    Muon.addRZ( 13000.0 ,  4000.0 )
-    kwargs.setdefault("FallbackMuonR"   , Muon.getRs()        )
-    kwargs.setdefault("FallbackMuonZ"   , Muon.getZs()        )
-
-
-    # setup fallback CavernEnvelope
-    Cavern = Volume()
-    Cavern.addRZ( 13000.0 , 4000.0 )
-    Cavern.addRZ( 14200.0 , 4000.0 )
-    Cavern.addRZ( 14200.0 , 12900.0 ) # boundary with MS
-    Cavern.addRZ( 13400.0 , 12900.0 ) # boundary with MS
-    Cavern.addRZ( 13400.0 , 18650.0 ) # boundary with MS
-    Cavern.addRZ( 12650.0 , 18650.0 ) # boundary with MS
-    Cavern.addRZ( 12650.0 , 22030.0 ) # boundary with MS
-    Cavern.addRZ(  2750.0 , 22030.0 ) # boundary with MS
-    Cavern.addRZ(  2750.0 , 23001.0 ) # boundary with MS
-    Cavern.addRZ(  1500.0 , 23001.0 ) # boundary with MS
-    Cavern.addRZ(  1500.0 , 26046.0 ) # boundary with MS
-    Cavern.addRZ(     0.0 , 26046.0 ) #
-
-    # the outer dimesions differ between collision and cosmics jobs
-    if ConfigFlags.Beam.Type != 'cosmics':
-      #  -> for collision jobs the 'cavern' envelope is much smaller
-      Cavern.addRZ(      0.0 , 500000.0 ) # z= +500m
-      Cavern.addRZ( 500000.0  , 500000.0 ) # r=  500m
-    else:
-      #  -> for cosmics simulation the 'cavern' envelope spans much further
-      kwargs.setdefault("DBCavernNode"    , 'CavernEnvelopeNONE'   )
-      kwargs.setdefault("EnableFallback"  , True                   )
-      Cavern.addRZ(       0.0 , 3000000.0 ) # z= +3km
-      Cavern.addRZ( 3000000.0 , 3000000.0 ) # r=  3km
-    kwargs.setdefault("FallbackCavernR"   , Cavern.getRs()        )
-    kwargs.setdefault("FallbackCavernZ"   , Cavern.getZs()        )
-
-    #set the GeoModelSvc
-    from AtlasGeoModel.GeoModelConfig import GeoModelCfg
-    acc = GeoModelCfg(ConfigFlags)
-    kwargs.setdefault("GeoModelSvc", acc.getService("GeoModelSvc"))
-    result.merge(acc)
-
-    result.addService(DetDescrDBEnvelopeSvc(name, **kwargs),primary=True)
-    return result
-
-
-# class used for more readable definitions of envelope volumes
-#  -> create new volume boundary definitions
-#  -> return the coordinate vectors in R and Z and VolumeID
-class Volume:
-  # initialize empy
-  def __init__(self):
-    self.r  = [ ]
-    self.z  = [ ]
-
-  def addRZ(self, r, z):
-    self.r  += [ r  ]
-    self.z  += [ z  ]
-
-  def getRs(self):
-    return self.r
-
-  def getZs(self):
-    return self.z

AtlasGeometryCommon/SubDetectorEnvelopes/share/postInclude.showEnvelopesGUI.py

-"""
-Visualize envelopes as defined in EnvelopeDefSvc
-Elmar Ritsch, 13/05/2016
-"""
-
-from AthenaCommon.CfgGetter import getService
-
-
-def draw_envelope(ax, rlist_half, zlist_half, color, label):
-
-    # mirror the given (r,z) values in the x-y plane
-    rlist = rlist_half[:]
-    zlist = zlist_half[:]
-    for r in reversed(rlist_half):
-        rlist.append(r)
-    for z in reversed(zlist_half):
-        zlist.append(-z)
-    rlist.append(rlist[0])
-    zlist.append(zlist[0])
-
-    area = Polygon(zip(zlist, rlist), alpha=0.5, closed=True, color=color, label=label, linewidth=0.)
-    ax.add_patch(area)
-
-
-if __name__ == "__main__":
-    import matplotlib
-    matplotlib.use('Qt4Agg') # use backend that supports GUI (rather than file output only)
-    import matplotlib.pyplot as plt
-    from matplotlib.patches import Polygon
-
-    svc = getService('AtlasGeometry_EnvelopeDefSvc')
-
-    fig, ax = plt.subplots(figsize=(20,10))
-
-    draw_envelope(ax, svc.FallbackBeamPipeR, svc.FallbackBeamPipeZ, 'r', label='BeamPipe')
-    draw_envelope(ax, svc.FallbackInDetR, svc.FallbackInDetZ, 'b', label='InDet')
-    draw_envelope(ax, svc.FallbackCaloR, svc.FallbackCaloZ, 'c', label='Calo')
-    draw_envelope(ax, svc.FallbackMuonR, svc.FallbackMuonZ, 'm', label='MS')
-    draw_envelope(ax, svc.FallbackCavernR, svc.FallbackCavernZ, 'k', label='Cavern')
-
-    ax.autoscale_view()
-    plt.ylabel('r  (mm)')
-    plt.xlabel('z  (mm)')
-    plt.legend()
-    plt.show(block=True)
-    exit(1)

AtlasGeometryCommon/SubDetectorEnvelopes/src/DetDescrDBEnvelopeSvc.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -18,7 +18,6 @@
 
 // Database includes
 #include "RDBAccessSvc/IRDBRecordset.h"
-#include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 
 // AtlasDetDescr
@@ -26,7 +25,7 @@
 
 // GeoModel
 #include "GeoModelInterfaces/IGeoModelSvc.h"
-
+#include "GeoModelInterfaces/IGeoDbTagSvc.h"
 
 /** Constructor */
 DetDescrDBEnvelopeSvc::DetDescrDBEnvelopeSvc(const std::string& name, ISvcLocator* svc) :
@@ -94,6 +93,10 @@ StatusCode DetDescrDBEnvelopeSvc::initialize()
   ATH_MSG_INFO("Initializing ...");
 
   // retrieve DataBase access service
+  ServiceHandle<IGeoDbTagSvc> geoDbTag("GeoDbTagSvc",name());
+  ATH_CHECK(geoDbTag.retrieve());
+
+  m_dbAccess.setName(geoDbTag->getParamSvcName());
   if ( m_dbAccess.retrieve().isFailure()) {
     ATH_MSG_ERROR("Could not locate RDBAccessSvc");
     if ( !enableFallback()) return StatusCode::FAILURE;
@@ -255,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;
@@ -283,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-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
+#################################################################################
+
+atlas_add_citest( SUSYTools_data18_PHYS
+   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.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/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_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_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"
+   )

AtlasTest/CITest/AthGeneration.cmake

+# 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
+#
+
+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 )
+
+atlas_add_citest( Generation_H7_13p6TeV
+   SCRIPT RunWorkflowTests_Run3.py --CI -g --dsid 421106 )
+
+atlas_add_citest( Generation_MGPy8_13p6TeV
+   SCRIPT RunWorkflowTests_Run3.py --CI -g --dsid 421107 )
+
+atlas_add_citest( Generation_Sherpa_13p6TeV
+   SCRIPT RunWorkflowTests_Run3.py --CI -g --dsid 421003 )
+
+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

+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+#
+# CI test definitions for the AthSimulation project
+# --> README.md before you modify this file
+#
+
+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
+   PROPERTIES PROCESSORS 4 )
+
+atlas_add_citest( SimulationRun2FullSimChecks
+   SCRIPT RunWorkflowTests_Run2.py --CI -s -w FullSim --checks-only --output-path ../SimulationRun2FullSim
+   LOG_IGNORE_PATTERN "WARNING FPE"  # ignore FPEs from Geant4
+   DEPENDS_SUCCESS SimulationRun2FullSim)
+
+atlas_add_citest( SimulationRun3FullSim
+   SCRIPT RunWorkflowTests_Run3.py --CI -s -w FullSim --threads 4 -e '--maxEvents 50' --run-only
+   LOG_IGNORE_PATTERN "WARNING FPE"  # ignore FPEs from Geant4
+   PROPERTIES PROCESSORS 4 )
+
+atlas_add_citest( SimulationRun3FullSimChecks
+   SCRIPT RunWorkflowTests_Run3.py --CI -s -w FullSim --checks-only --output-path ../SimulationRun3FullSim
+   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
+   PROPERTIES PROCESSORS 4 )
+
+atlas_add_citest( SimulationRun4FullSimChecks
+   SCRIPT RunWorkflowTests_Run4.py --CI -s -w FullSim --checks-only --output-path ../SimulationRun4FullSim
+   LOG_IGNORE_PATTERN "WARNING FPE"  # ignore FPEs from Geant4
+   DEPENDS_SUCCESS SimulationRun4FullSim )
+
+atlas_add_citest( SimulationRun3HitsMergeWithSort
+   SCRIPT RunWorkflowTests_Run3.py --CI -s -w HitsMerge -e '--inputHITSFile ../../SimulationRun3FullSim/run_s4006/myHITS.pool.root'  # go two levels up as the test runs in a subfolder
+   DEPENDS_SUCCESS SimulationRun3FullSim )
+
+atlas_add_citest( SimulationRun3HitsFilter
+   SCRIPT RunWorkflowTests_Run3.py --CI -s -w HitsFilter -e '--maxEvents 10')

AtlasTest/CITest/cmake/citest_pre.sh.in

+#!/usr/bin/bash
+#
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+#
+# Pre-exec script used for all CI tests
+#
+
+branch=${gitlabTargetBranch:-${AtlasBuildBranch}}
+if [ -n "${branch}" ]; then
+    url="https://gitlab.cern.ch/atlas/athena/-/tree/${branch}/AtlasTest/CITest"
+else
+    url="the AtlasTest/CITest package"
+fi
+
+# This time stamp is used by NICOS:
+echo "[CITest][${ATLAS_CTEST_TESTNAME}] start time: `date` (`date +%s.%N`)"
+echo "[CITest][${ATLAS_CTEST_TESTNAME}] on machine `hostname`"
+echo "[CITest][${ATLAS_CTEST_TESTNAME}] to run this test locally see ${url}"
+echo "----------------------------------------------------------"
+
+# Clean private working directory:
+if [ -n "@CI_WORKDIR@" ]; then
+    rm -rf "@CI_WORKDIR@"/*
+fi