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

fix: Align globalToLocal and intersection in LineSurface #2287

Merged
merged 24 commits into from
Jul 27, 2023

Conversation

andiwand
Copy link
Contributor

@andiwand andiwand commented Jul 8, 2023

This is supposed to be a proper fix after the quick fix in #2239

In globalToLocal we did not respect the direction which is important for the line surface.

I tried to make the code a little more clear and move away from constructor initialization in the mathy part. I also added a unit test to check the intersection against the propagation.

I will let the CI judge how much this breaks

@andiwand andiwand added the 🚧 WIP Work-in-progress label Jul 8, 2023
@andiwand andiwand added this to the next milestone Jul 8, 2023
@github-actions github-actions bot added the Component - Core Affects the Core module label Jul 8, 2023
@codecov
Copy link

codecov bot commented Jul 8, 2023

Codecov Report

Merging #2287 (7224ca0) into main (1e2eb5d) will increase coverage by 0.01%.
Report is 1 commits behind head on main.
The diff coverage is 19.17%.

❗ Current head 7224ca0 differs from pull request most recent head 5d5c343. Consider uploading reports for the commit 5d5c343 to get more accurate results

@@            Coverage Diff             @@
##             main    #2287      +/-   ##
==========================================
+ Coverage   49.47%   49.49%   +0.01%     
==========================================
  Files         451      451              
  Lines       25484    25469      -15     
  Branches    11720    11710      -10     
==========================================
- Hits        12609    12605       -4     
+ Misses       4582     4581       -1     
+ Partials     8293     8283      -10     
Files Changed Coverage Δ
Core/include/Acts/Surfaces/LineSurface.hpp 100.00% <ø> (ø)
Core/src/Surfaces/LineSurface.cpp 35.37% <19.17%> (-0.43%) ⬇️

... and 2 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@github-actions
Copy link

github-actions bot commented Jul 8, 2023

📊 Physics performance monitoring for 5d5c343

Summary
Full report
Seeding: seeded, truth estimated, orthogonal
CKF: seeded, truth smeared, truth estimated, orthogonal
IVF: seeded, truth smeared, truth estimated, orthogonal
AMVF: seeded, truth smeared, truth estimated, orthogonal
Ambiguity resolution: seeded, orthogonal
Truth tracking
Truth tracking (GSF)

Vertexing

Vertexing vs. mu
IVF seeded

IVF truth_smeared

IVF truth_estimated

IVF orthogonal

AMVF seeded

AMVF truth_smeared

AMVF truth_estimated

AMVF orthogonal

Seeding

Seeding seeded

Seeding truth_estimated

Seeding orthogonal

CKF

CKF seeded

CKF truth_smeared

CKF truth_estimated

CKF orthogonal

Ambiguity resolution

seeded

Truth tracking (Kalman Filter)

Truth tracking

Truth tracking (GSF)

Truth tracking

@andiwand andiwand marked this pull request as ready for review July 10, 2023 07:23
@andiwand andiwand removed the 🚧 WIP Work-in-progress label Jul 10, 2023
@andiwand andiwand added 🚧 WIP Work-in-progress and removed 🚧 WIP Work-in-progress labels Jul 10, 2023
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Outdated Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Outdated Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Outdated Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Outdated Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Outdated Show resolved Hide resolved
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.

thanks for the review @felix-russo !

Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Outdated Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Outdated Show resolved Hide resolved
andiwand and others added 3 commits July 11, 2023 15:17
Co-authored-by: felix-russo <72298366+felix-russo@users.noreply.github.com>
@andiwand andiwand added the Impact - Minor Nuissance bug and/or affects only a single module label Jul 11, 2023
@asalzburger asalzburger self-requested a review July 12, 2023 07:27
asalzburger
asalzburger previously approved these changes Jul 12, 2023
@github-actions github-actions bot added Infrastructure Changes to build tools, continous integration, ... Changes Performance labels Jul 12, 2023
@github-actions github-actions bot added Component - Examples Affects the Examples module Changes Performance labels Jul 25, 2023
@andiwand
Copy link
Contributor Author

We're ready to go for v28 now. Can you update the PR so we can merge it?

should be ready now @paulgessinger

Copy link
Member

@paulgessinger paulgessinger left a comment

Choose a reason for hiding this comment

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

Sorry maybe I'm dumb but from the diff it's not at all clear to me what's actually happening here. You're changing both intersect and globalToLocal, and they're not doing the same thing afterwards (and neither did they before I don't think).

What do we want globalToLocal to do (after this)? Check if we're on the line surface, or check if we're on the PCA?

Core/src/Surfaces/LineSurface.cpp Outdated Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Outdated Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
Tests/UnitTests/Core/Surfaces/LineSurfaceTests.cpp Outdated Show resolved Hide resolved
Core/src/Surfaces/LineSurface.cpp Show resolved Hide resolved
paulgessinger added a commit to paulgessinger/acts that referenced this pull request Jul 27, 2023
@andiwand
Copy link
Contributor Author

after #2321 the conflicts should disappear 🤞

@kodiakhq
Copy link
Contributor

kodiakhq bot commented Jul 27, 2023

This PR currently has a merge conflict. Please resolve this and then re-add the automerge label.

@kodiakhq kodiakhq bot merged commit 96ead7c into acts-project:main Jul 27, 2023
54 checks passed
@acts-project-service
Copy link
Collaborator

acts-project-service commented Jul 27, 2023

🔴 Athena integration test results

Build job with this PR failed!

Please investigate the build job for the pipeline!

@acts-project-service acts-project-service added the Breaks Athena build This PR breaks the Athena build label Jul 27, 2023
@andiwand andiwand deleted the fix-line-surface-intersect branch July 28, 2023 08:28
@paulgessinger
Copy link
Member

Build failure is likely due to #2269, and not this PR. I'll update this PR once it's resolved.

kodiakhq bot pushed a commit that referenced this pull request Aug 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Breaks Athena build This PR breaks the Athena build Changes Performance Component - Core Affects the Core module Component - Examples Affects the Examples module Impact - Minor Nuissance bug and/or affects only a single module Infrastructure Changes to build tools, continous integration, ...
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants