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: Remove representation from ObjectIntersection #2760

Merged

Conversation

andiwand
Copy link
Contributor

@andiwand andiwand commented Dec 1, 2023

As the templating of the representing object was rather a burden in #2625 I propose to remove it all together and compose the intersection if necessary. Here I used a std::pair in the Navigator for composition for now which may be not optimal but it works as it should for now

@andiwand andiwand added this to the next milestone Dec 1, 2023
@github-actions github-actions bot added the Component - Core Affects the Core module label Dec 1, 2023
@andiwand andiwand changed the title refactor: Remove representation from intersection refactor: Remove representation from ObjectIntersection Dec 1, 2023
@andiwand andiwand changed the title refactor: Remove representation from ObjectIntersection refactor: Remove representation from ObjectIntersection Dec 1, 2023
Copy link

codecov bot commented Dec 1, 2023

Codecov Report

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

Comparison is base (707800c) 49.50% compared to head (eb19356) 49.48%.

Files Patch % Lines
Core/include/Acts/Propagator/Navigator.hpp 50.00% 0 Missing and 11 partials ⚠️
Core/src/Geometry/TrackingVolume.cpp 55.55% 1 Missing and 3 partials ⚠️
Core/include/Acts/Utilities/Intersection.hpp 71.42% 0 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2760      +/-   ##
==========================================
- Coverage   49.50%   49.48%   -0.02%     
==========================================
  Files         474      474              
  Lines       27072    27069       -3     
  Branches    12511    12513       +2     
==========================================
- Hits        13401    13395       -6     
  Misses       4765     4765              
- Partials     8906     8909       +3     

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

Copy link
Contributor

@asalzburger asalzburger left a comment

Choose a reason for hiding this comment

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

Fine with me!

@paulgessinger paulgessinger added ready Ready to merge, but not being merged yet and removed automerge labels Dec 5, 2023
@andiwand andiwand added automerge and removed ready Ready to merge, but not being merged yet labels Dec 5, 2023
@paulgessinger
Copy link
Member

Seems some webhooks were missed. Merging this manually!

@paulgessinger paulgessinger merged commit 9bfcfc1 into acts-project:main Dec 5, 2023
49 of 52 checks passed
@github-actions github-actions bot removed the automerge label Dec 5, 2023
@acts-project-service
Copy link
Collaborator

acts-project-service commented Dec 5, 2023

✅ Athena integration test results

✅ All tests successful

status job
🟢 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_data
🟢 run_workflow_tests_run3_mc
🟢 run_workflow_tests_run3_data
🟢 run_art_test: test_data18_13TeV_1000evt
🟢 run_art_test: test_ttbarPU40_reco

@andiwand andiwand deleted the remove-intersection-representation branch December 5, 2023 15:45
@paulgessinger paulgessinger modified the milestones: next, v31.2.0 Dec 7, 2023
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants