Merge branch 'main' into refactor-seeding2-edm-make-xyz-optional

Author: andiwand

Core/include/Acts/EventData/SpacePointProxy2.hpp

@@ -117,7 +117,7 @@ class SpacePointProxy2 {
   }
   /// Mutable access to the time information of the space point.
   /// @return A mutable reference to the time information of the space point.
-  std::optional<float> &time() noexcept
+  float &time() noexcept
     requires(!ReadOnly)
   {
     return m_container->time(m_index);
@@ -205,9 +205,7 @@ class SpacePointProxy2 {
   float phi() const noexcept { return m_container->phi(m_index); }
   /// Const access to the time information of the space point.
   /// @return An optional containing the time information of the space point, or
-  std::optional<float> time() const noexcept {
-    return m_container->time(m_index);
-  }
+  float time() const noexcept { return m_container->time(m_index); }
   /// Const access to the variance in Z direction of the space point.
   /// @return The variance in Z direction of the space point.
   float varianceZ() const noexcept { return m_container->varianceZ(m_index); }

Core/include/Acts/Material/MaterialMapper.hpp

@@ -12,7 +12,6 @@
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Material/MaterialInteraction.hpp"
 #include "Acts/Material/MaterialInteractionAssignment.hpp"
-#include "Acts/Material/TrackingGeometryMaterial.hpp"
 #include "Acts/Material/interface/IAssignmentFinder.hpp"
 #include "Acts/Material/interface/ISurfaceMaterialAccumulater.hpp"
 #include "Acts/Utilities/Logger.hpp"
@@ -25,6 +24,14 @@ namespace Acts {
 /// @brief material mapping procedure
 class MaterialMapper {
  public:
+  /// @brief The material maps
+  using SurfaceMaterialMaps =
+      std::map<GeometryIdentifier, std::shared_ptr<const ISurfaceMaterial>>;
+  using VolumeMaterialMaps =
+      std::map<GeometryIdentifier, std::shared_ptr<const IVolumeMaterial>>;
+  using DetectorMaterialMaps =
+      std::pair<SurfaceMaterialMaps, VolumeMaterialMaps>;
+
   /// @brief nested configuration struct
   struct Config {
     // The assignment finder
@@ -76,7 +83,7 @@ class MaterialMapper {
       const Options& options = Options{}) const;
 
   /// Finalize the maps
-  TrackingGeometryMaterial finalizeMaps(const State& state) const;
+  DetectorMaterialMaps finalizeMaps(const State& state) const;
 
  private:
   /// Access method to the logger

Core/include/Acts/Material/TrackingGeometryMaterial.hpp

@@ -79,10 +79,10 @@ Acts::MaterialMapper::mapMaterial(State& state, const GeometryContext& gctx,
   return {mappedMaterial, unmappedMaterial};
 }
 
-Acts::TrackingGeometryMaterial Acts::MaterialMapper::finalizeMaps(
+Acts::MaterialMapper::DetectorMaterialMaps Acts::MaterialMapper::finalizeMaps(
     const State& state) const {
   // The final maps
-  TrackingGeometryMaterial detectorMaterialMaps;
+  DetectorMaterialMaps detectorMaterialMaps;
   // The surface maps
   detectorMaterialMaps.first =
       m_cfg.surfaceMaterialAccumulater->finalizeMaterial(

Core/src/Material/MaterialMapper.cpp

@@ -9,7 +9,23 @@
 #pragma once
 
 #include "Acts/Geometry/GeometryIdentifier.hpp"
-#include "Acts/Material/TrackingGeometryMaterial.hpp"
+
+#include <map>
+#include <memory>
+
+namespace Acts {
+
+class ISurfaceMaterial;
+class IVolumeMaterial;
+
+using SurfaceMaterialMap =
+    std::map<GeometryIdentifier, std::shared_ptr<const ISurfaceMaterial>>;
+
+using VolumeMaterialMap =
+    std::map<GeometryIdentifier, std::shared_ptr<const IVolumeMaterial>>;
+
+using DetectorMaterialMaps = std::pair<SurfaceMaterialMap, VolumeMaterialMap>;
+}  // namespace Acts
 
 namespace ActsExamples {
 
@@ -24,8 +40,7 @@ class IMaterialWriter {
   /// The single writer class
   ///
   /// @param detMaterial the detector material maps
-  virtual void writeMaterial(
-      const Acts::TrackingGeometryMaterial& detMaterial) = 0;
+  virtual void writeMaterial(const Acts::DetectorMaterialMaps& detMaterial) = 0;
 };
 
 }  // namespace ActsExamples

Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/IMaterialWriter.hpp

@@ -41,6 +41,9 @@ class MappingMaterialDecorator : public IMaterialDecorator {
  public:
   using BinningMap = std::map<std::uint64_t, std::pair<int, int>>;
 
+  using VolumeMaterialMap =
+      std::map<GeometryIdentifier, std::shared_ptr<const IVolumeMaterial>>;
+
   MappingMaterialDecorator(const Acts::TrackingGeometry& tGeometry,
                            Acts::Logging::Level level,
                            bool clearSurfaceMaterial = true,
@@ -273,7 +276,7 @@ class MappingMaterialDecorator : public IMaterialDecorator {
  private:
   BinningMap m_binningMap;
 
-  VolumeMaterialMaps m_volumeMaterialMap;
+  VolumeMaterialMap m_volumeMaterialMap;
 
   bool m_clearSurfaceMaterial{true};
   bool m_clearVolumeMaterial{true};

Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MappingMaterialDecorator.hpp

@@ -13,7 +13,6 @@
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Material/MaterialInteraction.hpp"
 #include "Acts/Material/SurfaceMaterialMapper.hpp"
-#include "Acts/Material/TrackingGeometryMaterial.hpp"
 #include "Acts/Material/VolumeMaterialMapper.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
@@ -33,7 +32,18 @@
 #include <vector>
 
 namespace Acts {
+
 class TrackingGeometry;
+class ISurfaceMaterial;
+class IVolumeMaterial;
+
+using SurfaceMaterialMap =
+    std::map<GeometryIdentifier, std::shared_ptr<const ISurfaceMaterial>>;
+
+using VolumeMaterialMap =
+    std::map<GeometryIdentifier, std::shared_ptr<const IVolumeMaterial>>;
+
+using DetectorMaterialMaps = std::pair<SurfaceMaterialMap, VolumeMaterialMap>;
 }  // namespace Acts
 
 namespace ActsExamples {

Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialMapping.hpp

@@ -36,7 +36,7 @@ CoreMaterialMapping::CoreMaterialMapping(const CoreMaterialMapping::Config& cfg,
 }
 
 CoreMaterialMapping::~CoreMaterialMapping() {
-  Acts::TrackingGeometryMaterial detectorMaterial =
+  Acts::DetectorMaterialMaps detectorMaterial =
       m_cfg.materialMapper->finalizeMaps(*m_mappingState);
   // Loop over the available writers and write the maps
   for (auto& imw : m_cfg.materiaMaplWriters) {

Examples/Algorithms/MaterialMapping/src/CoreMaterialMapping.cpp

@@ -49,7 +49,7 @@ MaterialMapping::MaterialMapping(const MaterialMapping::Config& cfg,
 
 ProcessCode MaterialMapping::finalize() {
   ACTS_INFO("Finalizing material mappig output");
-  Acts::TrackingGeometryMaterial detectorMaterial;
+  Acts::DetectorMaterialMaps detectorMaterial;
 
   if (m_cfg.materialSurfaceMapper && m_cfg.materialVolumeMapper) {
     // Finalize all the maps using the cached state

Examples/Algorithms/MaterialMapping/src/MaterialMapping.cpp

@@ -12,7 +12,6 @@
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Material/ISurfaceMaterial.hpp"
 #include "Acts/Material/IVolumeMaterial.hpp"
-#include "Acts/Material/TrackingGeometryMaterial.hpp"
 #include "Acts/Plugins/Json/MaterialMapJsonConverter.hpp"
 #include "Acts/Utilities/EnumBitwiseOperators.hpp"
 #include "Acts/Utilities/Logger.hpp"
@@ -28,7 +27,18 @@
 #include <utility>
 
 namespace Acts {
+
 class TrackingGeometry;
+class ISurfaceMaterial;
+class IVolumeMaterial;
+
+using SurfaceMaterialMap =
+    std::map<GeometryIdentifier, std::shared_ptr<const ISurfaceMaterial>>;
+
+using VolumeMaterialMap =
+    std::map<GeometryIdentifier, std::shared_ptr<const IVolumeMaterial>>;
+
+using DetectorMaterialMaps = std::pair<SurfaceMaterialMap, VolumeMaterialMap>;
 }  // namespace Acts
 
 namespace ActsExamples {
@@ -69,8 +79,7 @@ class JsonMaterialWriter : public IMaterialWriter {
   /// Write out the material map
   ///
   /// @param detMaterial is the SurfaceMaterial and VolumeMaterial maps
-  void writeMaterial(
-      const Acts::TrackingGeometryMaterial& detMaterial) override;
+  void writeMaterial(const Acts::DetectorMaterialMaps& detMaterial) override;
 
   /// Write out the material map from Geometry
   ///