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.

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

refactor: Refactor navigation #2768

Merged
merged 22 commits into from
Dec 19, 2023
Merged

Conversation

andiwand
Copy link
Contributor

@andiwand andiwand commented Dec 5, 2023

After #2625 turned out to be harder than initially thought I tried to factor out some changes to get them into main already.

Summary of the changes I made

  • pLimit = path limit -> far limit = farLimit
  • oLimit = overstep limit -> near limit = nearLimit
  • replaced DetectorNavigator iterators with indices

@andiwand andiwand added this to the next milestone Dec 5, 2023
Copy link

codecov bot commented Dec 6, 2023

Codecov Report

Attention: 35 lines in your changes are missing coverage. Please review.

Comparison is base (e867b1f) 48.82% compared to head (865e95a) 48.82%.

Files Patch % Lines
Core/include/Acts/Propagator/DirectNavigator.hpp 30.00% 3 Missing and 4 partials ⚠️
Core/include/Acts/Navigation/DetectorNavigator.hpp 61.53% 2 Missing and 3 partials ⚠️
Core/src/Geometry/Layer.cpp 50.00% 0 Missing and 5 partials ⚠️
Core/include/Acts/Propagator/Navigator.hpp 60.00% 1 Missing and 3 partials ⚠️
Core/src/Geometry/TrackingVolume.cpp 60.00% 0 Missing and 4 partials ⚠️
...nclude/Acts/Navigation/NavigationStateUpdaters.hpp 50.00% 0 Missing and 3 partials ⚠️
Core/include/Acts/Propagator/StandardAborters.hpp 81.81% 0 Missing and 2 partials ⚠️
.../include/Acts/Propagator/detail/SteppingHelper.hpp 50.00% 0 Missing and 2 partials ⚠️
Core/include/Acts/Geometry/BoundarySurfaceT.hpp 0.00% 0 Missing and 1 partial ⚠️
Core/include/Acts/Utilities/Intersection.hpp 83.33% 0 Missing and 1 partial ⚠️
... and 1 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2768      +/-   ##
==========================================
- Coverage   48.82%   48.82%   -0.01%     
==========================================
  Files         483      484       +1     
  Lines       28168    28173       +5     
  Branches    13288    13292       +4     
==========================================
+ Hits        13753    13755       +2     
- Misses       4819     4821       +2     
- Partials     9596     9597       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor Author

@andiwand andiwand left a comment

Choose a reason for hiding this comment

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

might factor that out

Core/include/Acts/TrackFitting/KalmanFitter.hpp Outdated Show resolved Hide resolved
kodiakhq bot pushed a commit that referenced this pull request Dec 16, 2023
I do not think that this interface has any benefit over `makeState` + `initialize` and should therefore be removed

pulled out of #2768
Co-authored-by: Paul Gessinger <hello@paulgessinger.com>
@acts-project-service
Copy link
Collaborator

acts-project-service commented Dec 16, 2023

✅ Athena integration test results [601c041]

✅ All tests successful

status job report
🟢 run_unit_tests
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsBenchmarkWithSpot.sh 8 100
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsWorkflow.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsValidateAmbiguityResolution.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsValidateResolvedTracks.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsValidateTracks.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsValidateActsCoreSpacePoints.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsValidateActsSpacePoints.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsValidateSeeds.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsValidateOrthogonalSeeds.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsValidateClusters.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsPersistifyEDM.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsGSFRefitting.sh
🟢 run_ci_tests: ../athena/AtlasTest/CITest/test/ActsKfRefitting.sh
🟢 run_ci_tests: python3 ../athena/Tracking/Acts/ActsGeometry/test/ActsExtrapolationAlgTest.py
🟢 run_ci_tests: python3 ../athena/Tracking/Acts/ActsGeometry/test/ActsITkTest.py
🟢 run_workflow_tests_run4_mc
🟢 run_workflow_tests_run2_mc
🟢 run_workflow_tests_run2_data
🟢 run_workflow_tests_run3_mc
🟢 run_workflow_tests_run3_data
🟢 run_art_test: test_data18_13TeV_1000evt
🟢 run_art_test: test_ttbarPU40_reco

paulgessinger
paulgessinger previously approved these changes Dec 18, 2023
@paulgessinger
Copy link
Member

Seems like there are compile errors

@kodiakhq kodiakhq bot merged commit 601c041 into acts-project:main Dec 19, 2023
55 checks passed
@acts-project-service acts-project-service added the Breaks Athena build This PR breaks the Athena build label Dec 19, 2023
@andiwand andiwand deleted the refactor-navigation branch December 19, 2023 14:23
@paulgessinger paulgessinger modified the milestones: next, v32.0.0 Jan 19, 2024
@paulgessinger paulgessinger removed the Breaks Athena build This PR breaks the Athena build label Jan 23, 2024
LaraCalic pushed a commit to LaraCalic/acts that referenced this pull request Feb 10, 2024
I do not think that this interface has any benefit over `makeState` + `initialize` and should therefore be removed

pulled out of acts-project#2768
LaraCalic pushed a commit to LaraCalic/acts that referenced this pull request Feb 10, 2024
After acts-project#2625 turned out to be harder than initially thought I tried to factor out some changes to get them into main already.

Summary of the changes I made
- `pLimit` = path limit -> far limit = `farLimit`
- `oLimit` = overstep limit -> near limit = `nearLimit`
- replaced `DetectorNavigator` iterators with indices
kodiakhq bot pushed a commit that referenced this pull request May 24, 2024
Backporting more changes from #2625 to main. This is a followup to #2768 

Summary
- remove overstepping from steppers
- use surface tolerance for geometry lookups
- add self consistency navigation test
EleniXoch pushed a commit to EleniXoch/acts that referenced this pull request May 31, 2024
Backporting more changes from acts-project#2625 to main. This is a followup to acts-project#2768 

Summary
- remove overstepping from steppers
- use surface tolerance for geometry lookups
- add self consistency navigation test
Matthewharri pushed a commit to Matthewharri/acts that referenced this pull request Jun 18, 2024
Backporting more changes from acts-project#2625 to main. This is a followup to acts-project#2768 

Summary
- remove overstepping from steppers
- use surface tolerance for geometry lookups
- add self consistency navigation test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component - Core Affects the Core module Component - Examples Affects the Examples module Vertexing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants