Skip to content

Commit

Permalink
revert Core changes
Browse files Browse the repository at this point in the history
  • Loading branch information
AJPfleger committed Oct 18, 2024
1 parent cced811 commit 672aa9c
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Core/include/Acts/Material/AccumulatedSurfaceMaterial.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class AccumulatedSurfaceMaterial {
/// Default Constructor - for homogeneous material
///
/// @param splitFactor is the pre/post splitting directive
explicit AccumulatedSurfaceMaterial(double splitFactor = 0.);
AccumulatedSurfaceMaterial(double splitFactor = 0.);

/// Explicit constructor with only full MaterialSlab,
/// for one-dimensional binning.
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/Material/HomogeneousVolumeMaterial.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class HomogeneousVolumeMaterial : public IVolumeMaterial {
/// Explicit constructor
///
/// @param material is the material held by this
explicit HomogeneousVolumeMaterial(const Material& material);
HomogeneousVolumeMaterial(const Material& material);

/// Copy Constructor
///
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/Material/ISurfaceMaterial.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ISurfaceMaterial {
/// Constructor
///
/// @param splitFactor is the splitting ratio between pre/post update
explicit ISurfaceMaterial(double splitFactor) : m_splitFactor(splitFactor) {}
ISurfaceMaterial(double splitFactor) : m_splitFactor(splitFactor) {}

/// Constructor
///
Expand Down
3 changes: 1 addition & 2 deletions Core/include/Acts/Material/InterpolatedMaterialMap.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,7 @@ class InterpolatedMaterialMap : public IVolumeMaterial {
/// @brief Create interpolated map
///
/// @param [in] mapper Material map
explicit InterpolatedMaterialMap(Mapper_t&& mapper)
: m_mapper(std::move(mapper)) {}
InterpolatedMaterialMap(Mapper_t&& mapper) : m_mapper(std::move(mapper)) {}

/// @brief Create interpolated map
///
Expand Down
4 changes: 2 additions & 2 deletions Core/include/Acts/Material/MaterialInteraction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ struct InteractionVolume {

/// Constructor from tracking volume
/// @param tv The tracking volume
explicit InteractionVolume(const TrackingVolume* tv) : trackingVolume(tv) {}
InteractionVolume(const TrackingVolume* tv) : trackingVolume(tv) {}

/// Constructor from detector volume
/// @param dv The detector volume
explicit InteractionVolume(const Experimental::DetectorVolume* dv)
InteractionVolume(const Experimental::DetectorVolume* dv)
: detectorVolume(dv) {}

/// Forward the geometry identifier
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/Material/PropagatorMaterialAssigner.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class PropagatorMaterialAssigner final : public IAssignmentFinder {
public:
/// @brief Construct with propagator
/// @param propagator
explicit PropagatorMaterialAssigner(propagator_t propagator)
PropagatorMaterialAssigner(propagator_t propagator)
: m_propagator(std::move(propagator)) {}

/// @brief Method for generating assignment candidates for the
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/Material/ProtoVolumeMaterial.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ProtoVolumeMaterial : public IVolumeMaterial {
///
/// @param binUtility a BinUtility determining the granularity
/// and binning of the material on the volume
explicit ProtoVolumeMaterial(const BinUtility& binUtility);
ProtoVolumeMaterial(const BinUtility& binUtility);

/// Copy constructor
///
Expand Down
2 changes: 1 addition & 1 deletion Core/src/Material/VolumeMaterialMapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ void Acts::VolumeMaterialMapper::mapMaterialTrack(
sfIter++;
}
}
rmIter->volume = InteractionVolume{volIter->volume};
rmIter->volume = volIter->volume;
rmIter->intersectionID = currentID;
rmIter->intersection = rmIter->position;
}
Expand Down

0 comments on commit 672aa9c

Please sign in to comment.