From be90eacc83fe1ccefe2fdfddf6e3f83084ef4ac7 Mon Sep 17 00:00:00 2001 From: LuisFelipeCoelho Date: Wed, 15 Nov 2023 10:16:38 +0100 Subject: [PATCH 1/3] shrink deltaZMax --- .../Acts/Seeding/SeedFinderOrthogonal.ipp | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp b/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp index ec11c8ee926..e315b9a527c 100644 --- a/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp +++ b/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp @@ -85,6 +85,12 @@ auto SeedFinderOrthogonal::validTupleOrthoRangeLH( res[DimPhi].shrinkMin(pL - m_config.deltaPhiMax); res[DimPhi].shrinkMax(pL + m_config.deltaPhiMax); + /* + * Cut: Ensure that z-distance between SPs is within max and min values. + */ + res[DimZ].shrinkMin(zL - m_config.deltaZMax); + res[DimZ].shrinkMax(zL + m_config.deltaZMax); + return res; } @@ -93,6 +99,7 @@ auto SeedFinderOrthogonal::validTupleOrthoRangeHL( const internal_sp_t &high) const -> typename tree_t::range_t { float pM = high.phi(); float rM = high.radius(); + float zM = high.z(); typename tree_t::range_t res; @@ -129,13 +136,13 @@ auto SeedFinderOrthogonal::validTupleOrthoRangeHL( */ float fracR = res[DimR].min() / rM; - float zMin = (high.z() - m_config.collisionRegionMin) * fracR + - m_config.collisionRegionMin; - float zMax = (high.z() - m_config.collisionRegionMax) * fracR + - m_config.collisionRegionMax; + float zMin = + (zM - m_config.collisionRegionMin) * fracR + m_config.collisionRegionMin; + float zMax = + (zM - m_config.collisionRegionMax) * fracR + m_config.collisionRegionMax; - res[DimZ].shrinkMin(std::min(zMin, high.z())); - res[DimZ].shrinkMax(std::max(zMax, high.z())); + res[DimZ].shrinkMin(std::min(zMin, zM)); + res[DimZ].shrinkMax(std::max(zMax, zM)); /* * Cut: Shrink the φ range, such that Δφ_min ≤ φ - φ_H ≤ Δφ_max @@ -143,6 +150,12 @@ auto SeedFinderOrthogonal::validTupleOrthoRangeHL( res[DimPhi].shrinkMin(pM - m_config.deltaPhiMax); res[DimPhi].shrinkMax(pM + m_config.deltaPhiMax); + /* + * Cut: Ensure that z-distance between SPs is within max and min values. + */ + res[DimZ].shrinkMin(zM - m_config.deltaZMax); + res[DimZ].shrinkMax(zM + m_config.deltaZMax); + return res; } @@ -219,12 +232,6 @@ bool SeedFinderOrthogonal::validTuple( if (std::fabs(cotTheta) > m_config.cotThetaMax) { return false; } - /* - * Cut: Ensure that z-distance between SPs is within max and min values. - */ - if (std::abs(deltaZ) > m_config.deltaZMax) { - return false; - } return true; } From 9c7bc27121eac9b6e2dc7cb3ac8ea0a11e981342 Mon Sep 17 00:00:00 2001 From: Luis Falda Coelho <56648068+LuisFelipeCoelho@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:18:44 +0100 Subject: [PATCH 2/3] Update Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com> --- Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp b/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp index e315b9a527c..bd6c6073bfb 100644 --- a/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp +++ b/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp @@ -85,9 +85,7 @@ auto SeedFinderOrthogonal::validTupleOrthoRangeLH( res[DimPhi].shrinkMin(pL - m_config.deltaPhiMax); res[DimPhi].shrinkMax(pL + m_config.deltaPhiMax); - /* - * Cut: Ensure that z-distance between SPs is within max and min values. - */ + // Cut: Ensure that z-distance between SPs is within max and min values. res[DimZ].shrinkMin(zL - m_config.deltaZMax); res[DimZ].shrinkMax(zL + m_config.deltaZMax); From cddf367fc7b1d3d35836ec7c9ff60f79fe46348b Mon Sep 17 00:00:00 2001 From: Luis Falda Coelho <56648068+LuisFelipeCoelho@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:18:50 +0100 Subject: [PATCH 3/3] Update Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com> --- Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp b/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp index bd6c6073bfb..2235c3981c3 100644 --- a/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp +++ b/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp @@ -148,9 +148,7 @@ auto SeedFinderOrthogonal::validTupleOrthoRangeHL( res[DimPhi].shrinkMin(pM - m_config.deltaPhiMax); res[DimPhi].shrinkMax(pM + m_config.deltaPhiMax); - /* - * Cut: Ensure that z-distance between SPs is within max and min values. - */ + // Cut: Ensure that z-distance between SPs is within max and min values. res[DimZ].shrinkMin(zM - m_config.deltaZMax); res[DimZ].shrinkMax(zM + m_config.deltaZMax);