AsgExternal/Asg_Test/cmt/TestFileLiteR3Data.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6482/data23_13p6TeV.00456749.physics_Main.deriv.DAOD_PHYSLITE.r15774_p6304_p6482/DAOD_PHYSLITE.41588921._000002.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteR3MC.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6491/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.deriv.DAOD_PHYSLITE.e8514_e8528_s4162_s4114_r15540_r15516_p6491/DAOD_PHYSLITE.41633384._000941.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteR3MCFastSim.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6491/mc23_13p6TeV.522036.aMCPy8EG_NNPDF30NLO_A14N23LO_ttZqq_run3.deriv.DAOD_PHYSLITE.e8558_e8528_a911_s4114_r15224_r15225_p6491/DAOD_PHYSLITE.41633196._000004.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileMC.txt

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/DAOD_PHYSVAL/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.DAOD_PHYSVAL.e5458_s3126_r9364_r9315_AthDerivation-21.2.1.0.root
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6490/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYS.e6337_s3681_r13167_r13146_p6490/DAOD_PHYS.41651753._000001.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileMCAFII.txt

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/DAOD_PHYSVAL/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.DAOD_PHYSVAL.e4993_s3189_r9524_AthDerivation-21.2.1.0.root

AsgExternal/Asg_Test/cmt/TestFileMCFastSim.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6490/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYS.e6337_e5984_a907_r14861_r14919_p6490/DAOD_PHYS.41651843._000006.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileR3Data.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6482/data23_13p6TeV.00456749.physics_Main.deriv.DAOD_PHYS.r15774_p6304_p6482/DAOD_PHYS.41588921._000003.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileR3MC.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6491/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.deriv.DAOD_PHYS.e8514_e8528_s4162_s4114_r15540_r15516_p6491/DAOD_PHYS.41633384._000880.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileR3MCFastSim.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6491/mc23_13p6TeV.522036.aMCPy8EG_NNPDF30NLO_A14N23LO_ttZqq_run3.deriv.DAOD_PHYS.e8558_e8528_a911_s4114_r15224_r15225_p6491/DAOD_PHYS.41633196._000006.pool.root.1

AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/ATLAS_CHECK_THREAD_SAFETY

+AtlasGeometryCommon/BeamPipeGeoModel

AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorManager.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 BeamPipeDetectorManager_h
-#define BeamPipeDetectorManager_h 1
+#ifndef BEAMPIPEGEOMODEL_BEAMPIPEDETECTORMANAGER_H
+#define BEAMPIPEGEOMODEL_BEAMPIPEDETECTORMANAGER_H
 
 #include "GeoModelKernel/GeoVPhysVol.h"
 #include "GeoModelKernel/GeoVDetectorManager.h"
@@ -27,15 +27,14 @@ class BeamPipeDetectorManager : public GeoVDetectorManager
   virtual PVConstLink getTreeTop(unsigned int i) const;
 
   // Add a Tree top:
-  void addTreeTop(PVLink);
+  void addTreeTop(const PVConstLink&);
 
  private:  
 
   const BeamPipeDetectorManager & operator=(const BeamPipeDetectorManager &right);
   BeamPipeDetectorManager(const BeamPipeDetectorManager &right);
   
-  std::vector<PVLink> m_volume;  
-
+  std::vector<PVConstLink> m_volume;  
 };
 
 #ifndef GAUDI_NEUTRAL

AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( BeamPipeGeoModel )
 
 # External dependencies:
-find_package( GeoModelCore )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
 atlas_add_library( BeamPipeGeoModelLib
                    src/*.cxx
                    PUBLIC_HEADERS BeamPipeGeoModel
-                   LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities
+		   INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GeoModelUtilities
                    PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces RDBAccessSvcLib SGTools StoreGateLib )
 
 atlas_add_component( BeamPipeGeoModel
@@ -20,7 +21,7 @@ atlas_add_component( BeamPipeGeoModel
 # Test(s) in the package:
 atlas_add_test( BeamPipeGMConfig_test
                 SCRIPT test/BeamPipeGMConfig_test.py
-                PROPERTIES TIMEOUT 300 )
+                POST_EXEC_SCRIPT nopost.sh )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "BeamPipeDetectorFactory.h"
@@ -27,21 +27,21 @@
 #include "GaudiKernel/SystemOfUnits.h"
 
 #include <iomanip>
+#include <utility>
 #include <vector>
 
 
 BeamPipeDetectorFactory::BeamPipeDetectorFactory(StoreGateSvc *detStore,
 						 IRDBAccessSvc *pAccess)
-  :m_detectorManager(0),
-   m_materialManager(0),
+  :m_detectorManager(nullptr),
+   m_materialManager(nullptr),
    m_detectorStore(detStore),
    m_access(pAccess),
    m_centralRegionZMax(1500*Gaudi::Units::mm)
 {}
 
 BeamPipeDetectorFactory::~BeamPipeDetectorFactory()
-{
-}
+= default;
 
 void BeamPipeDetectorFactory::create(GeoPhysVol *world)
 {
@@ -66,6 +66,11 @@ void BeamPipeDetectorFactory::create(GeoPhysVol *world)
   m_centralRegionZMax = 1500 * Gaudi::Units::mm; // For backward compatibility in DB.
   if (bpipeGeneral->size() != 0) m_centralRegionZMax = (*bpipeGeneral)[0]->getDouble("CENTRALZMAX") * Gaudi::Units::mm;
 
+  const GeoMaterial* ether = m_materialManager->getMaterial("special::Ether");
+  GeoTube* dummytube= new GeoTube(0., 4711., 4711.);
+  GeoLogVol* dummyBeamPipe = new GeoLogVol("BeamPipe",dummytube,ether);
+  GeoRef<GeoPhysVol> theBeamPipe (new GeoPhysVol(dummyBeamPipe));
+
   EnvelopeShapes envelopes;
 
   if (bpipeEnvelope->size() != 0) {
@@ -103,26 +108,49 @@ void BeamPipeDetectorFactory::create(GeoPhysVol *world)
     beamz = (*bpipePosition)[0]->getDouble("POSZ") * Gaudi::Units::mm;
   }
 
-  // Only shift the central section
-
-  // Central
-  world->add(tag);
-  world->add(new GeoTransform(GeoTrf::Translate3D(beamx,beamy,beamz)));
-  world->add(pvMotherCentral);
-  m_detectorManager->addTreeTop(pvMotherCentral);                                                                  //
-
-  // FwdPlus
-  world->add(tag);
-  world->add(pvMotherFwdPlus);
-  m_detectorManager->addTreeTop(pvMotherFwdPlus);
-
-  // FwdMinus
-  world->add(tag);
-  world->add(new GeoTransform(GeoTrf::RotateY3D(180*Gaudi::Units::degree)));
-  world->add(pvMotherFwdMinus);
-  m_detectorManager->addTreeTop(pvMotherFwdMinus);
-
-
+  if (m_mode=="AssemblyBeamPipe"){
+    // Only shift the central section
+    // Central
+    theBeamPipe->add(tag);
+    theBeamPipe->add(new GeoTransform(GeoTrf::Translate3D(beamx,beamy,beamz)));
+    theBeamPipe->add(pvMotherCentral);
+
+    // FwdPlus
+    theBeamPipe->add(tag);
+    theBeamPipe->add(pvMotherFwdPlus);
+
+    // FwdMinus
+    theBeamPipe->add(tag);
+    theBeamPipe->add(new GeoTransform(GeoTrf::RotateY3D(180*Gaudi::Units::degree)));
+    theBeamPipe->add(pvMotherFwdMinus);
+
+    const GeoShape *shape = envelopes.bpShape;
+    GeoLogVol* lvMother = new GeoLogVol("BeamPipe",shape,air);
+    GeoPhysVol* pvMother = new GeoPhysVol(lvMother);
+    pvMother->add(tag);
+    pvMother->add(theBeamPipe);
+
+    world->add(tag);
+    world->add(pvMother);
+    m_detectorManager->addTreeTop(pvMother);
+  }
+  else{
+    // Default beam pipe, union of central and forward beampipes rather than assembly volume
+    // Central
+    world->add(tag);
+    world->add(new GeoTransform(GeoTrf::Translate3D(beamx,beamy,beamz)));
+    world->add(pvMotherCentral);
+    m_detectorManager->addTreeTop(pvMotherCentral);                                                                  //
+    // FwdPlus
+    world->add(tag);
+    world->add(pvMotherFwdPlus);
+    m_detectorManager->addTreeTop(pvMotherFwdPlus);
+    // FwdMinus
+    world->add(tag);
+    world->add(new GeoTransform(GeoTrf::RotateY3D(180*Gaudi::Units::degree)));
+    world->add(pvMotherFwdMinus);
+    m_detectorManager->addTreeTop(pvMotherFwdMinus);
+  }
 }
 
 void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
@@ -134,7 +162,7 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
 
   // Sections 2 & 3 are placed in section 1. 
   // pvMotherSection will point to section 1.
-  GeoPhysVol* pvMotherSection = 0;
+  GeoPhysVol* pvMotherSection = nullptr;
   bool addToFirstSection = true;
   double rminSec1 = 0;
   double rmaxSec1 = 0;
@@ -205,7 +233,7 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
     }
 
     const GeoMaterial* mat = m_materialManager->getMaterial(material);
-    if (mat == 0) {
+    if (mat == nullptr) {
       // For backward compatibility - older geometry versions didn't specify the
       // material namespace
       // std::cout << "Material """ << material << """ not found. Trying  std::" << material << std::endl;
@@ -213,8 +241,7 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
     }
 
     GeoLogVol* lvSection = new GeoLogVol(name,shape,mat);
-    GeoPhysVol* pvSection = new GeoPhysVol(lvSection);
-    pvSection->ref();
+    GeoIntrusivePtr<GeoPhysVol> pvSection{new GeoPhysVol(lvSection)};
     
     // Determine if this is a geometry where the first section can act as the mother of the following
     // sections. The following sections are only added to this if their ave radius is within the radial
@@ -235,10 +262,9 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
     }
 	     
 
-    GeoTransform* tfSection = 0;
+    GeoTransform* tfSection = nullptr;
     if (znew != 0 && (secNum==1 || !addToFirstSection)) tfSection = new GeoTransform(GeoTrf::TranslateZ3D(znew));
-    GeoNameTag* ntSection = new GeoNameTag(name);
-    ntSection->ref();
+    GeoIntrusivePtr<GeoNameTag> ntSection{new GeoNameTag(name)};
 
     if (addToFirstSection && secNum!=1) {
       if (!pvMotherSection) {
@@ -260,7 +286,7 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
     // Not needed, but just in case in the future we have +/- sections in central region
     if(central && z!=0.) {
       // add rotated section as well
-      GeoTransform* tfSectionRot = 0;
+      GeoTransform* tfSectionRot = nullptr;
       if (isTube) { 
 	// No need for rotation.
 	tfSectionRot = new GeoTransform(GeoTrf::TranslateZ3D(-znew));
@@ -273,8 +299,6 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
       parent->add(pvSection);
     }
 
-    pvSection->unref();
-    ntSection->unref();
   }
 }
 
@@ -283,15 +307,16 @@ const BeamPipeDetectorManager * BeamPipeDetectorFactory::getDetectorManager() co
   return m_detectorManager;
 }
 
-void BeamPipeDetectorFactory::setTagNode(std::string tag, std::string node)
+void BeamPipeDetectorFactory::setTagNode(std::string tag, std::string node, std::string mode)
 {
-  m_versionTag = tag;
-  m_versionNode = node;
+  m_versionTag = std::move(tag);
+  m_versionNode = std::move(node);
+  m_mode = std::move(mode);
 }
 
 
 BeamPipeDetectorFactory::EnvelopeShapes
-BeamPipeDetectorFactory::makeEnvelope(IRDBRecordset_ptr bpipeEnvelope)
+BeamPipeDetectorFactory::makeEnvelope(const IRDBRecordset_ptr& bpipeEnvelope)
 {
   EnvelopeShapes envelopes;
 
@@ -310,20 +335,20 @@ BeamPipeDetectorFactory::makeEnvelope(IRDBRecordset_ptr bpipeEnvelope)
   }
 
   double rFwd = 0;
-  if (fwdEntry.size()) {
+  if (!fwdEntry.empty()) {
     rFwd = fwdEntry[0].r();    
-  } else if (centralEntry.size()) {
+  } else if (!centralEntry.empty()) {
     rFwd = centralEntry[0].r();    
   } else {
     std::cout << "Unexpected condition when building beam pipe." << std::endl;
   }
  
   // central
-  if (centralEntry.size() == 0) {
+  if (centralEntry.empty()) {
     envelopes.centralShape  = new GeoTube(0, rFwd, m_centralRegionZMax);
   } else {
     // This case probably will never get used and is untested.
-    GeoPcon* pcone = new GeoPcon(0, 360*Gaudi::Units::deg);
+    GeoRef<GeoPcon> pcone (new GeoPcon(0, 360*Gaudi::Units::deg));
 
     pcone->addPlane(-m_centralRegionZMax,0,rFwd);
     for (int i=centralEntry.size()-1; i>=0; i--) {  
@@ -343,9 +368,9 @@ BeamPipeDetectorFactory::makeEnvelope(IRDBRecordset_ptr bpipeEnvelope)
   
   // forward
   {
-    GeoPcon* pcone = new GeoPcon(0, 360*Gaudi::Units::deg);
+    GeoRef<GeoPcon> pcone (new GeoPcon(0, 360*Gaudi::Units::deg));
     pcone->addPlane(m_centralRegionZMax,0,rFwd);
-    if (fwdEntry.size() == 0) { 
+    if (fwdEntry.empty()) { 
       // Unlikely case but for completeness
       // we make small fwd region if everything is in central region.
       pcone->addPlane(m_centralRegionZMax+0.1*Gaudi::Units::mm,0,rFwd);
@@ -358,13 +383,31 @@ BeamPipeDetectorFactory::makeEnvelope(IRDBRecordset_ptr bpipeEnvelope)
     envelopes.fwdShape = pcone;
   }
 
+  //central+fwd
+  {
+    GeoRef<GeoPcon> Pcone =(new GeoPcon(0, 360*Gaudi::Units::deg));
+    for (int i=fwdEntry.size()-1; i>=0; i--) {
+      double z = fwdEntry[i].z();
+      double r = fwdEntry[i].r();
+      Pcone->addPlane(-z,0,r);
+    }
+    Pcone->addPlane(-m_centralRegionZMax,0,rFwd);
+    Pcone->addPlane(m_centralRegionZMax,0,rFwd);
+    for (unsigned int i=0; i<fwdEntry.size(); i++) {
+      double z = fwdEntry[i].z();
+      double r = fwdEntry[i].r();
+      Pcone->addPlane(z,0,r);
+    }
+    envelopes.bpShape = Pcone;
+  }
+
   return envelopes;
 
 }
 
 
 BeamPipeDetectorFactory::EnvelopeShapes
-BeamPipeDetectorFactory::makeEnvelopeOld(IRDBRecordset_ptr atlasMother)
+BeamPipeDetectorFactory::makeEnvelopeOld(const IRDBRecordset_ptr& atlasMother)
 {
 
   double iir = (*atlasMother)[0]->getDouble("IDETIR")*Gaudi::Units::cm;
@@ -375,14 +418,14 @@ BeamPipeDetectorFactory::makeEnvelopeOld(IRDBRecordset_ptr atlasMother)
   double clen = (*atlasMother)[0]->getDouble("CALOZMX")*Gaudi::Units::cm;
 
   // Central Section.
-  GeoTube * bpipeCentralShape = new GeoTube(0, iir, m_centralRegionZMax);
+  GeoRef<GeoTube> bpipeCentralShape (new GeoTube(0, iir, m_centralRegionZMax));
 
   // Left/Right section. We create this once (as the +ve z section) and
   // place th -ve section by doing a rotation.
 
   // Right section (+ve z)
 
-  GeoPcon* bpipeEnvPcone = new GeoPcon(0, 360*Gaudi::Units::deg);
+  GeoRef<GeoPcon> bpipeEnvPcone (new GeoPcon(0, 360*Gaudi::Units::deg));
   bpipeEnvPcone->addPlane(m_centralRegionZMax,0,iir);
   bpipeEnvPcone->addPlane(ilen,0,iir);
   bpipeEnvPcone->addPlane(ilen,0,cir); 

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.h

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef 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>
@@ -32,7 +33,7 @@ class BeamPipeDetectorFactory final : public GeoVDetectorFactory
   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 final : 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 final : public GeoVDetectorFactory
   // The manager:
   BeamPipeDetectorManager     * m_detectorManager;
    
-  const StoredMaterialManager * 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-2020 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;
@@ -20,8 +20,13 @@ class BeamPipeDetectorTool final : 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-2020 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 BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
-    acc = BeamPipeGeometryCfg(ConfigFlags)
-    f=open('BeamPipeGeometryCfg.pkl','wb')
-    acc.store(f)
-    f.close()
+    acc = BeamPipeGeometryCfg(flags)
+    with open('BeamPipeGeometryCfg.pkl', 'wb') as f:
+        acc.store(f)