Introduced new package: AtlasGeometryCommon/CrackRegionGeoModel

The reason for introducing this package is to have a way of building
dead material description either from the LAr GeoModel Tool (old way)
or from the Service Extension Tool (new way)

CrackRegionGeoModel currently contains code which used to live inside
BarrelDMConstruction class. As a result of this migration the latter
class became obsolete, and it was dropped.

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
+		   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

AtlasGeometryCommon/CrackRegionGeoModel/CrackRegionGeoModel/CrackDMConstruction.h

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

LArCalorimeter/LArGeoModel/LArGeoBarrel/CMakeLists.txt

-#Copyright (C) 2021 CERN for the benefit of the ATLAS collaboration
+#Copyright (C) 2023 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( LArGeoBarrel )
@@ -12,5 +12,5 @@ atlas_add_library( LArGeoBarrel
                    PUBLIC_HEADERS LArGeoBarrel
                    INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
                    LINK_LIBRARIES ${GEOMODEL_LIBRARIES} LArGeoCode StoreGateLib
-                   PRIVATE_LINK_LIBRARIES GeoModelUtilities GaudiKernel LArReadoutGeometry RDBAccessSvcLib )
+                   PRIVATE_LINK_LIBRARIES GeoModelUtilities GaudiKernel LArReadoutGeometry RDBAccessSvcLib CrackRegionGeoModel )
 

LArCalorimeter/LArGeoModel/LArGeoBarrel/LArGeoBarrel/BarrelDMConstruction.h

-/*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file BarrelDMConstruction.h
- *
- * @brief Declaration of BarrelDMConstruction class
- *
- * $Id: BarrelDMConstruction.h,v 1.3 2007-07-08 18:50:15 tsulaia Exp $
- */
-
-#ifndef LARGEOBARREL_BARRELDMCONSTRUCTION_H
-#define LARGEOBARREL_BARRELDMCONSTRUCTION_H
-
-// Forward declarations
-class GeoFullPhysVol;
-
-namespace LArGeo {
-
-  /** @class LArGeo::BarrelDMConstruction
-      @brief GeoModel description of dead material in the crack region
-  */
-  class BarrelDMConstruction
-  {
-  public:
-
-    // Constructor;
-    BarrelDMConstruction(bool activateFT = false);
-
-    // Destructor:
-    virtual ~BarrelDMConstruction();
-
-    // Add passive materials to the barrel envelope
-    void create(GeoFullPhysVol* envelope);
-
-  private:
-    // It is illegal to copy/assign a BarrelDMConstruction:
-    BarrelDMConstruction (const BarrelDMConstruction &) = delete;
-    BarrelDMConstruction & operator= (const BarrelDMConstruction &) = delete;
-
-    bool m_activateFT;
-  };
-
-
-
-}  // namespace LArGeo
-
-#endif // LARGEOBARREL_BARRELDMCONSTRUCTION_H

LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelCryostatConstruction.cxx

@@ -10,7 +10,7 @@
 #include "LArGeoBarrel/BarrelCryostatConstruction.h"
 #include "LArGeoBarrel/BarrelConstruction.h"
 #include "LArGeoBarrel/BarrelPresamplerConstruction.h"
-#include "LArGeoBarrel/BarrelDMConstruction.h"
+#include "CrackRegionGeoModel/CrackDMConstruction.h"
 
 #include "GeoModelKernel/GeoElement.h"
 #include "GeoModelKernel/GeoMaterial.h"
@@ -1065,8 +1065,8 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope(const VDetectorP
 
   if(rdbAccess->getChildTag("LArBarrelDM",larVersionKey.tag(),larVersionKey.node())!="" && m_fullGeo) {
     // Dead material in barrel
-    BarrelDMConstruction barrelDMConstruction(m_activateFT);
-    barrelDMConstruction.create (m_cryoMotherPhysical);
+    CrackDMConstruction crackDMConstruction(rdbAccess,geoModel,materialManager,m_activateFT);
+    crackDMConstruction.create(m_cryoMotherPhysical);
   }
 
   return m_cryoMotherPhysical;

Projects/AthSimulation/package_filters.txt

@@ -4,6 +4,7 @@
 
 + AsgExternal/Asg_Test
 + AtlasGeometryCommon/BeamPipeGeoModel
++ AtlasGeometryCommon/CrackRegionGeoModel
 + AtlasGeometryCommon/GeoModelEnvelopes
 + AtlasGeometryCommon/SubDetectorEnvelopes
 + AtlasTest/CITest