From c3f01c6901bdc7555c78d68816fb3041904a7ae4 Mon Sep 17 00:00:00 2001 From: cvarni Date: Sun, 6 Oct 2024 11:27:43 +0200 Subject: [PATCH 1/4] used std::atan2 --- Core/include/Acts/EventData/SpacePointContainer.ipp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Core/include/Acts/EventData/SpacePointContainer.ipp b/Core/include/Acts/EventData/SpacePointContainer.ipp index 01800be7cd5..70ad19237f6 100644 --- a/Core/include/Acts/EventData/SpacePointContainer.ipp +++ b/Core/include/Acts/EventData/SpacePointContainer.ipp @@ -6,8 +6,6 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. -#include - namespace Acts { template class holder_t> @@ -44,7 +42,7 @@ void SpacePointContainer::initialize() { m_data.setZ(i, external_container.z_impl(i)); m_data.setRadius( i, std::sqrt(m_data.x(i) * m_data.x(i) + m_data.y(i) * m_data.y(i))); - m_data.setPhi(i, atan2f(m_data.y(i), m_data.x(i))); + m_data.setPhi(i, std::atan2(m_data.y(i), m_data.x(i))); m_data.setVarianceR(i, external_container.varianceR_impl(i)); m_data.setVarianceZ(i, external_container.varianceZ_impl(i)); From a228d7cdafd5cb14938fb0e384580f9a25f3a05a Mon Sep 17 00:00:00 2001 From: cvarni Date: Sun, 6 Oct 2024 13:02:57 +0200 Subject: [PATCH 2/4] includes --- Core/include/Acts/EventData/SpacePointContainer.hpp | 2 -- Core/include/Acts/EventData/SpacePointContainer.ipp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/include/Acts/EventData/SpacePointContainer.hpp b/Core/include/Acts/EventData/SpacePointContainer.hpp index 5a7be3b23f7..619a1393ecc 100644 --- a/Core/include/Acts/EventData/SpacePointContainer.hpp +++ b/Core/include/Acts/EventData/SpacePointContainer.hpp @@ -19,8 +19,6 @@ #include #include -#include - namespace Acts { struct SpacePointContainerConfig { diff --git a/Core/include/Acts/EventData/SpacePointContainer.ipp b/Core/include/Acts/EventData/SpacePointContainer.ipp index 70ad19237f6..e0c381e4a50 100644 --- a/Core/include/Acts/EventData/SpacePointContainer.ipp +++ b/Core/include/Acts/EventData/SpacePointContainer.ipp @@ -6,6 +6,8 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at https://mozilla.org/MPL/2.0/. +#include + namespace Acts { template class holder_t> From b9577c3cbcf3b8355bf3e73a3171888932a6a6f0 Mon Sep 17 00:00:00 2001 From: cvarni Date: Sun, 6 Oct 2024 13:13:38 +0200 Subject: [PATCH 3/4] hypot as well --- Core/include/Acts/EventData/SpacePointContainer.ipp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Core/include/Acts/EventData/SpacePointContainer.ipp b/Core/include/Acts/EventData/SpacePointContainer.ipp index e0c381e4a50..65d9111a3cd 100644 --- a/Core/include/Acts/EventData/SpacePointContainer.ipp +++ b/Core/include/Acts/EventData/SpacePointContainer.ipp @@ -42,8 +42,7 @@ void SpacePointContainer::initialize() { m_data.setX(i, external_container.x_impl(i) - m_options.beamPos[0]); m_data.setY(i, external_container.y_impl(i) - m_options.beamPos[1]); m_data.setZ(i, external_container.z_impl(i)); - m_data.setRadius( - i, std::sqrt(m_data.x(i) * m_data.x(i) + m_data.y(i) * m_data.y(i))); + m_data.setRadius(i, std::hypot(m_data.x(i), m_data.y(i))); m_data.setPhi(i, std::atan2(m_data.y(i), m_data.x(i))); m_data.setVarianceR(i, external_container.varianceR_impl(i)); m_data.setVarianceZ(i, external_container.varianceZ_impl(i)); From 2ff7a36b0268829c3a3e7868052065068b2dbec7 Mon Sep 17 00:00:00 2001 From: cvarni Date: Sun, 6 Oct 2024 14:16:01 +0200 Subject: [PATCH 4/4] no hypot --- Core/include/Acts/EventData/SpacePointContainer.ipp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/include/Acts/EventData/SpacePointContainer.ipp b/Core/include/Acts/EventData/SpacePointContainer.ipp index 65d9111a3cd..e0c381e4a50 100644 --- a/Core/include/Acts/EventData/SpacePointContainer.ipp +++ b/Core/include/Acts/EventData/SpacePointContainer.ipp @@ -42,7 +42,8 @@ void SpacePointContainer::initialize() { m_data.setX(i, external_container.x_impl(i) - m_options.beamPos[0]); m_data.setY(i, external_container.y_impl(i) - m_options.beamPos[1]); m_data.setZ(i, external_container.z_impl(i)); - m_data.setRadius(i, std::hypot(m_data.x(i), m_data.y(i))); + m_data.setRadius( + i, std::sqrt(m_data.x(i) * m_data.x(i) + m_data.y(i) * m_data.y(i))); m_data.setPhi(i, std::atan2(m_data.y(i), m_data.x(i))); m_data.setVarianceR(i, external_container.varianceR_impl(i)); m_data.setVarianceZ(i, external_container.varianceZ_impl(i));