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

feat: Move greedy ambiguity solver to core #2163

Merged
merged 15 commits into from
Jun 7, 2023
Merged

feat: Move greedy ambiguity solver to core #2163

merged 15 commits into from
Jun 7, 2023

Conversation

andiwand
Copy link
Contributor

In this PR I move the simple AmbiguityResolution to the Core.

In that process I renamed this algorithm consistently to GreedyAmbiguityResolution and created specific directories for the ambiguity resolution in general.

@andiwand andiwand added Component - Core Affects the Core module Component - Examples Affects the Examples module 🚧 WIP Work-in-progress labels May 30, 2023
@andiwand andiwand added this to the next milestone May 30, 2023
@andiwand
Copy link
Contributor Author

as discussed @paulgessinger @goetzgaycken @noemina

cc @Corentin-Allaire

@codecov
Copy link

codecov bot commented May 30, 2023 •
edited

Codecov Report

Merging #2163 (19f0730) into main (6029679) will decrease coverage by 0.07%.
The diff coverage is 9.75%.

@@            Coverage Diff             @@
##             main    #2163      +/-   ##
==========================================
- Coverage   49.48%   49.41%   -0.07%     
==========================================
  Files         439      441       +2     
  Lines       25126    25175      +49     
  Branches    11599    11617      +18     
==========================================
+ Hits        12433    12441       +8     
- Misses       4443     4480      +37     
- Partials     8250     8254       +4
Impacted Files Coverage Δ
.../AmbiguityResolution/GreedyAmbiguityResolution.hpp 0.00% <0.00%> (ø)
.../include/Acts/EventData/MultiTrajectoryHelpers.hpp 50.00% <ø> (ø)
.../AmbiguityResolution/GreedyAmbiguityResolution.cpp 0.00% <0.00%> (ø)
Core/include/Acts/EventData/TrackProxy.hpp 83.21% <100.00%> (-1.59%) ⬇️

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

@github-actions
Copy link

github-actions bot commented May 31, 2023 •
edited

📊 Physics performance monitoring for 19f0730

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

paulgessinger
paulgessinger reviewed May 31, 2023
View reviewed changes
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.

Good stuff!

Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp Show resolved Hide resolved
Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp Outdated Show resolved Hide resolved
Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp Outdated Show resolved Hide resolved
Examples/Algorithms/AmbiguityResolution/src/GreedyAmbiguityResolutionAlgorithm.cpp Show resolved Hide resolved
@andiwand
Copy link
Contributor Author

somehow this is changing the output... need to investigate. code wise I am already quite happy

@paulgessinger
Copy link
Member

I guess we expect exactly identical physmon results, right?

@andiwand
Copy link
Contributor Author

andiwand commented Jun 1, 2023

yes I would think so... I think the source link order shuffled but I do not expect a different output from that when we use chi2 as weight

paulgessinger
paulgessinger reviewed Jun 1, 2023
View reviewed changes
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, couple more comments.

Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp Outdated Show resolved Hide resolved
Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp Outdated Show resolved Hide resolved
@andiwand andiwand removed the 🚧 WIP Work-in-progress label Jun 1, 2023
@paulgessinger
Copy link
Member

Only remaining question is what we do with the NDF. Did you change anything in that regard?

@kodiakhq kodiakhq bot merged commit c463f78 into acts-project:main Jun 7, 2023
49 checks passed
@github-actions github-actions bot removed the automerge label Jun 7, 2023
@andiwand andiwand deleted the feature-core-ambisolver branch June 7, 2023 16:19
@paulgessinger paulgessinger modified the milestones: next, v27.0.0 Jun 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paulgessinger paulgessinger paulgessinger approved these changes

@goetzgaycken goetzgaycken Awaiting requested review from goetzgaycken

Assignees
No one assigned
Labels
Component - Core Affects the Core module Component - Examples Affects the Examples module
Projects
None yet
Milestone
v27.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@andiwand @paulgessinger @goetzgaycken