Merge branch 'main' into validate-meas-creation

beomki-yeo · Oct 17, 2024 · 2230086 · 2230086
2 parents 9e48539 + 12ae313
commit 2230086
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 5 deletions.
diff --git a/core/include/traccc/finding/finding_config.hpp b/core/include/traccc/finding/finding_config.hpp
@@ -40,7 +40,7 @@ struct finding_config {
     unsigned int max_step_counts_for_next_surface = 100;
 
     /// Maximum Chi-square that is allowed for branching
-    float chi2_max = 30.f;
+    float chi2_max = 10.f;
 
     /// Propagation configuration
     detray::propagation::config propagation{};

diff --git a/data/traccc_data_get_files.sh b/data/traccc_data_get_files.sh
@@ -27,7 +27,7 @@ usage() {
 }
 
 # Default script arguments.
-TRACCC_DATA_NAME=${TRACCC_DATA_NAME:-"traccc-data-v8"}
+TRACCC_DATA_NAME=${TRACCC_DATA_NAME:-"traccc-data-v9"}
 TRACCC_WEB_DIRECTORY=${TRACCC_WEB_DIRECTORY:-"https://acts.web.cern.ch/traccc/data"}
 TRACCC_DATA_DIRECTORY=${TRACCC_DATA_DIRECTORY:-$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)}
 TRACCC_CMAKE_EXECUTABLE=${TRACCC_CMAKE_EXECUTABLE:-cmake}

diff --git a/data/traccc_data_package_files.sh b/data/traccc_data_package_files.sh
@@ -27,7 +27,7 @@ usage() {
 }
 
 # Default script arguments.
-TRACCC_DATA_NAME=${TRACCC_DATA_NAME:-"traccc-data-v9"}
+TRACCC_DATA_NAME=${TRACCC_DATA_NAME:-"traccc-data-v10"}
 TRACCC_DATA_DIRECTORY_NAMES=("cca_test" "detray_simulation" "geometries" "odd"
    "single_module" "tml_detector" "tml_full" "tml_pixel_barrel" "tml_pixels"
    "two_modules")

diff --git a/examples/options/include/traccc/options/track_finding.hpp b/examples/options/include/traccc/options/track_finding.hpp
@@ -47,7 +47,7 @@ class track_finding : public interface, public config_provider<finding_config> {
     /// Maximum step counts that track can make to reach the next surface
     unsigned int max_step_counts_for_next_surface = 100;
     /// Maximum chi2 for a measurement to be included in the track
-    float chi2_max = 30.f;
+    float chi2_max = 10.f;
     /// Maximum number of branches which each initial seed can have at a step
     unsigned int nmax_per_seed = 10;
     /// Maximum allowed number of skipped steps per candidate

diff --git a/tests/cpu/test_ckf_combinatorics_telescope.cpp b/tests/cpu/test_ckf_combinatorics_telescope.cpp
@@ -115,10 +115,12 @@ TEST_P(CpuCkfCombinatoricsTelescopeTests, Run) {
         rk_stepper_type, host_navigator_type>::config_type cfg_no_limit;
     cfg_no_limit.max_num_branches_per_seed =
         std::numeric_limits<unsigned int>::max();
+    cfg_no_limit.chi2_max = 30.f;
 
     typename traccc::finding_algorithm<
         rk_stepper_type, host_navigator_type>::config_type cfg_limit;
     cfg_limit.max_num_branches_per_seed = 500;
+    cfg_limit.chi2_max = 30.f;
 
     // Finding algorithm object
     traccc::finding_algorithm<rk_stepper_type, host_navigator_type>

diff --git a/tests/cpu/test_ckf_sparse_tracks_telescope.cpp b/tests/cpu/test_ckf_sparse_tracks_telescope.cpp
@@ -120,6 +120,7 @@ TEST_P(CkfSparseTrackTelescopeTests, Run) {
     typename traccc::finding_algorithm<rk_stepper_type,
                                        host_navigator_type>::config_type cfg;
     cfg.ptc_hypothesis = ptc;
+    cfg.chi2_max = 30.f;
 
     // Finding algorithm object
     traccc::finding_algorithm<rk_stepper_type, host_navigator_type>

diff --git a/tests/cuda/test_ckf_combinatorics_telescope.cpp b/tests/cuda/test_ckf_combinatorics_telescope.cpp
@@ -139,11 +139,13 @@ TEST_P(CudaCkfCombinatoricsTelescopeTests, Run) {
         rk_stepper_type, device_navigator_type>::config_type cfg_no_limit;
     cfg_no_limit.ptc_hypothesis = ptc;
     cfg_no_limit.max_num_branches_per_seed = 100000;
+    cfg_no_limit.chi2_max = 30.f;
 
     typename traccc::cuda::finding_algorithm<
         rk_stepper_type, device_navigator_type>::config_type cfg_limit;
     cfg_limit.ptc_hypothesis = ptc;
     cfg_limit.max_num_branches_per_seed = 500;
+    cfg_limit.chi2_max = 30.f;
 
     // Finding algorithm object
     traccc::cuda::finding_algorithm<rk_stepper_type, device_navigator_type>

diff --git a/tests/cuda/test_ckf_toy_detector.cpp b/tests/cuda/test_ckf_toy_detector.cpp
@@ -139,7 +139,7 @@ TEST_P(CkfToyDetectorTests, Run) {
         rk_stepper_type, device_navigator_type>::config_type cfg;
     cfg.ptc_hypothesis = ptc;
     cfg.max_num_branches_per_seed = 500;
-
+    cfg.chi2_max = 30.f;
     cfg.propagation.navigation.search_window = search_window;
 
     // Finding algorithm object