AtlasGeometryCommon/BeamPipeGeoModel/BeamPipeGeoModel/BeamPipeDetectorManager.h

@@ -27,7 +27,7 @@ class BeamPipeDetectorManager : public GeoVDetectorManager
   virtual PVConstLink getTreeTop(unsigned int i) const;
 
   // Add a Tree top:
-  void addTreeTop(PVConstLink);
+  void addTreeTop(const PVConstLink&);
 
  private:  
 

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.cxx

@@ -33,16 +33,15 @@
 
 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)
 {
@@ -163,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;
@@ -234,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;
@@ -263,7 +262,7 @@ 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));
     GeoIntrusivePtr<GeoNameTag> ntSection{new GeoNameTag(name)};
 
@@ -287,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));
@@ -336,16 +335,16 @@ BeamPipeDetectorFactory::makeEnvelope(const 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.
@@ -371,7 +370,7 @@ BeamPipeDetectorFactory::makeEnvelope(const IRDBRecordset_ptr& bpipeEnvelope)
   {
     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);

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.h

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef BEAMPIPEGEOMODEL_BEAMPIPEDETECTORFACTORY_H

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory_Lite.h

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef BEAMPIPEGEOMODEL_BEAMPIPEDETECTORFACTORY_LITE_H
@@ -7,8 +7,6 @@
 
 #include "GeoModelKernel/GeoVDetectorFactory.h"
 #include "BeamPipeGeoModel/BeamPipeDetectorManager.h"
-#include <string>
-
 
 class BeamPipeDetectorFactory_Lite final : public GeoVDetectorFactory  
 {
@@ -23,16 +21,13 @@ class BeamPipeDetectorFactory_Lite final : public GeoVDetectorFactory
   // 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:  
-
-  // Illegal operations:
-  const BeamPipeDetectorFactory_Lite & operator=(const BeamPipeDetectorFactory_Lite &right);
-  BeamPipeDetectorFactory_Lite(const BeamPipeDetectorFactory_Lite &right);
-  
   // The manager:
-  BeamPipeDetectorManager     * m_manager;
-
+  BeamPipeDetectorManager* m_manager{nullptr};
 };
 
 // Class BeamPipeDetectorFactory_Lite 

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorManager.cxx

@@ -22,7 +22,7 @@ PVConstLink BeamPipeDetectorManager::getTreeTop(unsigned int i) const
   return m_volume[i];
 }
 
-void  BeamPipeDetectorManager::addTreeTop(PVConstLink vol)
+void  BeamPipeDetectorManager::addTreeTop(const PVConstLink& vol)
 {
   m_volume.push_back(vol);
 }

AtlasGeometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.cxx

 /*
-  Copyright (C) 2002-2022 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 "BeamPipeDetectorFactory_Lite.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"
 
@@ -21,95 +20,65 @@
 
 #include "GeoModelKernel/GeoVolumeCursor.h"
 
-BeamPipeDetectorTool::BeamPipeDetectorTool( const std::string& type, 
-					    const std::string& name, 
-					    const IInterface* parent ): 
-  GeoModelTool(type,name,parent),
-  m_manager(0),
-  m_mode("BeamPipe")
+BeamPipeDetectorTool::BeamPipeDetectorTool( const std::string& type,
+					    const std::string& name,
+					    const IInterface* parent ):
+  GeoModelTool(type,name,parent)
 {
-    declareProperty("BeamPipeMode",            m_mode); //m_mode="BeamPipe" by default, setting m_mode="AssemblyBeamPipe" will trigger optimised implementation using assembly volume
 }
 
-BeamPipeDetectorTool::~BeamPipeDetectorTool()
-{
-}
+BeamPipeDetectorTool::~BeamPipeDetectorTool() = default;
 
 
 StatusCode BeamPipeDetectorTool::create()
-{ 
-  MsgStream log(msgSvc(), name()); 
-
-  log << MSG::INFO << "Building Beam Pipe" << endmsg;
+{
+  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();
-      
-      
-      ServiceHandle<IRDBAccessSvc> accessSvc(geoDbTag->getParamSvcName(),name());
-      ATH_CHECK( accessSvc.retrieve());
+  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 = accessSvc->getChildTag("BeamPipe", atlasVersion,versionNode);
+    ATH_MSG_DEBUG("Beampipe Version: " << beampipeVersionTag);
+
+    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);
       
-      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 = accessSvc->getChildTag("BeamPipe", atlasVersion,versionNode);
-	log << MSG::DEBUG << "Beampipe Version: " << beampipeVersionTag << endmsg;
-	
-	if (beampipeVersionTag.empty()) { 
-	  log << MSG::INFO << "No BeamPipe Version. Beam pipe will not be built." << endmsg;
-	}	
-	else {
-	  BeamPipeDetectorFactory theBeamPipeFactory(detStore().operator->(),accessSvc.operator->());
-	  theBeamPipeFactory.setTagNode(atlasVersion,versionNode,m_mode);
-	  theBeamPipeFactory.create(world);
-	  
-	  m_manager = theBeamPipeFactory.getDetectorManager();
-	}
-      }
-
-      if (m_manager) {    
-	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); 
-	}
-	return StatusCode::SUCCESS;
-      }
+      m_manager = theBeamPipeFactory.getDetectorManager();
     }
+  }
+
+  if (m_manager) {
+    theExpt->addManager(m_manager);
+    ATH_CHECK(detStore()->record(m_manager,m_manager->getName()));
+    return StatusCode::SUCCESS;
+  }
+
   return StatusCode::FAILURE;
 }
 
@@ -118,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-2022 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,9 +20,13 @@ class BeamPipeDetectorTool final : public GeoModelTool
 
   virtual StatusCode create() override final;
   virtual StatusCode clear() override final;
+
  private:
-  const BeamPipeDetectorManager* m_manager;
-  std::string m_mode;
+  const BeamPipeDetectorManager* m_manager{nullptr};
+  StringProperty m_mode{this
+      , "BeamPipeMode"
+      , "BeamPipe"
+      , "Two modes: 'BeamPipe' default, 'AssemblyBeamPipe' activates implementation based on assembly volume"};
 };
 
 #endif 

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h

@@ -12,39 +12,39 @@
 
 #include <string>
 
-class CavernInfraDetectorFactory : public GeoVDetectorFactory  
+class CavernInfraDetectorFactory : public GeoVDetectorFactory
 {
  public:
   // Constructor:
   CavernInfraDetectorFactory(ServiceHandle<StoreGateSvc> pDetStore,
 			     ServiceHandle<IRDBAccessSvc> pAccess);
-  
+
   // Illegal operations:
   const CavernInfraDetectorFactory & operator=(const CavernInfraDetectorFactory &right) = delete;
   CavernInfraDetectorFactory(const CavernInfraDetectorFactory &right) = delete;
-  
+
   // Destructor:
   ~CavernInfraDetectorFactory() = default;
-  
+
   // Creation of geometry:
   virtual void create(GeoPhysVol *world) override;
-  
+
   // Access to the results:
   virtual const CavernInfraDetectorManager* getDetectorManager() const override;
-  
+
   // Set version Tag and Node
   void setTagNode(const std::string& tag, const std::string& node);
-  
- private:  
+
+ private:
   // The manager:
   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/CavernInfraDetectorManager.cxx

@@ -26,7 +26,7 @@ PVConstLink CavernInfraDetectorManager::getTreeTop(unsigned int i) const
     return nullptr;
 }
 
-void  CavernInfraDetectorManager::addTreeTop(PVLink link) 
+void  CavernInfraDetectorManager::addTreeTop(const PVLink& link)
 {
   m_treeTops.push_back(link);
 }

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorManager.h

@@ -9,29 +9,29 @@
 #include "GeoModelKernel/GeoVDetectorManager.h"
 #include <vector>
 
-class CavernInfraDetectorManager : public GeoVDetectorManager  
+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(PVLink);      // Add a Tree top:
 
- private:  
+  void addTreeTop(const PVLink&);      // Add a Tree top:
+
+ private:
   // Tree Tops
   std::vector<PVLink> m_treeTops;
 };
 
 #ifndef GAUDI_NEUTRAL
-#include "AthenaKernel/CLASS_DEF.h" 
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(CavernInfraDetectorManager, 1500000300, 1)
 #endif
 

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx

@@ -3,15 +3,15 @@
 */
 
 #include "CavernInfraDetectorTool.h"
-#include "CavernInfraDetectorFactory.h" 
-#include "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 )
@@ -19,7 +19,7 @@ CavernInfraDetectorTool::CavernInfraDetectorTool( const std::string& type,
 }
 
 StatusCode CavernInfraDetectorTool::create()
-{ 
+{
   ServiceHandle<IGeoDbTagSvc> geoDbTag("GeoDbTagSvc", name());
   ATH_CHECK(geoDbTag.retrieve());
 
@@ -36,7 +36,7 @@ StatusCode CavernInfraDetectorTool::create()
 
   GeoModelExperiment* theExpt = nullptr;
   ATH_CHECK(detStore()->retrieve(theExpt,"ATLAS"));
- 
+
   GeoPhysVol *world=theExpt->getPhysVol();
   ServiceHandle<IRDBAccessSvc> raccess("RDBAccessSvc",name());
   ATH_CHECK(raccess.retrieve());

AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.h

@@ -8,7 +8,7 @@
 #include "GeoModelUtilities/GeoModelTool.h"
 class CavernInfraDetectorManager;
 
-class CavernInfraDetectorTool final : public GeoModelTool 
+class CavernInfraDetectorTool final : public GeoModelTool
 {
  public:
   CavernInfraDetectorTool( const std::string& type, const std::string& name, const IInterface* parent );
@@ -16,9 +16,9 @@ class CavernInfraDetectorTool final : public GeoModelTool
 
   virtual StatusCode create() override;
   virtual StatusCode clear() override;
-  
+
  private:
   const CavernInfraDetectorManager* m_manager{nullptr};
 };
 
-#endif 
+#endif

AtlasGeometryCommon/CrackRegionGeoModel/CMakeLists.txt

@@ -9,6 +9,7 @@ find_package( GeoModel COMPONENTS GeoModelKernel GeoModelDBManager GeoModelRead)
 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/GeoModelEnvelopes/CMakeLists.txt

@@ -10,4 +10,5 @@ find_package( GeoModel COMPONENTS GeoModelKernel )
 atlas_add_component( GeoModelEnvelopes
                      src/*.cxx
                      src/components/*.cxx
+		     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/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/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"
@@ -20,23 +20,20 @@
 
 
 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)
 {
   if (StatusCode::SUCCESS != m_detectorStore->retrieve(m_materialManager, std::string("MATERIALS"))) {
-    return; 
-  } 
-  
-  // Get the materials  
+    return;
+  }
+
+  // Get the materials
   const GeoMaterial* air = m_materialManager->getMaterial("std::Air");
 
   // Build boolean shape: union of two tubes
@@ -47,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-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef GEOMODELENVELOPES_FORDETENVELOPEFACTORY_H
@@ -12,36 +12,36 @@ class StoreGateSvc;
 class StoredMaterialManager;
 class GeoShape;
 
-class ForDetEnvelopeFactory final : public GeoVDetectorFactory  
+class ForDetEnvelopeFactory final : public GeoVDetectorFactory
 {
  public:
-  
+
   // Constructor:
   ForDetEnvelopeFactory(StoreGateSvc *pDetStore);
-  
+
   // Destructor:
-  ~ForDetEnvelopeFactory();
-  
+  ~ForDetEnvelopeFactory() = default;
+
   // Creation of geometry:
   virtual void create(GeoPhysVol *world) override;
-  
+
   // Access to the results:
   virtual const ForDetEnvelopeManager * getDetectorManager() const override;
-  
- private:  
+
+ private:
 
   // Illegal operations:
   const ForDetEnvelopeFactory & operator=(const ForDetEnvelopeFactory &right);
   ForDetEnvelopeFactory(const ForDetEnvelopeFactory &right);
-  
+
   // The manager:
   ForDetEnvelopeManager*   m_detectorManager;
-   
+
   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"
@@ -23,7 +23,7 @@ PVConstLink ForDetEnvelopeManager::getTreeTop(unsigned int i) const
   return m_volume[i];
 }
 
-void  ForDetEnvelopeManager::addTreeTop(PVLink vol)
+void  ForDetEnvelopeManager::addTreeTop(const PVLink& vol)
 {
   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;
 }