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

fix: oneAPI 2025 Fixes, main branch (2024.11.11.) #3846

Merged
merged 2 commits into from
Nov 12, 2024
Merged

fix: oneAPI 2025 Fixes, main branch (2024.11.11.) #3846

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
e7aeabd
Remove erroneous "template" declarations.
krasznaa Nov 11, 2024
347a720
Merge branch 'main' into ClangFixes-main-20241111
kodiakhq[bot] Nov 12, 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
5 changes: 2 additions & 3 deletions Core/include/Acts/EventData/detail/TestSourceLink.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,13 @@ void testSourceLinkCalibratorReturn(
trackState.allocateCalibrated(2);
trackState.template calibrated<2>() = sl.parameters;
trackState.template calibratedCovariance<2>() = sl.covariance;
trackState.template setSubspaceIndices(
std::array{sl.indices[0], sl.indices[1]});
trackState.setSubspaceIndices(std::array{sl.indices[0], sl.indices[1]});
} else if (sl.indices[0] != Acts::eBoundSize) {
trackState.allocateCalibrated(1);
trackState.template calibrated<1>() = sl.parameters.head<1>();
trackState.template calibratedCovariance<1>() =
sl.covariance.topLeftCorner<1, 1>();
trackState.template setSubspaceIndices(std::array{sl.indices[0]});
trackState.setSubspaceIndices(std::array{sl.indices[0]});
} else {
throw std::runtime_error(
"Tried to extract measurement from invalid TestSourceLink");
Expand Down
16 changes: 8 additions & 8 deletions Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,12 +1306,12 @@ class Gx2Fitter {
// existing states, but this needs some more thinking.
trackContainerTemp.clear();

auto propagationResult = m_propagator.template propagate(propagatorState);
auto propagationResult = m_propagator.propagate(propagatorState);

// Run the fitter
auto result = m_propagator.template makeResult(std::move(propagatorState),
propagationResult,
propagatorOptions, false);
auto result =
m_propagator.makeResult(std::move(propagatorState), propagationResult,
propagatorOptions, false);

if (!result.ok()) {
ACTS_ERROR("Propagation failed: " << result.error());
Expand Down Expand Up @@ -1502,12 +1502,12 @@ class Gx2Fitter {
auto& r = propagatorState.template get<Gx2FitterResult<traj_t>>();
r.fittedStates = &trackContainer.trackStateContainer();

auto propagationResult = m_propagator.template propagate(propagatorState);
auto propagationResult = m_propagator.propagate(propagatorState);

// Run the fitter
auto result = m_propagator.template makeResult(std::move(propagatorState),
propagationResult,
propagatorOptions, false);
auto result =
m_propagator.makeResult(std::move(propagatorState), propagationResult,
propagatorOptions, false);

if (!result.ok()) {
ACTS_ERROR("Propagation failed: " << result.error());
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/TrackFitting/KalmanFitter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,7 @@ class KalmanFitter {
track_container_t& trackContainer) const
-> Result<typename track_container_t::TrackProxy> {
auto propagatorState =
m_propagator.template makeState(sParameters, propagatorOptions);
m_propagator.makeState(sParameters, propagatorOptions);

auto& kalmanResult =
propagatorState.template get<KalmanFitterResult<traj_t>>();
Expand Down
Loading