AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.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 BeamPipeDetectorFactory_h
-#define BeamPipeDetectorFactory_h 1
+#ifndef BEAMPIPEGEOMODEL_BEAMPIPEDETECTORFACTORY_H
+#define BEAMPIPEGEOMODEL_BEAMPIPEDETECTORFACTORY_H
 
 #include "GeoModelKernel/GeoVDetectorFactory.h"
+#include "GeoModelUtilities/GeoRef.h"
 #include "BeamPipeGeoModel/BeamPipeDetectorManager.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include <string>
 
 class StoreGateSvc;
-class AbsMaterialManager;
+class StoredMaterialManager;
 class GeoShape;
 
-class BeamPipeDetectorFactory : public GeoVDetectorFactory  
+class BeamPipeDetectorFactory final : public GeoVDetectorFactory  
 {
  public:
   
@@ -26,13 +27,13 @@ class BeamPipeDetectorFactory : public GeoVDetectorFactory
   ~BeamPipeDetectorFactory();
   
   // Creation of geometry:
-  virtual void create(GeoPhysVol *world);
+  virtual void create(GeoPhysVol *world) override;
   
   // Access to the results:
-  virtual const BeamPipeDetectorManager * getDetectorManager() const;
+  virtual const BeamPipeDetectorManager * getDetectorManager() const override;
   
   // Set version Tag and Node
-  void setTagNode(std::string tag, std::string node);
+  void setTagNode(std::string tag, std::string node, std::string mode);
 
   void addSections(GeoPhysVol* parent, int region);
 
@@ -52,14 +53,15 @@ class BeamPipeDetectorFactory : public GeoVDetectorFactory
 
   class EnvelopeShapes {
   public:
-    EnvelopeShapes() : centralShape(0), fwdShape(0) {} 
-    GeoShape * centralShape;
-    GeoShape * fwdShape;
+    EnvelopeShapes() : centralShape(0), fwdShape(0), bpShape(0) {} 
+    GeoRef<GeoShape> centralShape;
+    GeoRef<GeoShape> fwdShape;
+    GeoRef<GeoShape> bpShape;
   };
 
 
-  EnvelopeShapes makeEnvelope(IRDBRecordset_ptr bpipeEnvelope);
-  EnvelopeShapes makeEnvelopeOld(IRDBRecordset_ptr atlasMother);
+  EnvelopeShapes makeEnvelope(const IRDBRecordset_ptr& bpipeEnvelope);
+  EnvelopeShapes makeEnvelopeOld(const IRDBRecordset_ptr& atlasMother);
 
 
   // Illegal operations:
@@ -69,12 +71,13 @@ class BeamPipeDetectorFactory : public GeoVDetectorFactory
   // The manager:
   BeamPipeDetectorManager     * m_detectorManager;
    
-  const AbsMaterialManager * m_materialManager;
+  StoredMaterialManager * m_materialManager;
 
   StoreGateSvc             * m_detectorStore;
   IRDBAccessSvc            * m_access;
   std::string              m_versionTag;
   std::string              m_versionNode;
+  std::string              m_mode;
 
   double m_centralRegionZMax;
 };

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory_Lite.cxx

+/*
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "BeamPipeDetectorFactory_Lite.h"
+
+#include "GeoModelKernel/GeoVolumeCursor.h"  
+#include "GeoModelKernel/GeoPhysVol.h"  
+#include "GeoModelKernel/GeoDefinitions.h"  
+
+
+
+BeamPipeDetectorFactory_Lite::BeamPipeDetectorFactory_Lite()
+  :m_manager(nullptr)
+{}
+
+
+void BeamPipeDetectorFactory_Lite::create(GeoPhysVol *world)
+{
+  m_manager=new BeamPipeDetectorManager();
+  GeoVolumeCursor cursor(world);
+  while (!cursor.atEnd()) {
+    if (cursor.getName()=="BeamPipe") m_manager->addTreeTop(cursor.getVolume());
+    cursor.next();
+  }
+}
+
+const BeamPipeDetectorManager * BeamPipeDetectorFactory_Lite::getDetectorManager() const
+{
+  return m_manager;
+}
+

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory_Lite.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef BEAMPIPEGEOMODEL_BEAMPIPEDETECTORFACTORY_LITE_H
+#define BEAMPIPEGEOMODEL_BEAMPIPEDETECTORFACTORY_LITE_H
+
+#include "GeoModelKernel/GeoVDetectorFactory.h"
+#include "BeamPipeGeoModel/BeamPipeDetectorManager.h"
+
+class BeamPipeDetectorFactory_Lite final : public GeoVDetectorFactory  
+{
+ public:
+  
+  // Constructor:
+  BeamPipeDetectorFactory_Lite();
+  
+  // Creation of geometry:
+  virtual void create(GeoPhysVol *world) override;
+  
+  // Access to the results:
+  virtual const BeamPipeDetectorManager * getDetectorManager() const override;
+  
+  // Illegal operations:
+  const BeamPipeDetectorFactory_Lite & operator=(const BeamPipeDetectorFactory_Lite &right) = delete;
+  BeamPipeDetectorFactory_Lite(const BeamPipeDetectorFactory_Lite &right) = delete;
+
+ private:  
+  // The manager:
+  BeamPipeDetectorManager* m_manager{nullptr};
+};
+
+// Class BeamPipeDetectorFactory_Lite 
+#endif
+
+

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorManager.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 "BeamPipeGeoModel/BeamPipeDetectorManager.h"
@@ -10,13 +10,7 @@ BeamPipeDetectorManager::BeamPipeDetectorManager()
 }
 
 
-BeamPipeDetectorManager::~BeamPipeDetectorManager()
-{
-  for (unsigned int i = 0; i < m_volume.size(); i++) {
-    m_volume[i]->unref();
-  }
-}
-
+BeamPipeDetectorManager::~BeamPipeDetectorManager() = default;
 
 unsigned int BeamPipeDetectorManager::getNumTreeTops() const
 {
@@ -28,9 +22,8 @@ PVConstLink BeamPipeDetectorManager::getTreeTop(unsigned int i) const
   return m_volume[i];
 }
 
-void  BeamPipeDetectorManager::addTreeTop(PVLink vol)
+void  BeamPipeDetectorManager::addTreeTop(const PVConstLink& vol)
 {
-  vol->ref();
   m_volume.push_back(vol);
 }
 

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.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 "BeamPipeDetectorTool.h"
-#include "BeamPipeDetectorFactory.h" 
-#include "BeamPipeGeoModel/BeamPipeDetectorManager.h" 
+#include "BeamPipeDetectorFactory.h"
+#include "BeamPipeDetectorFactory_Lite.h"
+#include "BeamPipeGeoModel/BeamPipeDetectorManager.h"
 
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/GeoModelExperiment.h"
 #include "GaudiKernel/IService.h"
 #include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/MsgStream.h"
 
 #include "StoreGate/StoreGateSvc.h"
 
@@ -18,86 +18,67 @@
 #include "AthenaKernel/ClassID_traits.h"
 #include "SGTools/DataProxy.h"
 
-BeamPipeDetectorTool::BeamPipeDetectorTool( const std::string& type, 
-					    const std::string& name, 
-					    const IInterface* parent ): 
-  GeoModelTool(type,name,parent),
-  m_manager(0)
-{
-}
+#include "GeoModelKernel/GeoVolumeCursor.h"
 
-BeamPipeDetectorTool::~BeamPipeDetectorTool()
+BeamPipeDetectorTool::BeamPipeDetectorTool( const std::string& type,
+					    const std::string& name,
+					    const IInterface* parent ):
+  GeoModelTool(type,name,parent)
 {
 }
 
+BeamPipeDetectorTool::~BeamPipeDetectorTool() = default;
 
-StatusCode BeamPipeDetectorTool::create()
-{ 
-  MsgStream log(msgSvc(), name()); 
 
-  log << MSG::INFO << "Building Beam Pipe" << endmsg;
+StatusCode BeamPipeDetectorTool::create()
+{
+  ATH_MSG_INFO("Building Beam Pipe");
 
-  IGeoDbTagSvc *geoDbTag;
-  StatusCode sc = service ("GeoDbTagSvc",geoDbTag);
-  if (sc.isFailure()) {
-    log << MSG::FATAL << "Could not locate GeoDbTagSvc" << endmsg;
-    return StatusCode::FAILURE;
-  }
-    
+  SmartIF<IGeoDbTagSvc> geoDbTag{Gaudi::svcLocator()->service("GeoDbTagSvc")};
+  ATH_CHECK(geoDbTag.isValid());
 
   std::string atlasVersion = geoDbTag->atlasVersion();
-  if(atlasVersion == "AUTO")
-    atlasVersion = "ATLAS-00";
   std::string versionNode = "ATLAS";
 
-  GeoModelExperiment * theExpt; 
-  if (StatusCode::SUCCESS != detStore()->retrieve( theExpt, "ATLAS" )) { 
-    log << MSG::ERROR 
-	<< "Could not find GeoModelExperiment ATLAS" 
-	<< endmsg; 
-    return (StatusCode::FAILURE); 
-  } 
-
-  if ( 0 == m_detector ) 
-  {
-    GeoPhysVol *world=&*theExpt->getPhysVol();
-
-    IRDBAccessSvc* raccess = 0;
-    sc = service("RDBAccessSvc",raccess);
-    if (sc.isFailure()) {
-      log << MSG::FATAL << "Could not locate RDBAccessSvc" << endmsg;
-      return StatusCode::FAILURE;
-    }
+  GeoModelExperiment* theExpt{nullptr};
+  ATH_CHECK(detStore()->retrieve(theExpt, "ATLAS"));
+
+  GeoPhysVol* world=theExpt->getPhysVol();
 
+  ServiceHandle<IRDBAccessSvc> accessSvc(geoDbTag->getParamSvcName(),name());
+  ATH_CHECK(accessSvc.retrieve());
+
+  GeoModelIO::ReadGeoModel* sqliteReader  = geoDbTag->getSqliteReader();
+  if (sqliteReader) {
+    BeamPipeDetectorFactory_Lite theBeamPipeFactory;
+    theBeamPipeFactory.create(world);
+    m_manager = theBeamPipeFactory.getDetectorManager();
+  }
+  else {
     // Check we have the beampipe and print its version
     // Print the  version tag:
     std::string beampipeVersionTag;
-    beampipeVersionTag = raccess->getChildTag("BeamPipe", atlasVersion,versionNode);
-    log << MSG::DEBUG << "Beampipe Version: " << beampipeVersionTag << endmsg;
+    beampipeVersionTag = accessSvc->getChildTag("BeamPipe", atlasVersion,versionNode);
+    ATH_MSG_DEBUG("Beampipe Version: " << beampipeVersionTag);
 
-
-    if (beampipeVersionTag.empty()) { 
-      log << MSG::INFO << "No BeamPipe Version. Beam pipe will not be built." << endmsg;
-      
-    } else {
-      
-      BeamPipeDetectorFactory theBeamPipeFactory(detStore().operator->(),raccess);
-      theBeamPipeFactory.setTagNode(atlasVersion,versionNode);
+    if (beampipeVersionTag.empty()) {
+      ATH_MSG_INFO("No BeamPipe Version. Beam pipe will not be built.");
+    }
+    else {
+      BeamPipeDetectorFactory theBeamPipeFactory(detStore().operator->(),accessSvc.operator->());
+      theBeamPipeFactory.setTagNode(atlasVersion,versionNode,m_mode);
       theBeamPipeFactory.create(world);
-
+      
       m_manager = theBeamPipeFactory.getDetectorManager();
-      theExpt->addManager(m_manager);
-      sc = detStore()->record(m_manager,
-			    m_manager->getName());
-    
-
-      if (sc.isFailure()) {
-	log << MSG::ERROR << "Could not register BeamPipe detector manager" << endmsg;
-	return (StatusCode::FAILURE); 
-      }
     }
+  }
+
+  if (m_manager) {
+    theExpt->addManager(m_manager);
+    ATH_CHECK(detStore()->record(m_manager,m_manager->getName()));
     return StatusCode::SUCCESS;
   }
+
   return StatusCode::FAILURE;
 }
 
@@ -106,7 +87,7 @@ StatusCode BeamPipeDetectorTool::clear()
   SG::DataProxy* proxy = detStore()->proxy(ClassID_traits<BeamPipeDetectorManager>::ID(),m_manager->getName());
   if(proxy) {
     proxy->reset();
-    m_manager = 0;
+    m_manager = nullptr;
   }
   return StatusCode::SUCCESS;
 }

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.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 BEAMPIPEDETECTORTOOL_H
-#define BEAMPIPEDETECTORTOOL_H
+#ifndef BEAMPIPEGEOMODEL_BEAMPIPEDETECTORTOOL_H
+#define BEAMPIPEGEOMODEL_BEAMPIPEDETECTORTOOL_H
 
 #include "GeoModelUtilities/GeoModelTool.h"
 class BeamPipeDetectorManager;
 
-class BeamPipeDetectorTool : public GeoModelTool 
+class BeamPipeDetectorTool final : public GeoModelTool 
 {
  public:
 
@@ -20,8 +20,13 @@ class BeamPipeDetectorTool : public GeoModelTool
 
   virtual StatusCode create() override final;
   virtual StatusCode clear() override final;
+
  private:
-  const BeamPipeDetectorManager* m_manager;
+  const BeamPipeDetectorManager* m_manager{nullptr};
+  StringProperty m_mode{this
+      , "BeamPipeMode"
+      , "BeamPipe"
+      , "Two modes: 'BeamPipe' default, 'AssemblyBeamPipe' activates implementation based on assembly volume"};
 };
 
 #endif 

AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py

 #!/usr/bin/env python
 """Run tests on BeamPipeGeoModel configuration
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == "__main__":
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior=1
-    from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
-    ConfigFlags.Detector.SimulatePixel = False
-    ConfigFlags.Detector.SimulateSCT   = False
-    ConfigFlags.Detector.SimulateTRT   = False
-    ConfigFlags.GeoModel.Align.Dynamic    = False
-    ConfigFlags.lock()
+    flags = initConfigFlags()
+    flags.Input.Files = defaultTestFiles.HITS_RUN2
+    flags.GeoModel.Align.Dynamic = False
+    flags.lock()
 
-    from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
     from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
-    acc = BeamPipeGeometryCfg(ConfigFlags)
-    f=open('BeamPipeGeometryCfg.pkl','w')
-    acc.store(f)
-    f.close()
+    acc = BeamPipeGeometryCfg(flags)
+    with open('BeamPipeGeometryCfg.pkl', 'wb') as f:
+        acc.store(f)

AtlasGeometryCommon/CavernInfraGeoModel/ATLAS_CHECK_THREAD_SAFETY

+AtlasGeometryCommon/CavernInfraGeoModel

AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt

-################################################################################
-# Package: CavernInfraGeoModel
-################################################################################
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( CavernInfraGeoModel )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( Eigen )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( GeoModel )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
 atlas_add_component( CavernInfraGeoModel
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} 
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} GeoModelUtilities StoreGateLib SGtests GaudiKernel )
-
-# Install files from the package:
-atlas_install_headers( CavernInfraGeoModel )
-
+                     INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities RDBAccessSvcLib StoreGateLib )

AtlasGeometryCommon/CavernInfraGeoModel/CavernInfraGeoModel/CavernInfraDetectorManager.h

-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef CavernInfraDetectorManager_h
-#define CavernInfraDetectorManager_h 1
-
-#include "GeoModelKernel/GeoVPhysVol.h"
-#include "GeoModelKernel/GeoVDetectorManager.h"
-#include <vector>
-
-class CavernInfraDetectorManager : public GeoVDetectorManager  
-{
- public:
-
-  // Constructor
-  CavernInfraDetectorManager();
-
-  // Destructor
-  ~CavernInfraDetectorManager();
-
-  // Access to raw geometry:
-  virtual unsigned int getNumTreeTops() const;
-  virtual PVConstLink getTreeTop(unsigned int i) const;
- 
-  void addTreeTop(PVLink);      // Add a Tree top:
-
- private:  
-
-  const CavernInfraDetectorManager & operator=(const CavernInfraDetectorManager &right);
-  CavernInfraDetectorManager(const CavernInfraDetectorManager &right);
-  
-  // Tree Tops
-  std::vector<PVLink> m_treeTops;
-};
-
-#ifndef GAUDI_NEUTRAL
-#include "AthenaKernel/CLASS_DEF.h" 
-CLASS_DEF(CavernInfraDetectorManager, 1500000300, 1)
-#endif
-
-#endif
-
-

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.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 CavernInfraDetectorFactory_h
-#define CavernInfraDetectorFactory_h 1
+#ifndef CAVERNINFRAGEOMODEL_CAVERNINFRADETECTORFACTORY_H
+#define CAVERNINFRAGEOMODEL_CAVERNINFRADETECTORFACTORY_H
 
+#include "CavernInfraDetectorManager.h"
 #include "GeoModelKernel/GeoVDetectorFactory.h"
-#include "CavernInfraGeoModel/CavernInfraDetectorManager.h"
+#include "StoreGate/StoreGateSvc.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
-#include <string>
 
-class StoreGateSvc;
+#include <string>
 
-class CavernInfraDetectorFactory : public GeoVDetectorFactory  
+class CavernInfraDetectorFactory : public GeoVDetectorFactory
 {
  public:
-  
   // Constructor:
-  CavernInfraDetectorFactory(StoreGateSvc *pDetStore,
-			     IRDBAccessSvc *pAccess);
-  
+  CavernInfraDetectorFactory(ServiceHandle<StoreGateSvc> pDetStore,
+			     ServiceHandle<IRDBAccessSvc> pAccess);
+
+  // Illegal operations:
+  const CavernInfraDetectorFactory & operator=(const CavernInfraDetectorFactory &right) = delete;
+  CavernInfraDetectorFactory(const CavernInfraDetectorFactory &right) = delete;
+
   // Destructor:
-  ~CavernInfraDetectorFactory();
-  
+  ~CavernInfraDetectorFactory() = default;
+
   // Creation of geometry:
-  virtual void create(GeoPhysVol *world);
-  
+  virtual void create(GeoPhysVol *world) override;
+
   // Access to the results:
-  virtual const CavernInfraDetectorManager * getDetectorManager() const;
-  
+  virtual const CavernInfraDetectorManager* getDetectorManager() const override;
+
   // Set version Tag and Node
-  void setTagNode(std::string tag, std::string node);
+  void setTagNode(const std::string& tag, const std::string& node);
 
- private:  
-  // Illegal operations:
-  const CavernInfraDetectorFactory & operator=(const CavernInfraDetectorFactory &right);
-  CavernInfraDetectorFactory(const CavernInfraDetectorFactory &right);
-  
+ private:
   // The manager:
-  CavernInfraDetectorManager       *m_detectorManager;
-  
-  StoreGateSvc             *m_detectorStore;
-  IRDBAccessSvc            *m_access;
+  CavernInfraDetectorManager*  m_detectorManager{nullptr};
+
+  ServiceHandle<StoreGateSvc>  m_detectorStore;
+  ServiceHandle<IRDBAccessSvc> m_access;
   std::string              m_versionTag;
   std::string              m_versionNode;
 };
 
-// Class CavernInfraDetectorFactory 
+// Class CavernInfraDetectorFactory
 #endif
 
-

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h

-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef CavernInfraDetectorFactory01_h
-#define CavernInfraDetectorFactory01_h 1
-
-#include "GeoModelKernel/GeoVDetectorFactory.h"
-#include "CavernInfraGeoModel/CavernInfraDetectorManager.h"
-#include "RDBAccessSvc/IRDBAccessSvc.h"
-#include <string>
-
-class StoreGateSvc;
-
-class CavernInfraDetectorFactory01 : public GeoVDetectorFactory  
-{
- 
- public:
-  
-  // Constructor:
-  CavernInfraDetectorFactory01(StoreGateSvc *pDetStore,
-			  IRDBAccessSvc *pAccess);
-  
-  // Destructor:
-  ~CavernInfraDetectorFactory01();
-  
-  // Creation of geometry:
-  virtual void create(GeoPhysVol *world);
-  
-  // Access to the results:
-  virtual const CavernInfraDetectorManager * getDetectorManager() const;
-  
-  // Set version Tag and Node
-  void setTagNode(std::string tag, std::string node);
-
- 
- private:  
-  // Illegal operations:
-  const CavernInfraDetectorFactory01 & operator=(const CavernInfraDetectorFactory01 &right);
-  CavernInfraDetectorFactory01(const CavernInfraDetectorFactory01 &right);
-  
-  // The manager:
-  CavernInfraDetectorManager       *m_detectorManager;
-  
-  StoreGateSvc             *m_detectorStore;
-  IRDBAccessSvc            *m_access;
-  std::string              m_versionTag;
-  std::string              m_versionNode;
-};
-
-// Class CavernInfraDetectorFactory01 
-#endif
-
-

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorManager.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 "CavernInfraGeoModel/CavernInfraDetectorManager.h"
+#include "CavernInfraDetectorManager.h"
 
 CavernInfraDetectorManager::CavernInfraDetectorManager()
 {
@@ -10,11 +10,7 @@ CavernInfraDetectorManager::CavernInfraDetectorManager()
 }
 
 
-CavernInfraDetectorManager::~CavernInfraDetectorManager()
-{
-  for(unsigned int i=0; i<m_treeTops.size(); i++)
-    m_treeTops[i]->unref();
-}
+CavernInfraDetectorManager::~CavernInfraDetectorManager() = default;
 
 
 unsigned int CavernInfraDetectorManager::getNumTreeTops() const
@@ -27,12 +23,11 @@ PVConstLink CavernInfraDetectorManager::getTreeTop(unsigned int i) const
   if(i<m_treeTops.size())
     return m_treeTops[i];
   else
-    return 0;
+    return nullptr;
 }
 
-void  CavernInfraDetectorManager::addTreeTop(PVLink link) 
+void  CavernInfraDetectorManager::addTreeTop(const PVLink& link)
 {
-  link->ref();
   m_treeTops.push_back(link);
 }
 

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorManager.h

+/*
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CAVERNINFRAGEOMODEL_CAVERNINFRADETECTORMANAGER_H
+#define CAVERNINFRAGEOMODEL_CAVERNINFRADETECTORMANAGER_H
+
+#include "GeoModelKernel/GeoVPhysVol.h"
+#include "GeoModelKernel/GeoVDetectorManager.h"
+#include <vector>
+
+class CavernInfraDetectorManager : public GeoVDetectorManager
+{
+ public:
+  CavernInfraDetectorManager();
+
+  const CavernInfraDetectorManager & operator=(const CavernInfraDetectorManager &right) = delete;
+  CavernInfraDetectorManager(const CavernInfraDetectorManager &right) = delete;
+
+  ~CavernInfraDetectorManager();
+
+  // Access to raw geometry:
+  virtual unsigned int getNumTreeTops() const override;
+  virtual PVConstLink getTreeTop(unsigned int i) const override;
+
+  void addTreeTop(const PVLink&);      // Add a Tree top:
+
+ private:
+  // Tree Tops
+  std::vector<PVLink> m_treeTops;
+};
+
+#ifndef GAUDI_NEUTRAL
+#include "AthenaKernel/CLASS_DEF.h"
+CLASS_DEF(CavernInfraDetectorManager, 1500000300, 1)
+#endif
+
+#endif
+
+

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.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 "CavernInfraDetectorTool.h"
-#include "CavernInfraDetectorFactory.h" 
-#include "CavernInfraDetectorFactory01.h" 
-#include "CavernInfraGeoModel/CavernInfraDetectorManager.h" 
+#include "CavernInfraDetectorFactory.h"
+#include "CavernInfraDetectorManager.h"
 
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/GeoModelExperiment.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 
-CavernInfraDetectorTool::CavernInfraDetectorTool( const std::string& type, 
+
+CavernInfraDetectorTool::CavernInfraDetectorTool( const std::string& type,
 						  const std::string& name,
 						  const IInterface* parent )
-  : GeoModelTool( type, name, parent ),
-    m_manager(0)
+  : GeoModelTool( type, name, parent )
 {
 }
 
-CavernInfraDetectorTool::~CavernInfraDetectorTool()
-{
-}
-  
-
 StatusCode CavernInfraDetectorTool::create()
-{ 
-  IGeoDbTagSvc *geoDbTag;
-  StatusCode sc = service ("GeoDbTagSvc",geoDbTag);
-  if(sc.isFailure()) {
-    msg(MSG::ERROR) << "Could not locate GeoDbTagSvc" << endmsg;
-    return sc;
-  }
+{
+  ServiceHandle<IGeoDbTagSvc> geoDbTag("GeoDbTagSvc", name());
+  ATH_CHECK(geoDbTag.retrieve());
 
   std::string cavernInfraVersion = geoDbTag->cavernInfraVersion();
-  msg(MSG::INFO) << "Building Cavern geometry version " << cavernInfraVersion << endmsg;
   if(cavernInfraVersion.empty()) {
-    msg(MSG::INFO) << "No Cavern Infra version for the given configuration. Skip building CavernInfraGeoModel" << endmsg;
+    ATH_MSG_INFO("No Cavern Infra version for the given configuration. Skip building CavernInfraGeoModel");
     return StatusCode::SUCCESS;
   }
+  else {
+    ATH_MSG_INFO("Building Cavern geometry version " << cavernInfraVersion);
+  }
 
   std::string versionNode = "CavernInfra";
 
   GeoModelExperiment* theExpt = nullptr;
-  if (StatusCode::SUCCESS != detStore()->retrieve(theExpt,"ATLAS")) { 
-    msg(MSG::ERROR) << "Could not find GeoModelExperiment ATLAS" << endmsg; 
-    return StatusCode::FAILURE; 
-  } 
- 
-  GeoPhysVol *world=&*theExpt->getPhysVol();
-  IRDBAccessSvc* raccess = 0;
-  sc = service("RDBAccessSvc",raccess);
-  if(sc.isFailure()) {
-    msg(MSG::ERROR) << "Could not locate RDBAccessSvc" << endmsg;
-    return sc;
-  }
+  ATH_CHECK(detStore()->retrieve(theExpt,"ATLAS"));
 
-  if(cavernInfraVersion.find("CavernInfra")==0) {
-    std::string geoVersion = cavernInfraVersion.substr(12,2);
-    if(geoVersion=="00" || geoVersion=="01") {
-      msg(MSG::ERROR) << "ERROR. Version " << cavernInfraVersion << " is obsolete and cannot be supported anymore" << endmsg;
-      return StatusCode::FAILURE;
-    }
-    else if(geoVersion=="02") {
-      // This factory is chosen by CavernInfra-02 tag, but in fact it uses data from CavernInfra-01
-      CavernInfraDetectorFactory01 theCavernInfraFactory01(detStore().operator->(),raccess);
-      theCavernInfraFactory01.setTagNode(cavernInfraVersion,versionNode);
-      theCavernInfraFactory01.create(world);
-      m_manager = theCavernInfraFactory01.getDetectorManager();
-    }
-  }
+  GeoPhysVol *world=theExpt->getPhysVol();
+  ServiceHandle<IRDBAccessSvc> raccess("RDBAccessSvc",name());
+  ATH_CHECK(raccess.retrieve());
 
   if(!m_manager) {
-    // If geometry has not been built yet fall back to the default factory
-    CavernInfraDetectorFactory theCavernInfraFactory(detStore().operator->(),raccess);
+    CavernInfraDetectorFactory theCavernInfraFactory(detStore(),raccess);
     theCavernInfraFactory.setTagNode(cavernInfraVersion,versionNode);
     theCavernInfraFactory.create(world);
     m_manager = theCavernInfraFactory.getDetectorManager();
@@ -81,15 +50,10 @@ StatusCode CavernInfraDetectorTool::create()
 
   if(m_manager) {
     theExpt->addManager(m_manager);
-    sc = detStore()->record(m_manager,
-			  m_manager->getName());
-    if(sc.isFailure()) {
-      msg(MSG::ERROR) << "Could not register CavernInfra detector manager" << endmsg;
-      return sc;
-    }
+    ATH_CHECK(detStore()->record(m_manager,m_manager->getName()));
   }
   else {
-    msg(MSG::ERROR) << "ERROR. Failed to build Cavern Version " << cavernInfraVersion << endmsg;
+    ATH_MSG_ERROR("ERROR. Failed to build Cavern Version " << cavernInfraVersion);
     return StatusCode::FAILURE;
   }
 
@@ -101,7 +65,7 @@ StatusCode CavernInfraDetectorTool::clear()
   SG::DataProxy* proxy = detStore()->proxy(ClassID_traits<CavernInfraDetectorManager>::ID(),m_manager->getName());
   if(proxy) {
     proxy->reset();
-    m_manager = 0;
+    m_manager = nullptr;
   }
   return StatusCode::SUCCESS;
 }

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.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 CAVERNINFRADETECTORTOOL_H
-#define CAVERNINFRADETECTORTOOL_H
+#ifndef CAVERNINFRAGEOMODEL_CAVERNINFRADETECTORTOOL_H
+#define CAVERNINFRAGEOMODEL_CAVERNINFRADETECTORTOOL_H
 
 #include "GeoModelUtilities/GeoModelTool.h"
 class CavernInfraDetectorManager;
 
-class CavernInfraDetectorTool : public GeoModelTool 
+class CavernInfraDetectorTool final : public GeoModelTool
 {
  public:
-
-  // Standard Constructor
   CavernInfraDetectorTool( const std::string& type, const std::string& name, const IInterface* parent );
+  ~CavernInfraDetectorTool() = default;
 
-  // Standard Destructor
-  virtual ~CavernInfraDetectorTool() override final;
+  virtual StatusCode create() override;
+  virtual StatusCode clear() override;
 
-  virtual StatusCode create() override final;
-  virtual StatusCode clear() override final;
-  
  private:
-  const CavernInfraDetectorManager* m_manager;
+  const CavernInfraDetectorManager* m_manager{nullptr};
 };
 
-#endif 
+#endif

AtlasGeometryCommon/CrackRegionGeoModel/CMakeLists.txt

+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package name.
+atlas_subdir( CrackRegionGeoModel )
+
+find_package( GeoModel COMPONENTS GeoModelKernel GeoModelDBManager GeoModelRead)
+
+# Component(s) in the package.
+atlas_add_library( CrackRegionGeoModel
+		   src/*.cxx
+		   PUBLIC_HEADERS CrackRegionGeoModel
+		   INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
+		   LINK_LIBRARIES ${GEOMODEL_LIBRARIES}
+		   PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelUtilities StoreGateLib RDBAccessSvcLib )
+

AtlasGeometryCommon/CrackRegionGeoModel/CrackRegionGeoModel/ATLAS_CHECK_THREAD_SAFETY

+AtlasGeometryCommon/CrackRegionGeoModel
\ No newline at end of file