AtlasGeometryCommon/CrackRegionGeoModel/CrackRegionGeoModel/CrackDMConstruction.h

+/*
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CRACKREGIONGEOMODEL_CRACKDMCONSTRUCTION_H
+#define CRACKREGIONGEOMODEL_CRACKDMCONSTRUCTION_H
+
+#include "AthenaBaseComps/AthMessaging.h"
+
+class IRDBAccessSvc;
+class IGeoModelSvc;
+class StoredMaterialManager;
+class GeoFullPhysVol;
+
+class CrackDMConstruction : public AthMessaging
+{
+ public:
+  CrackDMConstruction() = delete;
+  CrackDMConstruction(IRDBAccessSvc* rdbAccess
+		      , IGeoModelSvc* geoModel
+		      , StoredMaterialManager* materialManager
+		      , bool activateFT);
+  
+  void create(GeoFullPhysVol* envelope);
+
+ private:
+  IRDBAccessSvc*         m_rdbAccess{nullptr};
+  IGeoModelSvc*          m_geoModel{nullptr};
+  StoredMaterialManager* m_materialManager{nullptr};
+  bool                   m_activateFT{false};
+
+};
+
+#endif

AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt

-################################################################################
-# Package: GeoModelEnvelopes
-################################################################################
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( GeoModelEnvelopes )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          PRIVATE
-                          Control/SGTools
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel )
-
-find_package( GeoModel )
+# External dependencies:
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
 atlas_add_component( GeoModelEnvelopes
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES ${GEOMODEL_LIBRARIES} GeoModelUtilities SGTools StoreGateLib GaudiKernel )
-
-# Install files from the package:
-atlas_install_headers( GeoModelEnvelopes )
-
+		     INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities SGTools StoreGateLib )

AtlasGeometryCommon/GeoModelEnvelopes/GeoModelEnvelopes/ForDetEnvelopeManager.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ForDetEnvelopeManager_h
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-class ForDetEnvelopeManager : public GeoVDetectorManager  
+class ForDetEnvelopeManager : public GeoVDetectorManager
 {
  public:
 
@@ -22,19 +22,19 @@ class ForDetEnvelopeManager : public GeoVDetectorManager
 
   // Access to raw geometry:
   virtual unsigned int getNumTreeTops() const;
-  
+
   // Access to raw geometry:
   virtual PVConstLink getTreeTop(unsigned int i) const;
 
   // Add a Tree top:
-  void addTreeTop(PVLink);
+  void addTreeTop(const PVLink&);
 
- private:  
+ private:
 
   const ForDetEnvelopeManager & operator=(const ForDetEnvelopeManager &right);
   ForDetEnvelopeManager(const ForDetEnvelopeManager &right);
-  
-  std::vector<PVLink> m_volume;  
+
+  std::vector<PVLink> m_volume;
 
 };
 

AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeFactory.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 "ForDetEnvelopeFactory.h"
 
-#include "GeoModelInterfaces/AbsMaterialManager.h"
-#include "GeoModelKernel/GeoMaterial.h"  
-#include "GeoModelKernel/GeoTube.h"  
-#include "GeoModelKernel/GeoLogVol.h"  
-#include "GeoModelKernel/GeoNameTag.h"  
-#include "GeoModelKernel/GeoPhysVol.h"  
-#include "GeoModelKernel/GeoShapeShift.h"  
+#include "GeoModelInterfaces/StoredMaterialManager.h"
+#include "GeoModelKernel/GeoMaterial.h"
+#include "GeoModelKernel/GeoTube.h"
+#include "GeoModelKernel/GeoLogVol.h"
+#include "GeoModelKernel/GeoNameTag.h"
+#include "GeoModelKernel/GeoPhysVol.h"
+#include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/SystemOfUnits.h"
 
-#include "GeoModelInterfaces/StoredMaterialManager.h"
-
 #include <vector>
 
 
 ForDetEnvelopeFactory::ForDetEnvelopeFactory(StoreGateSvc *detStore)
-  : m_detectorManager(0),
-    m_materialManager(0),
+  : m_detectorManager(nullptr),
+    m_materialManager(nullptr),
     m_detectorStore(detStore)
 {
 }
 
-ForDetEnvelopeFactory::~ForDetEnvelopeFactory()
-{
-}
 
 void ForDetEnvelopeFactory::create(GeoPhysVol *world)
 {
-  const StoredMaterialManager * materialManagerTmp = 0;
-  if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManagerTmp, std::string("MATERIALS"))) {
-    return; 
-  } 
-  m_materialManager = materialManagerTmp;
-  
-  // Get the materials  
+  if (StatusCode::SUCCESS != m_detectorStore->retrieve(m_materialManager, std::string("MATERIALS"))) {
+    return;
+  }
+
+  // Get the materials
   const GeoMaterial* air = m_materialManager->getMaterial("std::Air");
 
   // Build boolean shape: union of two tubes
@@ -51,7 +44,7 @@ void ForDetEnvelopeFactory::create(GeoPhysVol *world)
 
   const GeoShapeShift& envShape1 = (*tube1)<<xfRelativeA;
   const GeoShapeUnion& envShape = envShape1.add((*tube2)<<xfRelativeC);
-  
+
   GeoLogVol* lvEnv = new GeoLogVol("ForDetEnvelope",&envShape,air);
   GeoPhysVol* pvEnv = new GeoPhysVol(lvEnv);
 

AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeFactory.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 ForDetEnvelopeFactory_h
-#define ForDetEnvelopeFactory_h 1
+#ifndef GEOMODELENVELOPES_FORDETENVELOPEFACTORY_H
+#define GEOMODELENVELOPES_FORDETENVELOPEFACTORY_H
 
 #include "GeoModelKernel/GeoVDetectorFactory.h"
 #include "GeoModelEnvelopes/ForDetEnvelopeManager.h"
 
 class StoreGateSvc;
-class AbsMaterialManager;
+class StoredMaterialManager;
 class GeoShape;
 
-class ForDetEnvelopeFactory : public GeoVDetectorFactory  
+class ForDetEnvelopeFactory final : public GeoVDetectorFactory
 {
  public:
-  
+
   // Constructor:
   ForDetEnvelopeFactory(StoreGateSvc *pDetStore);
-  
+
   // Destructor:
-  ~ForDetEnvelopeFactory();
-  
+  ~ForDetEnvelopeFactory() = default;
+
   // Creation of geometry:
-  virtual void create(GeoPhysVol *world);
-  
+  virtual void create(GeoPhysVol *world) override;
+
   // Access to the results:
-  virtual const ForDetEnvelopeManager * getDetectorManager() const;
-  
- private:  
+  virtual const ForDetEnvelopeManager * getDetectorManager() const override;
+
+ private:
 
   // Illegal operations:
   const ForDetEnvelopeFactory & operator=(const ForDetEnvelopeFactory &right);
   ForDetEnvelopeFactory(const ForDetEnvelopeFactory &right);
-  
+
   // The manager:
   ForDetEnvelopeManager*   m_detectorManager;
-   
-  const AbsMaterialManager* m_materialManager;
+
+  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"
@@ -10,12 +10,7 @@ ForDetEnvelopeManager::ForDetEnvelopeManager()
 }
 
 
-ForDetEnvelopeManager::~ForDetEnvelopeManager()
-{
-  for (unsigned int i = 0; i < m_volume.size(); i++) {
-    m_volume[i]->unref();
-  }
-}
+ForDetEnvelopeManager::~ForDetEnvelopeManager() = default;
 
 
 unsigned int ForDetEnvelopeManager::getNumTreeTops() const
@@ -28,9 +23,8 @@ PVConstLink ForDetEnvelopeManager::getTreeTop(unsigned int i) const
   return m_volume[i];
 }
 
-void  ForDetEnvelopeManager::addTreeTop(PVLink vol)
+void  ForDetEnvelopeManager::addTreeTop(const PVLink& vol)
 {
-  vol->ref();
   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-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

-################################################################################
-# Package: Interpreters
-################################################################################
-
-# 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.StatusCodeCheck = True
-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/CMakeLists.txt

-################################################################################
-# Package: SubDetectorEnvelopes
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( SubDetectorEnvelopes )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/AtlasDetDescr
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelInterfaces )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 
 # Component(s) in the package:
+atlas_add_library( SubDetectorEnvelopesLib
+                   INTERFACE
+                   PUBLIC_HEADERS SubDetectorEnvelopes
+                   LINK_LIBRARIES GaudiKernel AtlasDetDescr CxxUtils )
+
 atlas_add_component( SubDetectorEnvelopes
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AtlasDetDescr GaudiKernel AthenaBaseComps )
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GeoModelInterfaces RDBAccessSvcLib SubDetectorEnvelopesLib )
 
 # Install files from the package:
-atlas_install_headers( SubDetectorEnvelopes )
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

AtlasGeometryCommon/SubDetectorEnvelopes/SubDetectorEnvelopes/ATLAS_CHECK_THREAD_SAFETY

+AtlasGeometryCommon/SubDetectorEnvelopes

AtlasGeometryCommon/SubDetectorEnvelopes/SubDetectorEnvelopes/IEnvelopeDefSvc.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -17,6 +17,8 @@
 // SubDetectorEnvelopes includes
 #include "SubDetectorEnvelopes/RZPair.h"
 
+#include "CxxUtils/checker_macros.h"
+
 class IEnvelopeDefSvc : virtual public IInterface {
   /**
    @class IEnvelopeDefSvc
@@ -48,15 +50,6 @@ class IEnvelopeDefSvc : virtual public IInterface {
     const RZPairVector &getMuonRZBoundary()     const { return getRZBoundary(AtlasDetDescr::fAtlasMS);      }
     const RZPairVector &getCavernRZBoundary()   const { return getRZBoundary(AtlasDetDescr::fAtlasCavern);  }
 
-    /** legacy methods
-          Any client should update to use the methods defined above!
-          The following lecagy methods will be phased out once all clients have migrated to the new methods above */
-    RZPairVector &getBeamPipeRZValues( unsigned short = 0) const { return const_cast<RZPairVector&>( getRZBoundary(AtlasDetDescr::fAtlasForward) ); }
-    RZPairVector &getInDetRZValues( unsigned short = 0)    const { return const_cast<RZPairVector&>( getRZBoundary(AtlasDetDescr::fAtlasID) );      }
-    RZPairVector &getCaloRZValues( unsigned short = 0)     const { return const_cast<RZPairVector&>( getRZBoundary(AtlasDetDescr::fAtlasCalo) );    }
-    RZPairVector &getMuonRZValues( unsigned short = 0)     const { return const_cast<RZPairVector&>( getRZBoundary(AtlasDetDescr::fAtlasMS) );      }
-    RZPairVector &getCavernRZValues( unsigned short = 0)   const { return const_cast<RZPairVector&>( getRZBoundary(AtlasDetDescr::fAtlasCavern) );  }
-
   protected:
     /** mirror the given srcRZ RZPairVector in the XY-plane to describe all corner points
      in (r,z) space in the dstRZ RZPairVector */

AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py

-# Copyright (C) 2002-2017 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
 """
 
-from AthenaCommon.CfgGetter import getPrivateTool,getPrivateToolClone,getPublicTool,getPublicToolClone,\
-        getService,getServiceClone,getAlgorithm,getAlgorithmClone
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaConfiguration.Enums import BeamType, LHCPeriod
+from AthenaConfiguration.AccumulatorCache import AccumulatorCache
 
-from AthenaCommon.Constants import *  # FATAL,ERROR etc.
-from AthenaCommon.SystemOfUnits import *
-from AthenaCommon.DetFlags import DetFlags
 
-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'   )
+@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
@@ -25,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 )
@@ -52,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 )
@@ -128,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
@@ -142,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
@@ -164,129 +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
-    from AthenaCommon.BeamFlags import jobproperties
-    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-2017 CERN for the benefit of the ATLAS collaboration
-
-"""
-Configuration database for SubDetectorEnvelopes
-Elmar Ritsch, 27/09/2013
-"""
-
-from AthenaCommon.CfgGetter import addTool, addToolClone, addService, addAlgorithm, \
-     addTypesToExcludeIfDefaultValue, addNamesToExcludeIfDefaultValue, addFullNamesToExcludeIfDefaultValue, \
-     addPropertiesToExcludeIfDefault, \
-     addTypesToSkipIfNotAvailable, addNamesToSkipIfNotAvailable, addFullNamesToSkipIfNotAvailable, \
-     addTypesOnlyToSkip
-
-from AthenaCommon.Constants import *  # FATAL,ERROR etc.
-import AthenaCommon.SystemOfUnits as Units
-
-# 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 SubDetectorEnvelopes.SubDetectorEnvelopesConf import 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))
-    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
\ No newline at end of file

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)