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

Jump to bottom

update to detray v51 #510

Merged
merged 10 commits into from
Jan 16, 2024
Merged

update to detray v51 #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
76fe922
update to detray v51
beomki-yeo Dec 21, 2023
6a9ab74
Updated the test to work with Detray v0.51.0.
krasznaa Dec 21, 2023
7e6ddcd
Default policy
beomki-yeo Dec 21, 2023
00b19d0
Merge branch 'update-detray-to-v51' of github.com:beomki-yeo/traccc i…
beomki-yeo Dec 21, 2023
192d117
Remove default policy
beomki-yeo Dec 22, 2023
d40dd51
Change plane setup
beomki-yeo Dec 23, 2023
08e1da5
FIx plane
beomki-yeo Dec 23, 2023
f81ad0c
Make it work
beomki-yeo Jan 15, 2024
f531edd
Revert some changes
beomki-yeo Jan 16, 2024
751b8aa
Remove unused variables
beomki-yeo Jan 16, 2024
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 @@ -18,7 +18,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.50.0.tar.gz;URL_MD5;efa6f5c72920bdb3c282fa3d260f0227"
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.51.0.tar.gz;URL_MD5;0e5c419aaec167ff5efbef950fe572c8"
CACHE STRING "Source for Detray, when built as part of this project" )

mark_as_advanced( TRACCC_DETRAY_SOURCE )
Expand Down
2 changes: 1 addition & 1 deletion tests/common/tests/kalman_fitting_telescope_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class KalmanFittingTelescopeTests : public KalmanFittingTests {
/// @NOTE: Increasing the number of planes will make
/// test_ckf_combinatorics_telescope take too much time
static const inline std::vector<scalar> plane_positions = {
20., 40., 60., 80., 100., 120., 140, 160, 180.};
0., 20., 40., 60., 80., 100., 120., 140, 160};

/// B field value and its type
static constexpr vector3 B{2 * detray::unit<scalar>::T, 0, 0};
Expand Down
4 changes: 2 additions & 2 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 @@ -32,7 +32,7 @@ class KalmanFittingWireChamberTests : public KalmanFittingTests {
static constexpr vector3 B{0, 0, 2 * detray::unit<scalar>::T};

/// Step constraint
static const inline scalar step_constraint = 2 * detray::unit<scalar>::mm;
static const inline scalar step_constraint = 1 * detray::unit<scalar>::mm;

// Set mask tolerance to a large value not to miss the surface during KF
static const inline scalar mask_tolerance = 50.f * detray::unit<scalar>::um;
Expand All @@ -47,7 +47,7 @@ class KalmanFittingWireChamberTests : public KalmanFittingTests {
0.01 * detray::unit<scalar>::mm,
0.001,
0.001,
0.01 / detray::unit<scalar>::GeV,
0.001 / detray::unit<scalar>::GeV,
0.01 * detray::unit<scalar>::ns};

void consistency_tests(const track_state_collection_types::host&
Expand Down
5 changes: 3 additions & 2 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 @@ -193,7 +193,7 @@ INSTANTIATE_TEST_SUITE_P(
::testing::Values(std::make_tuple(
"wire_10_GeV_muon", std::array<scalar, 3u>{0.f, 0.f, 0.f},
std::array<scalar, 3u>{0.f, 0.f, 0.f},
std::array<scalar, 2u>{10.f, 10.f}, std::array<scalar, 2u>{-1.f, 1.f},
std::array<scalar, 2u>{10.f, 10.f}, std::array<scalar, 2u>{-0.3f, 0.3f},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@krasznaa Just commenting on this change, the eta range is changing from [-1,1] -> [-0.3, 0.3].

Yeah so nothing has been fixed yet and I am avoiding to face the problem in this PR

std::array<scalar, 2u>{0.f, 2.0f * detray::constant<scalar>::pi}, -1.f,
100, 100)));

Expand All @@ -202,7 +202,8 @@ INSTANTIATE_TEST_SUITE_P(
::testing::Values(std::make_tuple(
"wire_100_GeV_muon", std::array<scalar, 3u>{0.f, 0.f, 0.f},
std::array<scalar, 3u>{0.f, 0.f, 0.f},
std::array<scalar, 2u>{100.f, 100.f}, std::array<scalar, 2u>{-1.f, 1.f},
std::array<scalar, 2u>{100.f, 100.f},
std::array<scalar, 2u>{-0.3f, 0.3f},
std::array<scalar, 2u>{0.f, 2.0f * detray::constant<scalar>::pi}, -1.f,
100, 100)));

Expand Down
2 changes: 1 addition & 1 deletion tests/cpu/test_simulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ TEST_P(TelescopeDetectorSimulation, telescope_detector_simulation) {
gen_cfg.phi_steps(phi_steps);
gen_cfg.origin(ori);
gen_cfg.theta_range(theta, theta);
gen_cfg.p_mag(mom);
gen_cfg.p_tot(mom);
gen_cfg.charge(charge);
generator_type generator(gen_cfg);

Expand Down
Loading