AsgExternal/Asg_Test/cmt/TestFileData.txt

-/afs/cern.ch/atlas/project/PAT/xAODs/r9264/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6479/data18_13TeV.00348885.physics_Main.deriv.DAOD_PHYS.r13286_p4910_p6479/DAOD_PHYS.41578717._000168.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteData.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6479/data18_13TeV.00348885.physics_Main.deriv.DAOD_PHYSLITE.r13286_p4910_p6479/DAOD_PHYSLITE.41578717._000256.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteMC.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6490/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYSLITE.e6337_s3681_r13167_r13146_p6490/DAOD_PHYSLITE.41651753._000007.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteMCFastSim.txt

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

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

-/afs/cern.ch/atlas/project/PAT/xAODs/r9315/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1
+/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

-/afs/cern.ch/user/a/asgbase/patspace/xAODs/a818/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.AOD.e3698_a766_a818_r7676/AOD.07919492._000100.pool.root.1

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

AsgExternal/Asg_Test/cmt/setup_external.RootCore.csh

-Asg_Test_Dir=`dirname $1`
-setenv ROOTCORE_RELEASE_SERIES `cat $Asg_Test_Dir/ReleaseSeries.txt`
-setenv ASG_TEST_FILE_DATA `cat $Asg_Test_Dir/TestFileData.txt`
-setenv ASG_TEST_FILE_MC `cat $Asg_Test_Dir/TestFileMC.txt`
-setenv ASG_TEST_FILE_MC_AFII `cat $Asg_Test_Dir/TestFileMCAFII.txt`
-setenv ROOTCORE_TEST_FILE `cat $Asg_Test_Dir/TestFileMC.txt`
-setenv ROOTCORE_TEST_DATA "`dirname $ROOTCORE_TEST_FILE | xargs dirname`"

AsgExternal/Asg_Test/cmt/setup_external.RootCore.sh

-Asg_Test_Dir=`dirname $1`
-export ROOTCORE_RELEASE_SERIES=`cat $Asg_Test_Dir/ReleaseSeries.txt`
-export ASG_TEST_FILE_DATA=`cat $Asg_Test_Dir/TestFileData.txt`
-export ASG_TEST_FILE_MC=`cat $Asg_Test_Dir/TestFileMC.txt`
-export ASG_TEST_FILE_MC_AFII=`cat $Asg_Test_Dir/TestFileMCAFII.txt`
-export ROOTCORE_TEST_FILE=`cat $Asg_Test_Dir/TestFileMC.txt`
-export ROOTCORE_TEST_DATA="`dirname $ROOTCORE_TEST_FILE | xargs dirname`"

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

-################################################################################
-# Package: BeamPipeGeoModel
-################################################################################
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( BeamPipeGeoModel )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/RDBAccessSvc
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          PRIVATE
-                          Control/SGTools
-                          Control/StoreGate
-                          Control/AthenaKernel
-                          DetectorDescription/GeoModel/GeoModelInterfaces
-                          GaudiKernel )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( GeoModel )
+find_package( GeoModel COMPONENTS GeoModelKernel )
 
 # Component(s) in the package:
 atlas_add_library( BeamPipeGeoModelLib
                    src/*.cxx
                    PUBLIC_HEADERS BeamPipeGeoModel
-                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} 
-                   LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} GeoModelUtilities StoreGateLib 
-                   PRIVATE_LINK_LIBRARIES SGTools AthenaKernel GaudiKernel )
+		   INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaKernel GeoModelUtilities
+                   PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces RDBAccessSvcLib SGTools StoreGateLib )
 
 atlas_add_component( BeamPipeGeoModel
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODEL_LIBRARIES} GeoModelUtilities SGTools StoreGateLib GaudiKernel BeamPipeGeoModelLib )
+                     LINK_LIBRARIES BeamPipeGeoModelLib )
 
+# 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 )
-atlas_install_scripts( test/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

AtlasGeometryCommon/BeamPipeGeoModel/python/BeamPipeGMConfig.py

 # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 from AtlasGeoModel.GeoModelConfig import GeoModelCfg
+from AthenaConfiguration.ComponentFactory import CompFactory
 
 def BeamPipeGeometryCfg(flags):
     result=GeoModelCfg(flags)
-    from BeamPipeGeoModel.BeamPipeGeoModelConf import BeamPipeDetectorTool
+    BeamPipeDetectorTool=CompFactory.BeamPipeDetectorTool
     result.getPrimary().DetectorTools += [ BeamPipeDetectorTool() ]
     return result

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.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 "BeamPipeDetectorFactory.h"
 
-#include "GeoModelInterfaces/AbsMaterialManager.h"
+#include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelKernel/GeoMaterial.h"  
 #include "GeoModelKernel/GeoPcon.h"  
 #include "GeoModelKernel/GeoTube.h"  
@@ -18,8 +18,6 @@
 
 #include "StoreGate/StoreGateSvc.h"
 
-#include "GeoModelInterfaces/StoredMaterialManager.h"
-
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
@@ -29,31 +27,29 @@
 #include "GaudiKernel/SystemOfUnits.h"
 
 #include <iomanip>
+#include <utility>
 #include <vector>
 
 
 BeamPipeDetectorFactory::BeamPipeDetectorFactory(StoreGateSvc *detStore,
-				       IRDBAccessSvc *pAccess)
-  :m_detectorManager(0),
-   m_materialManager(0),
+						 IRDBAccessSvc *pAccess)
+  :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)
 {
   m_detectorManager=new BeamPipeDetectorManager();
 
-  const StoredMaterialManager * materialManagerTmp = 0;
-  if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManagerTmp, std::string("MATERIALS"))) {
+  if (StatusCode::SUCCESS != m_detectorStore->retrieve(m_materialManager, std::string("MATERIALS"))) {
     return; 
   } 
-  m_materialManager = materialManagerTmp;
   
   IRDBRecordset_ptr atlasMother = m_access->getRecordsetPtr("AtlasMother",m_versionTag,m_versionNode);
   IRDBRecordset_ptr bpipeGeneral = m_access->getRecordsetPtr("BPipeGeneral",m_versionTag,m_versionNode);
@@ -70,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) {
@@ -107,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)
@@ -138,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;
@@ -209,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;
@@ -217,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
@@ -239,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) {
@@ -264,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));
@@ -277,8 +299,6 @@ void BeamPipeDetectorFactory::addSections(GeoPhysVol* parent, int region)
       parent->add(pvSection);
     }
 
-    pvSection->unref();
-    ntSection->unref();
   }
 }
 
@@ -287,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;
 
@@ -314,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--) {  
@@ -347,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);
@@ -362,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;
@@ -379,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);