chore!: Clean some Material code

Core/include/Acts/Material/BinnedSurfaceMaterial.hpp

@@ -13,9 +13,7 @@
 #include "Acts/Material/MaterialSlab.hpp"
 #include "Acts/Utilities/BinUtility.hpp"
 
-#include <cstddef>
 #include <iosfwd>
-#include <vector>
 
 namespace Acts {
 
@@ -83,10 +81,10 @@ class BinnedSurfaceMaterial : public ISurfaceMaterial {
   /// Destructor
   ~BinnedSurfaceMaterial() override = default;
 
-  /// Scale operator
+  /// Scale operation
   ///
-  /// @param scale is the scale factor for the full material
-  BinnedSurfaceMaterial& operator*=(double scale) final;
+  /// @param factor is the scale factor for the full material
+  BinnedSurfaceMaterial& scale(double factor) final;
 
   /// Return the BinUtility
   const BinUtility& binUtility() const;

Core/include/Acts/Material/GridSurfaceMaterial.hpp

@@ -11,10 +11,8 @@
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Material/ISurfaceMaterial.hpp"
 #include "Acts/Material/MaterialSlab.hpp"
-#include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/Delegate.hpp"
 #include "Acts/Utilities/GridAccessHelpers.hpp"
-#include "Acts/Utilities/VectorHelpers.hpp"
 
 #include <ostream>
 #include <stdexcept>
@@ -44,7 +42,7 @@ struct GridMaterialAccessor {
   ///
   /// @note this is not particularly fast
   template <typename grid_type>
-  void scale(grid_type& grid, ActsScalar scale) {
+  void scale(grid_type& grid, double scale) {
     // Loop through the grid bins, get the indices and scale the material
     for (std::size_t ib = 0; ib < grid.size(); ++ib) {
       grid.at(ib).scaleThickness(scale);
@@ -74,7 +72,7 @@ struct IndexedMaterialAccessor {
   ///
   /// @param scale the amount of the scaling
   template <typename grid_type>
-  void scale(grid_type& /*grid*/, ActsScalar scale) {
+  void scale(grid_type& /*grid*/, double scale) {
     for (auto& m : material) {
       m.scaleThickness(scale);
     }
@@ -118,7 +116,7 @@ struct GloballyIndexedMaterialAccessor {
   /// outcome is unpredictable.
   ///
   template <typename grid_type>
-  void scale(grid_type& grid, ActsScalar scale) {
+  void scale(grid_type& grid, double scale) {
     if (sharedEntries) {
       throw std::invalid_argument(
           "GloballyIndexedMaterialAccessor: shared entry scaling is not "
@@ -198,8 +196,8 @@ class GridSurfaceMaterialT : public ISurfaceMaterial {
   /// Scale operator
   ///
   /// @param scale is the scale factor applied
-  ISurfaceMaterial& operator*=(ActsScalar scale) final {
-    m_materialAccessor.scale(m_grid, scale);
+  ISurfaceMaterial& scale(double factor) final {
+    m_materialAccessor.scale(m_grid, factor);
     return (*this);
   }
 

Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp

@@ -12,7 +12,6 @@
 #include "Acts/Material/ISurfaceMaterial.hpp"
 #include "Acts/Material/MaterialSlab.hpp"
 
-#include <cstddef>
 #include <iosfwd>
 
 namespace Acts {
@@ -59,17 +58,17 @@ class HomogeneousSurfaceMaterial : public ISurfaceMaterial {
   HomogeneousSurfaceMaterial& operator=(HomogeneousSurfaceMaterial&& hsm) =
       default;
 
-  /// Scale operator
-  /// - it is effectively a thickness scaling
-  ///
-  /// @param scale is the scale factor
-  HomogeneousSurfaceMaterial& operator*=(double scale) final;
-
   /// Equality operator
   ///
   /// @param hsm is the source material
   bool operator==(const HomogeneousSurfaceMaterial& hsm) const;
 
+  /// Scale operator
+  /// - it is effectively a thickness scaling
+  ///
+  /// @param factor is the scale factor
+  HomogeneousSurfaceMaterial& scale(double factor) final;
+
   /// @copydoc ISurfaceMaterial::materialSlab(const Vector2&) const
   ///
   /// @note the input parameter is ignored
@@ -94,22 +93,7 @@ class HomogeneousSurfaceMaterial : public ISurfaceMaterial {
 
  private:
   /// The five different MaterialSlab
-  MaterialSlab m_fullMaterial = MaterialSlab();
+  MaterialSlab m_fullMaterial;
 };
 
-inline const MaterialSlab& HomogeneousSurfaceMaterial::materialSlab(
-    const Vector2& /*lp*/) const {
-  return (m_fullMaterial);
-}
-
-inline const MaterialSlab& HomogeneousSurfaceMaterial::materialSlab(
-    const Vector3& /*gp*/) const {
-  return (m_fullMaterial);
-}
-
-inline bool HomogeneousSurfaceMaterial::operator==(
-    const HomogeneousSurfaceMaterial& hsm) const {
-  return (m_fullMaterial == hsm.m_fullMaterial);
-}
-
 }  // namespace Acts

Core/include/Acts/Material/HomogeneousVolumeMaterial.hpp

@@ -67,14 +67,4 @@ class HomogeneousVolumeMaterial : public IVolumeMaterial {
   Material m_material = Material();
 };
 
-inline const Material HomogeneousVolumeMaterial::material(
-    const Vector3& /*position*/) const {
-  return (m_material);
-}
-
-inline bool HomogeneousVolumeMaterial::operator==(
-    const HomogeneousVolumeMaterial& hvm) const {
-  return (m_material == hvm.m_material);
-}
-
 }  // namespace Acts

Core/include/Acts/Material/ISurfaceMaterial.hpp

@@ -11,12 +11,9 @@
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Common.hpp"
 #include "Acts/Definitions/Direction.hpp"
-#include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Material/MaterialSlab.hpp"
 
-#include <memory>
 #include <sstream>
-#include <vector>
 
 namespace Acts {
 
@@ -50,10 +47,10 @@ class ISurfaceMaterial {
   /// Destructor
   virtual ~ISurfaceMaterial() = default;
 
-  /// Scale operator
+  /// Scale material
   ///
-  /// @param scale is the scale factor applied
-  virtual ISurfaceMaterial& operator*=(double scale) = 0;
+  /// @param factor is the scale factor applied
+  virtual ISurfaceMaterial& scale(double factor) = 0;
 
   /// Return method for full material description of the Surface
   /// - from local coordinate on the surface
@@ -128,9 +125,10 @@ class ISurfaceMaterial {
   }
 
  protected:
-  double m_splitFactor{1.};  //!< the split factor in favour of oppositePre
-  MappingType m_mappingType{
-      Acts::MappingType::Default};  //!< Use the default mapping type by default
+  /// the split factor in favour of oppositePre
+  double m_splitFactor{1.};
+  /// Use the default mapping type by default
+  MappingType m_mappingType{Acts::MappingType::Default};
 };
 
 inline double ISurfaceMaterial::factor(Direction pDir,

Core/include/Acts/Material/Material.hpp

@@ -8,11 +8,10 @@
 
 #pragma once
 
-#include "Acts/Definitions/Algebra.hpp"
-
 #include <iosfwd>
 #include <limits>
-#include <utility>
+
+#include <Eigen/Dense>
 
 namespace Acts {
 
@@ -82,6 +81,13 @@ class Material {
   Material& operator=(Material&& mat) = default;
   Material& operator=(const Material& mat) = default;
 
+  /// Check if two materials are exactly equal.
+  /// @note This is a strict equality check, i.e. the materials must
+  /// have identical properties.
+  /// @param mat is the material to compare to
+  /// @return true if the materials are equal
+  bool operator==(const Material& mat) const;
+
   /// Check if the material is valid, i.e. it is not vacuum.
   bool isValid() const { return 0.0f < m_ar; }
 
@@ -111,12 +117,6 @@ class Material {
   float m_ar = 0.0f;
   float m_z = 0.0f;
   float m_molarRho = 0.0f;
-
-  friend constexpr bool operator==(const Material& lhs, const Material& rhs) {
-    return (lhs.m_x0 == rhs.m_x0) && (lhs.m_l0 == rhs.m_l0) &&
-           (lhs.m_ar == rhs.m_ar) && (lhs.m_z == rhs.m_z) &&
-           (lhs.m_molarRho == rhs.m_molarRho);
-  }
 };
 
 std::ostream& operator<<(std::ostream& os, const Material& material);

Core/include/Acts/Material/MaterialSlab.hpp

@@ -58,6 +58,13 @@ class MaterialSlab {
   MaterialSlab& operator=(MaterialSlab&&) = default;
   MaterialSlab& operator=(const MaterialSlab&) = default;
 
+  /// Check if two materials are exactly equal.
+  /// @note This is a strict equality check, i.e. the materials must
+  /// have identical properties.
+  /// @param mat is the material to compare to
+  /// @return true if the materials are equal
+  bool operator==(const MaterialSlab& other) const;
+
   /// Scale the material thickness by the given factor.
   void scaleThickness(float scale);
 
@@ -78,13 +85,6 @@ class MaterialSlab {
   float m_thickness = 0.0f;
   float m_thicknessInX0 = 0.0f;
   float m_thicknessInL0 = 0.0f;
-
-  friend constexpr bool operator==(const MaterialSlab& lhs,
-                                   const MaterialSlab& rhs) {
-    // t/X0 and t/L0 are dependent variables and need not be checked
-    return (lhs.m_material == rhs.m_material) &&
-           (lhs.m_thickness == rhs.m_thickness);
-  }
 };
 
 std::ostream& operator<<(std::ostream& os, const MaterialSlab& materialSlab);

Core/include/Acts/Material/ProtoSurfaceMaterial.hpp

@@ -14,7 +14,6 @@
 #include "Acts/Material/MaterialSlab.hpp"
 #include "Acts/Utilities/BinUtility.hpp"
 
-#include <cstddef>
 #include <iosfwd>
 
 namespace Acts {
@@ -67,9 +66,9 @@ class ProtoSurfaceMaterialT : public ISurfaceMaterial {
   ProtoSurfaceMaterialT<BinningType>& operator=(
       ProtoSurfaceMaterialT<BinningType>&& smproxy) = default;
 
-  /// Scale operator - dummy implementation
+  /// Scale operation - dummy implementation
   ///
-  ProtoSurfaceMaterialT<BinningType>& operator*=(double /*scale*/) final {
+  ProtoSurfaceMaterialT<BinningType>& scale(double /*factor*/) final {
     return (*this);
   }
 

Core/src/Material/BinnedSurfaceMaterial.cpp

@@ -29,11 +29,10 @@ Acts::BinnedSurfaceMaterial::BinnedSurfaceMaterial(
       m_binUtility(binUtility),
       m_fullMaterial(std::move(fullProperties)) {}
 
-Acts::BinnedSurfaceMaterial& Acts::BinnedSurfaceMaterial::operator*=(
-    double scale) {
+Acts::BinnedSurfaceMaterial& Acts::BinnedSurfaceMaterial::scale(double factor) {
   for (auto& materialVector : m_fullMaterial) {
     for (auto& materialBin : materialVector) {
-      materialBin.scaleThickness(scale);
+      materialBin.scaleThickness(factor);
     }
   }
   return (*this);

Core/src/Material/HomogeneousSurfaceMaterial.cpp

@@ -12,20 +12,38 @@
 
 #include <ostream>
 
-Acts::HomogeneousSurfaceMaterial::HomogeneousSurfaceMaterial(
-    const MaterialSlab& full, double splitFactor, Acts::MappingType mappingType)
+namespace Acts {
+
+HomogeneousSurfaceMaterial::HomogeneousSurfaceMaterial(const MaterialSlab& full,
+                                                       double splitFactor,
+                                                       MappingType mappingType)
     : ISurfaceMaterial(splitFactor, mappingType), m_fullMaterial(full) {}
 
-Acts::HomogeneousSurfaceMaterial& Acts::HomogeneousSurfaceMaterial::operator*=(
-    double scale) {
-  m_fullMaterial.scaleThickness(scale);
-  return (*this);
+bool HomogeneousSurfaceMaterial::operator==(
+    const HomogeneousSurfaceMaterial& hsm) const {
+  return m_fullMaterial == hsm.m_fullMaterial;
+}
+
+HomogeneousSurfaceMaterial& HomogeneousSurfaceMaterial::scale(double factor) {
+  m_fullMaterial.scaleThickness(factor);
+  return *this;
+}
+
+const MaterialSlab& HomogeneousSurfaceMaterial::materialSlab(
+    const Vector2& /*lp*/) const {
+  return m_fullMaterial;
+}
+
+const MaterialSlab& HomogeneousSurfaceMaterial::materialSlab(
+    const Vector3& /*gp*/) const {
+  return m_fullMaterial;
 }
 
-std::ostream& Acts::HomogeneousSurfaceMaterial::toStream(
-    std::ostream& sl) const {
-  sl << "Acts::HomogeneousSurfaceMaterial : " << std::endl;
+std::ostream& HomogeneousSurfaceMaterial::toStream(std::ostream& sl) const {
+  sl << "HomogeneousSurfaceMaterial : " << std::endl;
   sl << "   - fullMaterial : " << m_fullMaterial << std::endl;
   sl << "   - split factor : " << m_splitFactor << std::endl;
   return sl;
 }
+
+}  // namespace Acts

Core/src/Material/HomogeneousVolumeMaterial.cpp

@@ -12,13 +12,25 @@
 
 #include <ostream>
 
-Acts::HomogeneousVolumeMaterial::HomogeneousVolumeMaterial(
-    const Material& material)
+namespace Acts {
+
+HomogeneousVolumeMaterial::HomogeneousVolumeMaterial(const Material& material)
     : m_material(material) {}
 
-std::ostream& Acts::HomogeneousVolumeMaterial::toStream(
-    std::ostream& sl) const {
-  sl << "Acts::HomogeneousVolumeMaterial : " << std::endl;
+bool HomogeneousVolumeMaterial::operator==(
+    const HomogeneousVolumeMaterial& hvm) const {
+  return m_material == hvm.m_material;
+}
+
+const Material HomogeneousVolumeMaterial::material(
+    const Vector3& /*position*/) const {
+  return m_material;
+}
+
+std::ostream& HomogeneousVolumeMaterial::toStream(std::ostream& sl) const {
+  sl << "HomogeneousVolumeMaterial : " << std::endl;
   sl << "   - material : " << m_material << std::endl;
   return sl;
 }
+
+}  // namespace Acts