revive delta r thingy

Author: andiwand

Core/include/Acts/Seeding2/BroadTripletSeedFilter.hpp

@@ -69,7 +69,7 @@ class BroadTripletSeedFilter final {
 
     /// Use deltaR between top and middle SP instead of top radius to search for
     /// compatible SPs
-    bool useDeltaRorTopRadius = false;
+    bool useDeltaRinsteadOfTopRadius = false;
 
     std::shared_ptr<ITripletSeedCuts> experimentCuts;
   };

Core/src/Seeding2/BroadTripletSeedFilter.cpp

@@ -10,6 +10,7 @@
 
 #include "Acts/EventData/SpacePointContainer2.hpp"
 #include "Acts/Seeding2/ITripletSeedCuts.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 
 #include <algorithm>
 #include <numeric>
@@ -86,6 +87,13 @@ void BroadTripletSeedFilter::filter2SpFixed(
   // vector containing the radius of all compatible seeds
   cache.compatibleSeedR.reserve(m_cfg.compatSeedLimit);
 
+  const auto getTopR = [&](ConstSpacePointProxy2 spT) {
+    if (m_cfg.useDeltaRinsteadOfTopRadius) {
+      return fastHypot(spT.extra(rColumn), spT.z());
+    }
+    return spT.extra(rColumn);
+  };
+
   std::size_t beginCompTopIndex = 0;
   // loop over top SPs and other compatible top SP candidates
   for (const std::size_t topSpIndex : cache.topSpIndexVec) {
@@ -99,12 +107,10 @@ void BroadTripletSeedFilter::filter2SpFixed(
     float invHelixDiameter = invHelixDiameterVec[topSpIndex];
     float lowerLimitCurv = invHelixDiameter - m_cfg.deltaInvHelixDiameter;
     float upperLimitCurv = invHelixDiameter + m_cfg.deltaInvHelixDiameter;
-    // use deltaR instead of top radius
-    assert(!m_cfg.useDeltaRorTopRadius && "TODO not implemented");
-    float currentTopR = spT.extra(rColumn);
+    float currentTopR = getTopR(spT);
     float impact = impactParametersVec[topSpIndex];
 
-    float weight = -(impact * m_cfg.impactWeightFactor);
+    float weight = -impact * m_cfg.impactWeightFactor;
 
     // loop over compatible top SP candidates
     for (std::size_t variableCompTopIndex = beginCompTopIndex;
@@ -117,8 +123,7 @@ void BroadTripletSeedFilter::filter2SpFixed(
       }
       auto otherSpT = spacePoints.at(topSpVec[compatibletopSpIndex]);
 
-      assert(!m_cfg.useDeltaRorTopRadius && "TODO not implemented");
-      float otherTopR = otherSpT.extra(rColumn);
+      float otherTopR = getTopR(otherSpT);
 
       // curvature difference within limits?
       if (invHelixDiameterVec[compatibletopSpIndex] < lowerLimitCurv) {

Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/GridTripletSeedingAlgorithm.hpp

@@ -188,6 +188,10 @@ class GridTripletSeedingAlgorithm final : public IAlgorithm {
     float seedWeightIncrement = 0;
     float numSeedIncrement = std::numeric_limits<float>::infinity();
 
+    /// Use deltaR between top and middle SP instead of top radius to search for
+    /// compatible SPs
+    bool useDeltaRinsteadOfTopRadius = false;
+
     // Seeding parameters used for quality seed confirmation
 
     /// Enable quality seed confirmation, this is different than default seeding

Examples/Algorithms/TrackFinding/src/GridTripletSeedingAlgorithm.cpp

@@ -81,6 +81,7 @@ GridTripletSeedingAlgorithm::GridTripletSeedingAlgorithm(
   filterConfig.compatSeedLimit = m_cfg.compatSeedLimit;
   filterConfig.seedWeightIncrement = m_cfg.seedWeightIncrement;
   filterConfig.numSeedIncrement = m_cfg.numSeedIncrement;
+  filterConfig.useDeltaRinsteadOfTopRadius = m_cfg.useDeltaRinsteadOfTopRadius;
 
   m_seedFilter = Acts::Experimental::BroadTripletSeedFilter(
       filterConfig, logger().cloneWithSuffix("Filter"));

Examples/Python/python/acts/examples/reconstruction.py

@@ -884,6 +884,7 @@ def addGridTripletSeeding(
             compatSeedLimit=seedFilterConfigArg.compatSeedLimit,
             seedWeightIncrement=seedFilterConfigArg.seedWeightIncrement,
             numSeedIncrement=seedFilterConfigArg.numSeedIncrement,
+            useDeltaRinsteadOfTopRadius=seedFilterConfigArg.useDeltaRorTopRadius,
             seedConfirmation=seedFinderConfigArg.seedConfirmation,
             centralSeedConfirmationRange=seedFinderConfigArg.centralSeedConfirmationRange,
             forwardSeedConfirmationRange=seedFinderConfigArg.forwardSeedConfirmationRange,

Examples/Python/src/TrackFinding.cpp

@@ -164,8 +164,9 @@ void addTrackFinding(Context& ctx) {
       helixCutTolerance, sigmaScattering, radLengthPerSeed, maxPtScattering,
       toleranceParam, deltaInvHelixDiameter, compatSeedWeight,
       impactWeightFactor, zOriginWeightFactor, maxSeedsPerSpM, compatSeedLimit,
-      seedWeightIncrement, numSeedIncrement, seedConfirmation,
-      centralSeedConfirmationRange, forwardSeedConfirmationRange, useExtraCuts);
+      seedWeightIncrement, numSeedIncrement, useDeltaRinsteadOfTopRadius,
+      seedConfirmation, centralSeedConfirmationRange,
+      forwardSeedConfirmationRange, useExtraCuts);
 
   ACTS_PYTHON_DECLARE_ALGORITHM(ActsExamples::SeedingOrthogonalAlgorithm, mex,
                                 "SeedingOrthogonalAlgorithm", inputSpacePoints,