diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.h
index a833fe39d9a1ccb6765c5bb640fc67ea7682567a..29337e093320b5b447e22799022ade1e78408af8 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.h
@@ -3,8 +3,7 @@
*/
/**
- * @file AlignedDynArray.h
- * @date 26th November 2019
+
* @author Anthony Morley, Christos Anastopoulos
* @brief Dynamic array fullfilling alignment requirements
*/
@@ -14,10 +13,21 @@
#include <cstdlib>
#include <memory>
namespace GSFUtils {
-template<typename T, size_t Alignment>
+/*
+ * GCC and Clang provide) the the attribute
+ * if we have a std implementing ideas from
+ * http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0886r0.pdf
+ * prb we do not need this
+ */
+#if defined(__GNUC__) && !defined(__CLING__) && !defined(__ICC)
+#define GSF_ALIGN_RETURN(X) __attribute__((assume_aligned(X)))
+#else
+#define GSF_ALIGN_RETURN(X)
+#endif
+
/**
- * A wrapper around std::aligned_alloc
- *
+ * A wrapper around std::aligned_alloc
+ *
* The main usage is to create an alligned buffer
* array to be used with vector instructions
*
@@ -26,10 +36,22 @@ template<typename T, size_t Alignment>
* - Default initialization of elements
* - Value initialization of elements.
*/
-
-class AlignedDynArray
+template<typename T, size_t ALIGNMENT>
+struct AlignedDynArray
{
-public:
+
+ ///@{
+ // Standard typedefs
+ typedef T value_type;
+ typedef T* pointer;
+ typedef const T* const_pointer;
+ typedef value_type& reference;
+ typedef const value_type& const_reference;
+ typedef value_type* iterator;
+ typedef const value_type* const_iterator;
+ typedef std::size_t size_type;
+ typedef std::ptrdiff_t difference_type;
+ /// @}
/// Deleted default constructor
AlignedDynArray() = delete;
/// Deleted default copy constructor
@@ -50,22 +72,28 @@ public:
~AlignedDynArray();
/// Get the underlying buffer
- T* buffer () noexcept;
+ pointer buffer() noexcept GSF_ALIGN_RETURN(ALIGNMENT);
/// Get the underlying buffer
- const T* buffer() const noexcept;
+ const_pointer buffer() const noexcept GSF_ALIGN_RETURN(ALIGNMENT) ;
/// index array operators
- T& operator[](const std::size_t pos) noexcept;
- const T& operator[](const std::size_t pos) const noexcept;
+ reference operator[](const std::size_t pos) noexcept;
+ const_reference operator[](const std::size_t pos) const noexcept;
- /// size of allocated buffer
- std::size_t size() const noexcept;
+ /// number of elements/size
+ size_type size() const noexcept;
+ /// iterator pointing to the first element
+ iterator begin() noexcept GSF_ALIGN_RETURN(ALIGNMENT);
- typedef T* iterator;
- typedef const T* const_iterator;
- iterator begin() { return &m_buffer[0]; }
- iterator end() { return &m_buffer[m_size]; }
+ /// const iterator pointing to the first element
+ const_iterator begin() const noexcept GSF_ALIGN_RETURN(ALIGNMENT);
+
+ /// iterator pointing to the past-the-end element
+ iterator end() noexcept GSF_ALIGN_RETURN(ALIGNMENT);
+
+ /// const iterator pointing to the past-the-end element
+ const_iterator end() const noexcept GSF_ALIGN_RETURN(ALIGNMENT);
private:
void cleanup() noexcept;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.icc b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.icc
index e47f9028a1c73b3da64f84bab4c01326afd037b1..3af2ae3a7e50b1a0d53d8d920ae624918323dd5b 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.icc
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.icc
@@ -11,28 +11,28 @@
namespace GSFUtils {
-template<typename T, size_t Alignment>
-inline AlignedDynArray<T, Alignment>::AlignedDynArray(size_t n)
+template<typename T, size_t ALIGNMENT>
+inline AlignedDynArray<T, ALIGNMENT>::AlignedDynArray(size_t n)
: m_buffer(nullptr)
, m_size(n)
{
const size_t bufferSize = n * sizeof(T);
- m_buffer = static_cast<T*>(std::aligned_alloc(Alignment, bufferSize));
+ m_buffer = static_cast<T*>(std::aligned_alloc(ALIGNMENT, bufferSize));
std::uninitialized_default_construct(m_buffer, m_buffer + m_size);
}
-template<typename T, size_t Alignment>
-inline AlignedDynArray<T, Alignment>::AlignedDynArray(size_t n, const T& value)
+template<typename T, size_t ALIGNMENT>
+inline AlignedDynArray<T, ALIGNMENT>::AlignedDynArray(size_t n, const T& value)
: m_buffer(nullptr)
, m_size(n)
{
const size_t bufferSize = n * sizeof(T);
- m_buffer = static_cast<T*>(std::aligned_alloc(Alignment, bufferSize));
+ m_buffer = static_cast<T*>(std::aligned_alloc(ALIGNMENT, bufferSize));
std::uninitialized_fill(m_buffer, m_buffer + m_size, value);
}
-template<typename T, size_t Alignment>
-inline AlignedDynArray<T, Alignment>::AlignedDynArray(
+template<typename T, size_t ALIGNMENT>
+inline AlignedDynArray<T, ALIGNMENT>::AlignedDynArray(
AlignedDynArray&& other) noexcept
: m_buffer(nullptr)
, m_size(0)
@@ -45,9 +45,9 @@ inline AlignedDynArray<T, Alignment>::AlignedDynArray(
other.m_size = 0;
}
-template<typename T, size_t Alignment>
-inline AlignedDynArray<T, Alignment>&
-AlignedDynArray<T, Alignment>::operator=(AlignedDynArray&& other) noexcept
+template<typename T, size_t ALIGNMENT>
+inline AlignedDynArray<T, ALIGNMENT>&
+AlignedDynArray<T, ALIGNMENT>::operator=(AlignedDynArray&& other) noexcept
{
// cleanup this object
cleanup();
@@ -61,50 +61,80 @@ AlignedDynArray<T, Alignment>::operator=(AlignedDynArray&& other) noexcept
return *this;
}
-template<typename T, size_t Alignment>
-inline AlignedDynArray<T, Alignment>::~AlignedDynArray()
+template<typename T, size_t ALIGNMENT>
+inline AlignedDynArray<T, ALIGNMENT>::~AlignedDynArray()
{
cleanup();
}
-template<typename T, size_t Alignment>
-inline T*
-AlignedDynArray<T, Alignment>::buffer() noexcept
+template<typename T, size_t ALIGNMENT>
+inline typename AlignedDynArray<T, ALIGNMENT>::pointer
+AlignedDynArray<T, ALIGNMENT>::buffer() noexcept
{
- return m_buffer;
+ return std::addressof(m_buffer[0]);
}
-template<typename T, size_t Alignment>
-inline const T*
-AlignedDynArray<T, Alignment>::buffer() const noexcept
+template<typename T, size_t ALIGNMENT>
+inline typename AlignedDynArray<T, ALIGNMENT>::const_pointer
+AlignedDynArray<T, ALIGNMENT>::buffer() const noexcept
{
- return m_buffer;
+ return std::addressof(m_buffer[0]);
}
-template<typename T, size_t Alignment>
-inline T& AlignedDynArray<T, Alignment>::operator[](
- const std::size_t pos) noexcept
+template<typename T, size_t ALIGNMENT>
+inline typename AlignedDynArray<T, ALIGNMENT>::reference
+ AlignedDynArray<T, ALIGNMENT>::operator[](const std::size_t pos) noexcept
{
return m_buffer[pos];
}
-template<typename T, size_t Alignment>
-inline const T& AlignedDynArray<T, Alignment>::operator[](
- const std::size_t pos) const noexcept
+template<typename T, size_t ALIGNMENT>
+inline typename AlignedDynArray<T, ALIGNMENT>::const_reference
+ AlignedDynArray<T, ALIGNMENT>::operator[](const std::size_t pos) const
+ noexcept
{
return m_buffer[pos];
}
-template<typename T, size_t Alignment>
-inline std::size_t
-AlignedDynArray<T, Alignment>::size() const noexcept
+template<typename T, size_t ALIGNMENT>
+inline typename AlignedDynArray<T, ALIGNMENT>::size_type
+AlignedDynArray<T, ALIGNMENT>::size() const noexcept
{
return m_size;
}
-template<typename T, size_t Alignment>
+template<typename T, size_t ALIGNMENT>
+inline typename AlignedDynArray<T, ALIGNMENT>::iterator
+AlignedDynArray<T, ALIGNMENT>::begin() noexcept
+{
+ return std::addressof(m_buffer[0]);
+}
+
+template<typename T, size_t ALIGNMENT>
+inline typename AlignedDynArray<T, ALIGNMENT>::const_iterator
+AlignedDynArray<T, ALIGNMENT>::begin() const noexcept
+{
+ return std::addressof(m_buffer[0]);
+}
+
+template<typename T, size_t ALIGNMENT>
+inline typename AlignedDynArray<T, ALIGNMENT>::iterator
+AlignedDynArray<T, ALIGNMENT>::end() noexcept
+{
+ return std::addressof(m_buffer[m_size]);
+}
+
+template<typename T, size_t ALIGNMENT>
+inline typename AlignedDynArray<T, ALIGNMENT>::const_iterator
+AlignedDynArray<T, ALIGNMENT>::end() const noexcept
+{
+ return std::addressof(m_buffer[m_size]);
+}
+
+// private cleanup helper
+template<typename T, size_t ALIGNMENT>
inline void
-AlignedDynArray<T, Alignment>::cleanup() noexcept
+AlignedDynArray<T, ALIGNMENT>::cleanup() noexcept
{
if (m_buffer) {
for (std::size_t pos = 0; pos < m_size; ++pos) {
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/share/ut_GSF_testAlignedDynArray.ref b/Tracking/TrkFitter/TrkGaussianSumFilter/share/ut_GSF_testAlignedDynArray.ref
index 9b81d1f2ac385c377dbbcd2cff39c97749acd9b7..e4e53a8f2c7e4fff58f82cb43d5a43ef765eefa2 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/share/ut_GSF_testAlignedDynArray.ref
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/share/ut_GSF_testAlignedDynArray.ref
@@ -2,26 +2,37 @@
==> Test ctor with default init of elements
Size = 100
Address of [0]%alignment = 0
+Address of begin%alignment = 0
Value of 0th = 0
+Value of begin = 0
Value of last = 0
+Value of end -1 = 0
==> Test ctor with value init of elements
Size = 100
Address of [0]%alignment = 0
+Address of begin%alignment = 0
Value of 0th = 0.1
Value of last = 0.1
+Value of begin = 0.1
+Value of last = 0.1
+Value of end -1 = 0.1
==> Test move copy ctor
-Size = 100
-Size of moved from 0
+Size after assignment = 100
Address of [0]%alignment = 0
+Address of begin%alignment = 0
Value of 0th = 0.1
+Value of begin = 0.1
Value of last = 0.1
+Value of end -1 = 0.1
==> Test move assignment
Size before assignment = 50
-Size = 100
-Size of moved from 0
+Size after assignment 100
Address of [0]%alignment = 0
+Address of begin%alignment = 0
Value of 0th = 0.1
+Value of begin = 0.1
Value of last = 0.1
+Value of end -1 = 0.1
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
index f317764a29d4be26782b557a60498cc62d6948e0..30005e8596024ed597b1804ca777ee7276e318d9 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
@@ -290,9 +290,9 @@ Trk::ForwardGsfFitter::stepForwardFit(
if (extrapolatedState.empty()) {
ATH_MSG_DEBUG("Extrapolation failed... returning false");
return false;
- } else {
+ }
ATH_MSG_DEBUG("Extrapolation worked... state size: "<< extrapolatedState.size() );
- }
+
// =======================
// Measurement Preparation
// =======================
@@ -329,9 +329,9 @@ Trk::ForwardGsfFitter::stepForwardFit(
if (updatedState.empty()) {
ATH_MSG_DEBUG("Measurement update of the state failed... Exiting!");
return false;
- } else {
+ }
ATH_MSG_DEBUG("Measurement update of the state worked : " << updatedState.size() );
- }
+
// Bail if the fit quality is not defined:
if (!fitQuality) {
ATH_MSG_DEBUG(
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMaterialMixtureConvolutionLM.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMaterialMixtureConvolutionLM.cxx
index 3f8405742c5811a5d415ed0fcc7d8097ba3fd43f..08b4bc69150da42c40bc5a4d777cc18830544257 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMaterialMixtureConvolutionLM.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMaterialMixtureConvolutionLM.cxx
@@ -366,7 +366,7 @@ Trk::MultiComponentState Trk::GsfMaterialMixtureConvolutionLM::update(
++nMerges;
- const AmgVector(5) firstParameters = stateVector;
+ const AmgVector(5)& firstParameters = stateVector;
const double firstWeight = caches[stateIndex].weights[materialIndex];
Trk::MultiComponentStateCombiner::combineParametersWithWeight( caches[stateIndex].deltaParameters[materialIndex],
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMeasurementUpdator.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMeasurementUpdator.cxx
index 5ffb33af9b5b74fbfde643566eaa7e59c37514df..a5b54b923a70de5ec773459cfc5fe45cdae6d333 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMeasurementUpdator.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMeasurementUpdator.cxx
@@ -291,9 +291,9 @@ Trk::GsfMeasurementUpdator::calculateFilterStep(
if (stateBeforeUpdate.empty()) {
ATH_MSG_WARNING("Cannot update multi-state with no components!");
return {};
- } else {
+ }
ATH_MSG_DEBUG("calculateFilterStep() starting with : " << stateBeforeUpdate.size() );
- }
+
// Calculate the weight of each component after the measurement
std::vector<Trk::ComponentParameters> stateWithNewWeights =
@@ -303,9 +303,9 @@ Trk::GsfMeasurementUpdator::calculateFilterStep(
if (stateWithNewWeights.empty()) {
ATH_MSG_DEBUG("Cacluation of state posterior weights failed... Exiting!");
return {};
- } else {
+ }
ATH_MSG_DEBUG("calculateFilterStep() after new weights : " << stateWithNewWeights.size() );
- }
+
// Update each component using the specified updator
Trk::MultiComponentState::const_iterator component =
@@ -393,9 +393,9 @@ Trk::GsfMeasurementUpdator::calculateFilterStep(
if (assembledUpdatedState.empty()) {
return {};
- } else {
+ }
ATH_MSG_DEBUG("Assembeled size : " << assembledUpdatedState.size() );
- }
+
fitQoS = std::make_unique<FitQualityOnSurface>(chiSquared, degreesOfFreedom);
// Renormalise state
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/PosteriorWeightsCalculator.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/PosteriorWeightsCalculator.cxx
index feca067010681660ae3981f9f3616103e91110d5..7ee3edb73369b865d800e5a94e5bbc0142747376 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/PosteriorWeightsCalculator.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/PosteriorWeightsCalculator.cxx
@@ -20,7 +20,7 @@ namespace {
using namespace Trk;
// expansion and reduction matrices set
-static const ProjectionMatricesSet reMatrices(5);
+const ProjectionMatricesSet reMatrices(5);
template<int DIM>
std::pair<double, double>
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/test/testAlignedDynArray.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/test/testAlignedDynArray.cxx
index e0d467666d07308f68769306100b4816dafb6d5a..e3a7cbc438df128f2fdac9ce35ae97120c949472 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/test/testAlignedDynArray.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/test/testAlignedDynArray.cxx
@@ -14,36 +14,54 @@ int main()
std::cout << "Size = " << test1.size()<< std::endl;
std::cout << "Address of [0]%alignment = "
<< reinterpret_cast<std::ptrdiff_t>(&test1[0]) % alignement << std::endl;
+ std::cout << "Address of begin%alignment = "
+ << reinterpret_cast<std::ptrdiff_t>(test1.begin()) % alignement << std::endl;
std::cout << "Value of 0th = " << test1[0] << std::endl;
+ std::cout << "Value of begin = " << *(test1.begin()) << std::endl;
std::cout << "Value of last = " << test1[99] << std::endl;
+ std::cout << "Value of end -1 = " << *(test1.end()-1) << std::endl;
+
std::cout << "\n ==> Test ctor with value init of elements" << std::endl;
GSFUtils::AlignedDynArray<double, alignement> test2(n, 0.1);
std::cout << "Size = " << test2.size()<< std::endl;
std::cout << "Address of [0]%alignment = "
<< reinterpret_cast<std::ptrdiff_t>(&test2[0]) % alignement << std::endl;
+ std::cout << "Address of begin%alignment = "
+ << reinterpret_cast<std::ptrdiff_t>(test2.begin()) % alignement << std::endl;
std::cout << "Value of 0th = " << test2[0] << std::endl;
std::cout << "Value of last = " << test2[99] << std::endl;
+ std::cout << "Value of begin = " << *(test2.begin()) << std::endl;
+ std::cout << "Value of last = " << test2[99] << std::endl;
+ std::cout << "Value of end -1 = " << *(test2.end()-1) << std::endl;
+
std::cout << "\n ==> Test move copy ctor" << std::endl;
GSFUtils::AlignedDynArray<double, alignement> test3(std::move(test2));
- std::cout << "Size = " << test3.size()<< std::endl;
- std::cout << "Size of moved from " << test2.size()<< std::endl;
+ std::cout << "Size after assignment = " << test3.size()<< std::endl;
std::cout << "Address of [0]%alignment = "
<< reinterpret_cast<std::ptrdiff_t>(&test3[0]) % alignement << std::endl;
+ std::cout << "Address of begin%alignment = "
+ << reinterpret_cast<std::ptrdiff_t>(test3.begin()) % alignement << std::endl;
std::cout << "Value of 0th = " << test3[0] << std::endl;
+ std::cout << "Value of begin = " << *(test3.begin()) << std::endl;
std::cout << "Value of last = " << test3[99] << std::endl;
+ std::cout << "Value of end -1 = " << *(test3.end()-1) << std::endl;
+
std::cout << "\n ==> Test move assignment" << std::endl;
GSFUtils::AlignedDynArray<double, alignement> test4(n/2);
std::cout << "Size before assignment = " << test4.size()<< std::endl;
test4=std::move(test3);
- std::cout << "Size = " << test4.size()<< std::endl;
- std::cout << "Size of moved from " << test3.size()<< std::endl;
+ std::cout << "Size after assignment " << test4.size()<< std::endl;
std::cout << "Address of [0]%alignment = "
<< reinterpret_cast<std::ptrdiff_t>(&test4[0]) % alignement << std::endl;
+ std::cout << "Address of begin%alignment = "
+ << reinterpret_cast<std::ptrdiff_t>(test4.begin()) % alignement << std::endl;
std::cout << "Value of 0th = " << test4[0] << std::endl;
+ std::cout << "Value of begin = " << *(test4.begin()) << std::endl;
std::cout << "Value of last = " << test4[99] << std::endl;
+ std::cout << "Value of end -1 = " << *(test4.end()-1) << std::endl;
return 0;
}