Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the default configs for the CKF & KF tests #896

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Use the default configs for the CKF & KF tests #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6782b14
Use default configs for CKF and KF tests
beomki-yeo Mar 1, 2025
30c93c4
Merge branch 'main' into fix-test
beomki-yeo Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extern/detray/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ message( STATUS "Building Detray as part of the TRACCC project" )

# Declare where to get Detray from.
set( TRACCC_DETRAY_SOURCE
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.88.1.tar.gz;URL_MD5;b4c1d2f4323d5e34d8964c6454c34983"
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.89.0.tar.gz;URL_MD5;98be1be806c52db1f6a17ccdc0495272"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's updated already

CACHE STRING "Source for Detray, when built as part of this project" )
mark_as_advanced( TRACCC_DETRAY_SOURCE )
FetchContent_Declare( Detray SYSTEM ${TRACCC_DETRAY_SOURCE} )
Expand Down
3 changes: 0 additions & 3 deletions tests/common/tests/kalman_fitting_wire_chamber_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ class KalmanFittingWireChamberTests
/// B field value and its type
static constexpr vector3 B{0, 0, 2 * traccc::unit<scalar>::T};

/// Step constraint
static const inline float step_constraint = 1.f * traccc::unit<float>::mm;

// Set mask tolerance to a large value not to miss the surface during KF
static const inline scalar mask_tolerance = 75.f * traccc::unit<scalar>::um;

Expand Down
11 changes: 0 additions & 11 deletions tests/cpu/test_ckf_combinatorics_telescope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ TEST_P(CpuCkfCombinatoricsTelescopeTests, Run) {
writer_type>(
std::get<6>(GetParam()), n_events, host_det, field,
std::move(generator), std::move(smearer_writer_cfg), full_path);
sim.get_config().propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
sim.get_config().propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;
sim.run();

/*****************************
Expand All @@ -120,17 +116,10 @@ TEST_P(CpuCkfCombinatoricsTelescopeTests, Run) {
cfg_no_limit.max_num_branches_per_seed =
std::numeric_limits<unsigned int>::max();
cfg_no_limit.chi2_max = 30.f;
cfg_no_limit.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
cfg_no_limit.propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;

traccc::finding_config cfg_limit;
cfg_limit.max_num_branches_per_seed = 500;
cfg_limit.chi2_max = 30.f;
cfg_limit.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
cfg_limit.propagation.navigation.max_mask_tolerance = 1.f * unit<float>::mm;

// Finding algorithm object
traccc::host::combinatorial_kalman_filter_algorithm host_finding(
Expand Down
13 changes: 0 additions & 13 deletions tests/cpu/test_ckf_sparse_tracks_telescope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@ TEST_P(CkfSparseTrackTelescopeTests, Run) {
writer_type>(
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), full_path);
sim.get_config().propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
sim.get_config().propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;
sim.get_config().propagation.stepping.rk_error_tol =
1e-8f * unit<float>::mm;

sim.run();

Expand All @@ -129,20 +123,13 @@ TEST_P(CkfSparseTrackTelescopeTests, Run) {
typename traccc::finding_config cfg;
cfg.ptc_hypothesis = ptc;
cfg.chi2_max = 200.f;
cfg.propagation.navigation.overstep_tolerance = -100.f * unit<float>::um;
cfg.propagation.navigation.max_mask_tolerance = 1.f * unit<float>::mm;
cfg.propagation.stepping.rk_error_tol = 1e-8f * unit<float>::mm;

// Finding algorithm object
traccc::host::combinatorial_kalman_filter_algorithm host_finding(cfg);

// Fitting algorithm object
traccc::fitting_config fit_cfg;
fit_cfg.ptc_hypothesis = ptc;
fit_cfg.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
fit_cfg.propagation.navigation.max_mask_tolerance = 1.f * unit<float>::mm;
fit_cfg.propagation.stepping.rk_error_tol = 1e-8f * unit<float>::mm;
fit_cfg.use_backward_filter = true;
traccc::host::kalman_fitting_algorithm host_fitting(fit_cfg, host_mr);

Expand Down
7 changes: 0 additions & 7 deletions tests/cpu/test_kalman_fitter_hole_count.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@ TEST_P(KalmanFittingHoleCountTests, Run) {
writer_type>(
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), full_path);
sim.get_config().propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
sim.get_config().propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;
sim.run();

/***************
Expand All @@ -123,9 +119,6 @@ TEST_P(KalmanFittingHoleCountTests, Run) {
// Fitting algorithm object
traccc::fitting_config fit_cfg;
fit_cfg.ptc_hypothesis = ptc;
fit_cfg.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
fit_cfg.propagation.navigation.max_mask_tolerance = 1.f * unit<float>::mm;
traccc::host::kalman_fitting_algorithm fitting(fit_cfg, host_mr);

// Event map
Expand Down
4 changes: 0 additions & 4 deletions tests/cpu/test_kalman_fitter_momentum_resolution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,6 @@ TEST_P(KalmanFittingMomentumResolutionTests, Run) {
writer_type>(
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), full_path);
sim.get_config().propagation.stepping.rk_error_tol =
1e-8f * unit<float>::mm;
sim.run();

/***************
Expand All @@ -139,8 +137,6 @@ TEST_P(KalmanFittingMomentumResolutionTests, Run) {
// Fitting algorithm object
traccc::fitting_config fit_cfg;
fit_cfg.ptc_hypothesis = ptc;
fit_cfg.propagation.stepping.rk_error_tol = 1e-8f * unit<float>::mm;
fit_cfg.use_backward_filter = true;
traccc::host::kalman_fitting_algorithm fitting(fit_cfg, host_mr);

// Iterate over events
Expand Down
11 changes: 0 additions & 11 deletions tests/cpu/test_kalman_fitter_telescope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,6 @@ TEST_P(KalmanFittingTelescopeTests, Run) {
writer_type>(
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), full_path);
sim.get_config().propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
sim.get_config().propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;
sim.get_config().propagation.stepping.rk_error_tol =
1e-8f * unit<float>::mm;
sim.run();

/***************
Expand All @@ -124,11 +118,6 @@ TEST_P(KalmanFittingTelescopeTests, Run) {
// Fitting algorithm object
traccc::fitting_config fit_cfg;
fit_cfg.ptc_hypothesis = ptc;
fit_cfg.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
fit_cfg.propagation.navigation.max_mask_tolerance = 1.f * unit<float>::mm;
fit_cfg.propagation.stepping.rk_error_tol = 1e-8f * unit<float>::mm;
fit_cfg.use_backward_filter = true;
traccc::host::kalman_fitting_algorithm fitting(fit_cfg, host_mr);

// Iterate over events
Expand Down
4 changes: 0 additions & 4 deletions tests/cpu/test_kalman_fitter_wire_chamber.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ TEST_P(KalmanFittingWireChamberTests, Run) {
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), full_path);

// Set constrained step size to 1 mm
sim.get_config().propagation.stepping.step_constraint = step_constraint;
sim.get_config().propagation.navigation.min_mask_tolerance =
25.f * traccc::unit<float>::um;
sim.get_config().propagation.navigation.search_window = search_window;

sim.run();
Expand Down
11 changes: 0 additions & 11 deletions tests/cuda/test_ckf_combinatorics_telescope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,6 @@ TEST_P(CudaCkfCombinatoricsTelescopeTests, Run) {
writer_type>(
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), full_path);
sim.get_config().propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
sim.get_config().propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;
sim.run();

/*****************************
Expand Down Expand Up @@ -146,19 +142,12 @@ TEST_P(CudaCkfCombinatoricsTelescopeTests, Run) {
cfg_no_limit.ptc_hypothesis = ptc;
cfg_no_limit.max_num_branches_per_seed = 100000;
cfg_no_limit.chi2_max = 30.f;
cfg_no_limit.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
cfg_no_limit.propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;

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;
cfg_limit.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
cfg_limit.propagation.navigation.max_mask_tolerance = 1.f * unit<float>::mm;

// Finding algorithm object
traccc::cuda::finding_algorithm<rk_stepper_type, device_navigator_type>
Expand Down
2 changes: 0 additions & 2 deletions tests/cuda/test_ckf_toy_detector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ TEST_P(CkfToyDetectorTests, Run) {
writer_type>(
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), full_path);
sim.get_config().propagation.stepping.step_constraint = step_constraint;
sim.get_config().propagation.navigation.search_window = search_window;
sim.run();

Expand Down Expand Up @@ -140,7 +139,6 @@ 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
Expand Down
8 changes: 0 additions & 8 deletions tests/cuda/test_kalman_fitter_telescope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,6 @@ TEST_P(KalmanFittingTelescopeTests, Run) {
writer_type>(
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), full_path);
sim.get_config().propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
sim.get_config().propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;
sim.run();

/***************
Expand All @@ -151,10 +147,6 @@ TEST_P(KalmanFittingTelescopeTests, Run) {
typename traccc::cuda::fitting_algorithm<device_fitter_type>::config_type
fit_cfg;
fit_cfg.ptc_hypothesis = ptc;
fit_cfg.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
fit_cfg.propagation.navigation.max_mask_tolerance = 1.f * unit<float>::mm;
fit_cfg.use_backward_filter = true;
traccc::cuda::fitting_algorithm<device_fitter_type> device_fitting(
fit_cfg, mr, copy, stream);

Expand Down
11 changes: 0 additions & 11 deletions tests/sycl/test_ckf_combinatorics_telescope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ TEST_P(CkfCombinatoricsTelescopeTests, Run) {
writer_type>(
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), path.native());
sim.get_config().propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
sim.get_config().propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;
sim.run();

/*****************************
Expand All @@ -151,18 +147,11 @@ TEST_P(CkfCombinatoricsTelescopeTests, Run) {
cfg_no_limit.ptc_hypothesis = ptc;
cfg_no_limit.max_num_branches_per_seed = 100000;
cfg_no_limit.chi2_max = 30.f;
cfg_no_limit.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
cfg_no_limit.propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;

traccc::sycl::combinatorial_kalman_filter_algorithm::config_type cfg_limit;
cfg_limit.ptc_hypothesis = ptc;
cfg_limit.max_num_branches_per_seed = 500;
cfg_limit.chi2_max = 30.f;
cfg_limit.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
cfg_limit.propagation.navigation.max_mask_tolerance = 1.f * unit<float>::mm;

// Finding algorithm object
traccc::sycl::combinatorial_kalman_filter_algorithm device_finding{
Expand Down
2 changes: 0 additions & 2 deletions tests/sycl/test_ckf_toy_detector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ TEST_P(CkfToyDetectorTests, Run) {
writer_type>(
ptc, n_events, host_det, field, std::move(generator),
std::move(smearer_writer_cfg), path.native());
sim.get_config().propagation.stepping.step_constraint = step_constraint;
sim.get_config().propagation.navigation.search_window = search_window;
sim.run();

Expand All @@ -143,7 +142,6 @@ TEST_P(CkfToyDetectorTests, Run) {
traccc::sycl::combinatorial_kalman_filter_algorithm::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
Expand Down
7 changes: 0 additions & 7 deletions tests/sycl/test_kalman_fitter_telescope.sycl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,6 @@ TEST_P(KalmanFittingTelescopeTests, Run) {
writer_type>(
std::get<6>(GetParam()), n_events, host_det, field,
std::move(generator), std::move(smearer_writer_cfg), full_path);
sim.get_config().propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
sim.get_config().propagation.navigation.max_mask_tolerance =
1.f * unit<float>::mm;
sim.run();

/***************
Expand All @@ -168,9 +164,6 @@ TEST_P(KalmanFittingTelescopeTests, Run) {
typename traccc::sycl::fitting_algorithm<device_fitter_type>::config_type
fit_cfg;
fit_cfg.ptc_hypothesis = ptc;
fit_cfg.propagation.navigation.overstep_tolerance =
-100.f * unit<float>::um;
fit_cfg.propagation.navigation.max_mask_tolerance = 1.f * unit<float>::mm;
traccc::sycl::fitting_algorithm<device_fitter_type> device_fitting(fit_cfg,
mr, &q);

Expand Down
Loading