Merge pull request #1155 from stephenswat/feat/consecutive_hole_cut

Add CKF cut on number of consecutive holes

Author: stephenswat

core/include/traccc/finding/candidate_link.hpp

@@ -31,6 +31,9 @@ struct candidate_link {
     // How many times it skipped a surface
     unsigned int n_skipped;
 
+    // Number of consecutive holes; reset on measurement
+    unsigned int n_consecutive_skipped;
+
     // chi2
     traccc::scalar chi2;
 

core/include/traccc/finding/details/combinatorial_kalman_filter.hpp

@@ -181,6 +181,11 @@ combinatorial_kalman_filter(
                      ? 0
                      : links[step - 1][param_to_link[step - 1][in_param_id]]
                            .n_skipped);
+            const unsigned int consecutive_skipped =
+                (step == 0
+                     ? 0
+                     : links[step - 1][param_to_link[step - 1][in_param_id]]
+                           .n_consecutive_skipped);
             const scalar prev_chi2_sum =
                 (step == 0
                      ? 0.f
@@ -262,6 +267,7 @@ combinatorial_kalman_filter(
                           .meas_idx = meas_id,
                           .seed_idx = orig_param_id,
                           .n_skipped = skip_counter,
+                          .n_consecutive_skipped = 0,
                           .chi2 = chi2,
                           .chi2_sum = prev_chi2_sum + chi2,
                           .ndf_sum = prev_ndf_sum + meas.meas_dim},
@@ -307,6 +313,7 @@ combinatorial_kalman_filter(
                      .meas_idx = std::numeric_limits<unsigned int>::max(),
                      .seed_idx = orig_param_id,
                      .n_skipped = skip_counter + 1,
+                     .n_consecutive_skipped = consecutive_skipped + 1,
                      .chi2 = std::numeric_limits<traccc::scalar>::max(),
                      .chi2_sum = prev_chi2_sum,
                      .ndf_sum = prev_ndf_sum});

core/include/traccc/finding/finding_config.hpp

@@ -32,6 +32,9 @@ struct finding_config {
     /// Maximum allowed number of skipped steps per candidate
     unsigned int max_num_skipping_per_cand = 3;
 
+    /// Maximum number of consecutive holes
+    unsigned int max_num_consecutive_skipped = 1;
+
     /// Minimum step length that track should make to reach the next surface. It
     /// should be set higher than the overstep tolerance not to make it stay on
     /// the same surface

device/common/include/traccc/finding/device/impl/find_tracks.ipp

@@ -424,6 +424,7 @@ TRACCC_HOST_DEVICE inline void find_tracks(
                         .meas_idx = meas_idx,
                         .seed_idx = seed_idx,
                         .n_skipped = n_skipped,
+                        .n_consecutive_skipped = 0,
                         .chi2 = chi2,
                         .chi2_sum = prev_chi2_sum + chi2,
                         .ndf_sum =
@@ -494,6 +495,8 @@ TRACCC_HOST_DEVICE inline void find_tracks(
     unsigned int prev_link_idx = std::numeric_limits<unsigned int>::max();
     unsigned int seed_idx = std::numeric_limits<unsigned int>::max();
     unsigned int n_skipped = std::numeric_limits<unsigned int>::max();
+    unsigned int n_consecutive_skipped =
+        std::numeric_limits<unsigned int>::max();
     unsigned int prev_ndf_sum = 0u;
     scalar prev_chi2_sum = 0.f;
 
@@ -511,8 +514,13 @@ TRACCC_HOST_DEVICE inline void find_tracks(
         seed_idx =
             payload.step > 0 ? links.at(prev_link_idx).seed_idx : in_param_id;
         n_skipped = payload.step == 0 ? 0 : links.at(prev_link_idx).n_skipped;
+        n_consecutive_skipped =
+            payload.step == 0 ? 0
+                              : links.at(prev_link_idx).n_consecutive_skipped;
         in_param_can_create_hole =
-            (n_skipped < cfg.max_num_skipping_per_cand) && (!last_step);
+            (n_skipped < cfg.max_num_skipping_per_cand) &&
+            (n_consecutive_skipped < cfg.max_num_consecutive_skipped) &&
+            (!last_step);
         prev_ndf_sum = payload.step == 0 ? 0 : links.at(prev_link_idx).ndf_sum;
         prev_chi2_sum =
             payload.step == 0 ? 0.f : links.at(prev_link_idx).chi2_sum;
@@ -587,6 +595,7 @@ TRACCC_HOST_DEVICE inline void find_tracks(
                     .meas_idx = std::numeric_limits<unsigned int>::max(),
                     .seed_idx = seed_idx,
                     .n_skipped = n_skipped + 1,
+                    .n_consecutive_skipped = n_consecutive_skipped + 1,
                     .chi2 = std::numeric_limits<traccc::scalar>::max(),
                     .chi2_sum = prev_chi2_sum,
                     .ndf_sum = prev_ndf_sum};

examples/options/src/track_finding.cpp

@@ -61,6 +61,11 @@ track_finding::track_finding() : interface("Track Finding Options") {
         po::value(&m_config.max_num_skipping_per_cand)
             ->default_value(m_config.max_num_skipping_per_cand),
         "Maximum allowed number of skipped steps per candidate");
+    m_desc.add_options()(
+        "max-num-consecutive-skipped",
+        po::value(&m_config.max_num_consecutive_skipped)
+            ->default_value(m_config.max_num_consecutive_skipped),
+        "Maximum allowed number of consecutive skipped steps");
     m_desc.add_options()("particle-hypothesis",
                          po::value(&m_pdg_number)->default_value(m_pdg_number),
                          "PDG number for the particle hypothesis");

tests/cuda/test_ckf_toy_detector.cpp

@@ -241,7 +241,7 @@ TEST_P(CkfToyDetectorTests, Run) {
             float(n_matches) /
             static_cast<float>(std::max(track_candidates.size(),
                                         track_candidates_cuda.size()));
-        EXPECT_GE(matching_rate, 0.999f);
+        EXPECT_GE(matching_rate, 0.998f);
     }
 }
 

tests/sycl/test_ckf_toy_detector.cpp

@@ -237,7 +237,7 @@ TEST_P(CkfToyDetectorTests, Run) {
             float(n_matches) /
             static_cast<float>(std::max(track_candidates.size(),
                                         track_candidates_sycl.size()));
-        EXPECT_GE(matching_rate, 0.999f);
+        EXPECT_GE(matching_rate, 0.998f);
     }
 }