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: Pythia8 label secondary vertices based on proximity in Examples #3048

Merged
merged 18 commits into from
Apr 5, 2024
Merged

feat: Pythia8 label secondary vertices based on proximity in Examples #3048

merged 18 commits into from
Apr 5, 2024

Conversation

andiwand
Copy link
Contributor

Implements a spatial proximity match criteria for secondary vertices with Pythia8.

blocked by

@andiwand
Squashed commit of the following:
77e58bd 
commit 0f9551f
Merge: b497137 69f7217
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 15:55:17 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into ex-truth-vertex-edm

commit b497137
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 14:58:06 2024 +0100

    auto cleanup

commit 257ffce
Merge: 7cc1765 a6e415f
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 14:39:58 2024 +0100

    Merge branch 'central-truth-matching' of github.com:andiwand/acts into ex-truth-vertex-edm

commit 7cc1765
Merge: dadd9e5 4599bca
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 12:31:16 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into ex-truth-vertex-edm

commit a6e415f
Merge: 6d101cb 4599bca
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 12:09:38 2024 +0100

    Merge branch 'main' into central-truth-matching

commit 6d101cb
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 11:07:59 2024 +0100

    update hashes

commit d4b74e4
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 10:49:25 2024 +0100

    fix

commit 182feb3
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 09:40:50 2024 +0100

    fix

commit d2b9b80
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 09:23:57 2024 +0100

    fix

commit 4a95904
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 08:56:55 2024 +0100

    fix

commit 2757b3f
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 19 08:28:12 2024 +0100

    wire prototrack truth matcher

commit 4f17e88
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 18 21:03:09 2024 +0100

    clean

commit b3b4746
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 18 20:47:20 2024 +0100

    fix exatrakx

commit e24f5ab
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 18 15:21:19 2024 +0100

    fix formatting

commit 0ec3650
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 18 14:49:11 2024 +0100

    update refs

commit a12d4f9
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 18 14:46:04 2024 +0100

    Update Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.cpp

    Co-authored-by: Joana Niermann <[email protected]>

commit 3cce741
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 18 14:45:34 2024 +0100

    Apply suggestions from code review

    Co-authored-by: Joana Niermann <[email protected]>

commit 882073b
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 18 09:11:32 2024 +0100

    refactor matching bools to enum

commit 80d3664
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 18 08:28:04 2024 +0100

    minor reorder

commit b046088
Author: Andreas Stefl <[email protected]>
Date:   Sat Mar 16 10:30:16 2024 +0100

    fix

commit eec75f1
Merge: 6a167b0 49e815c
Author: Andreas Stefl <[email protected]>
Date:   Sat Mar 16 09:40:54 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into central-truth-matching

commit 6a167b0
Merge: db45e7b 4f33d42
Author: Andreas Stefl <[email protected]>
Date:   Fri Mar 15 09:29:21 2024 +0100

    Merge branch 'main' into central-truth-matching

commit dadd9e5
Merge: 7f9ca08 572c49a
Author: Andreas Stefl <[email protected]>
Date:   Thu Mar 14 10:00:03 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into ex-truth-vertex-edm

commit db45e7b
Author: Andreas Stefl <[email protected]>
Date:   Thu Mar 14 09:24:35 2024 +0100

    minor double vs float

commit 8104ee3
Merge: 60dd83d 572c49a
Author: Andreas Stefl <[email protected]>
Date:   Thu Mar 14 08:41:46 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into central-truth-matching

commit 60dd83d
Author: Andreas Stefl <[email protected]>
Date:   Wed Mar 13 18:14:17 2024 +0100

    fix duplication in case of fakes

commit 1de86e3
Author: Andreas Stefl <[email protected]>
Date:   Wed Mar 13 09:59:15 2024 +0100

    fix vtx perf writer

commit b38566d
Merge: f0c190f ccc1975
Author: Andreas Stefl <[email protected]>
Date:   Wed Mar 13 09:05:39 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into central-truth-matching

commit f0c190f
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 12 11:00:40 2024 +0100

    fix examples test

commit 55133eb
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 12 10:09:54 2024 +0100

    revert full chain

commit 8d3a2e3
Author: Andreas Stefl <[email protected]>
Date:   Tue Mar 12 09:53:57 2024 +0100

    fix fix

commit cf5af8f
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 11 17:59:08 2024 +0100

    more fixes after merging

commit 7c88d75
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 11 17:55:17 2024 +0100

    clean after merge

commit b963fb9
Merge: f285e70 fb37dde
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 11 17:37:47 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into central-truth-matching

commit f285e70
Author: Andreas Stefl <[email protected]>
Date:   Wed Mar 6 10:30:46 2024 +0100

    format

commit 570ea89
Merge: 09fa7a5 2664480
Author: Andreas Stefl <[email protected]>
Date:   Wed Mar 6 10:06:32 2024 +0100

    Merge branch 'main' into central-truth-matching

commit 09fa7a5
Author: Andreas Stefl <[email protected]>
Date:   Mon Mar 4 13:12:46 2024 +0100

    PR feedback

commit 7f9ca08
Merge: ef57d66 6ef4e4e
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 29 22:10:02 2024 +0100

    Merge branch 'main' into ex-truth-vertex-edm

commit 2ee8f6d
Merge: ee041d3 6c910b0
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 29 14:45:09 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into central-truth-matching

commit ef57d66
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 29 14:30:30 2024 +0100

    fix

commit 661c53e
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 29 11:01:18 2024 +0100

    formatting

commit 938960f
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 29 10:57:49 2024 +0100

    make compile; namespaces for hepmc3

commit 37e64a1
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 29 09:48:17 2024 +0100

    use float instead of double

commit e7e4245
Merge: fea13b6 9854009
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 29 09:17:12 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into ex-truth-vertex-edm

commit fea13b6
Author: Andreas Stefl <[email protected]>
Date:   Wed Feb 28 18:07:26 2024 +0100

    vertex reader and fixes

commit 86621af
Author: Andreas Stefl <[email protected]>
Date:   Wed Feb 28 15:29:23 2024 +0100

    wire everything

commit 61a4ff9
Author: Andreas Stefl <[email protected]>
Date:   Wed Feb 28 14:13:01 2024 +0100

    constexpr

commit e2e77a8
Author: Andreas Stefl <[email protected]>
Date:   Wed Feb 28 14:03:46 2024 +0100

    truth vertex edm

commit ee041d3
Merge: 1afee13 c0c26e8
Author: Andreas Stefl <[email protected]>
Date:   Tue Feb 27 17:13:03 2024 +0100

    Merge branch 'main' into central-truth-matching

commit 1afee13
Merge: 3022a90 e11e99b
Author: Andreas Stefl <[email protected]>
Date:   Mon Feb 26 11:32:34 2024 +0100

    Merge branch 'main' into central-truth-matching

commit 3022a90
Author: Andreas Stefl <[email protected]>
Date:   Sat Feb 24 15:15:55 2024 +0100

    proto track truth matcher

commit b8f2959
Author: Andreas Stefl <[email protected]>
Date:   Sat Feb 24 14:25:42 2024 +0100

    fix vtx truth?

commit 9a0100f
Author: Andreas Stefl <[email protected]>
Date:   Sat Feb 24 10:58:26 2024 +0100

    revert match rate

commit 2da8bb2
Author: Andreas Stefl <[email protected]>
Date:   Sat Feb 24 09:18:02 2024 +0100

    fix

commit 6c7bc8a
Author: Andreas Stefl <[email protected]>
Date:   Sat Feb 24 08:59:16 2024 +0100

    revert selected particles change in vtx perf writer

commit a7b170d
Author: Andreas Stefl <[email protected]>
Date:   Sat Feb 24 08:42:29 2024 +0100

    move truth matching for TrackFitterPerformanceWriter

commit 0d2256e
Author: Andreas Stefl <[email protected]>
Date:   Fri Feb 23 22:03:06 2024 +0100

    fix truth tracking examples

commit e9264f8
Author: Andreas Stefl <[email protected]>
Date:   Fri Feb 23 20:26:36 2024 +0100

    fix silly

commit 186d2c3
Author: Andreas Stefl <[email protected]>
Date:   Fri Feb 23 19:07:22 2024 +0100

    fix track duplicate count

commit 2519cec
Author: Andreas Stefl <[email protected]>
Date:   Fri Feb 23 18:41:49 2024 +0100

    fix fakes

commit ec7c13a
Author: Andreas Stefl <[email protected]>
Date:   Fri Feb 23 18:38:01 2024 +0100

    remove m_nVtxDetAcceptance

commit f506b2a
Author: Andreas Stefl <[email protected]>
Date:   Fri Feb 23 17:51:56 2024 +0100

    fix after merge

commit 999b802
Merge: 5b0a0a5 ae56406
Author: Andreas Stefl <[email protected]>
Date:   Fri Feb 23 10:10:40 2024 +0100

    Merge branch 'main' into central-truth-matching

commit 5b0a0a5
Author: Andreas Stefl <[email protected]>
Date:   Mon Feb 19 16:00:41 2024 +0100

    Revert "remove deltaR from performance"

    This reverts commit f5fed3c.

commit c8c0a1b
Merge: cfacd86 0c753b1
Author: Andreas Stefl <[email protected]>
Date:   Mon Feb 19 11:31:06 2024 +0100

    Merge branch 'main' into central-truth-matching

commit cfacd86
Merge: a498a16 026b481
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 15 16:51:10 2024 +0100

    Merge branch 'main' into central-truth-matching

commit a498a16
Author: Andreas Stefl <[email protected]>
Date:   Wed Feb 14 09:24:08 2024 +0100

    no double matching by default

commit c77ec1a
Merge: 98685d5 d5f264e
Author: Andreas Stefl <[email protected]>
Date:   Wed Feb 14 09:19:26 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into central-truth-matching

commit 98685d5
Author: Andreas Stefl <[email protected]>
Date:   Tue Feb 13 18:08:15 2024 +0100

    fix fix fix

commit 671335e
Merge: fa301ca a5b3864
Author: Andreas Stefl <[email protected]>
Date:   Tue Feb 13 15:19:27 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into central-truth-matching

commit fa301ca
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 8 11:12:58 2024 +0100

    make binary examples compile

commit 89aeab5
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 8 10:29:13 2024 +0100

    refactor vertex truth matching

commit abc7947
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 8 10:10:59 2024 +0100

    wire track truth matcher in python reco

commit c452318
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 8 09:45:11 2024 +0100

    fix after merge

commit 074f621
Merge: ff32af7 e9da852
Author: Andreas Stefl <[email protected]>
Date:   Thu Feb 8 09:40:12 2024 +0100

    Merge branch 'main' of github.com:acts-project/acts into central-truth-matching

commit ff32af7
Author: Andreas Stefl <[email protected]>
Date:   Tue Jan 30 14:47:45 2024 +0100

    draft

commit 223ae74
Author: andiwand <[email protected]>
Date:   Fri Jan 26 16:51:50 2024 +0100

    draft
@andiwand
fix
161875c
@andiwand
fix
4008d3a
@andiwand
fix
c422987
@andiwand
fix
b583a5c
@andiwand
fix
3577b2a
@andiwand
fix
32784d7
@andiwand
revert pythia change
582426b
@andiwand
Merge branch 'ex-truth-vertex-edm' of github.com:andiwand/acts into e…
ccaf4a5 
…x-pythia8-lable-secondaries
@andiwand
impl proximity vertex match
d5bfb4a
@andiwand andiwand added this to the next milestone Mar 20, 2024
@andiwand andiwand added the 🛑 blocked This item is blocked by another item label Mar 20, 2024
@github-actions github-actions bot added Component - Core Affects the Core module Infrastructure Changes to build tools, continous integration, ... Component - Fatras Affects the Fatras module Component - Examples Affects the Examples module Event Data Model labels Mar 20, 2024
@codecov Codecov
Copy link

codecov bot commented Mar 20, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.02%. Comparing base (3991615) to head (070de1c).

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #3048   +/-   ##
=======================================
  Coverage   49.02%   49.02%           
=======================================
  Files         494      494           
  Lines       29059    29059           
  Branches    13797    13797           
=======================================
  Hits        14247    14247           
  Misses       4929     4929           
  Partials     9883     9883

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

@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 20, 2024 •
edited
Loading

📊: Physics performance monitoring for 070de1c

Full contents

physmon summary

@andiwand andiwand mentioned this pull request Mar 22, 2024
Merged
@andiwand andiwand removed the 🛑 blocked This item is blocked by another item label Mar 22, 2024
@github-actions github-actions bot removed Component - Core Affects the Core module Infrastructure Changes to build tools, continous integration, ... Component - Fatras Affects the Fatras module Event Data Model labels Mar 22, 2024
AJPfleger
AJPfleger previously approved these changes Apr 5, 2024
View reviewed changes
@github-actions github-actions bot added Infrastructure Changes to build tools, continous integration, ... Changes Performance labels Apr 5, 2024
@kodiakhq kodiakhq bot merged commit 4935604 into acts-project:main Apr 5, 2024
52 checks passed
@github-actions github-actions bot removed the automerge label Apr 5, 2024
@acts-project-service
Copy link
Collaborator

✅ Athena integration test results [4935604]

✅ All tests successful

status job report
🟢 run_unit_tests
🟢 test_ActsEFTrackFit
🟢 test_ActsPersistifySeeds
🟢 test_ActsBenchmarkWithSpot
🟢 test_ActsAnalogueClustering
🟢 test_ActsConversionWorkflow
🟢 test_ActsWorkflowFastTracking
🟢 test_ActsWorkflow
🟢 test_ActsValidateAmbiguityResolution
🟢 test_ActsValidateResolvedTracks
🟢 test_ActsValidateTracks
🟢 test_ActsValidateActsCoreSpacePoints
🟢 test_ActsValidateActsSpacePoints
🟢 test_ActsValidateSeeds
🟢 test_ActsValidateOrthogonalSeeds
🟢 test_ActsValidateClusters
🟢 test_ActsPersistifyEDM
🟢 test_ActsGSFRefitting
🟢 test_ActsKfRefitting
🟢 test_ActsExtrapolationAlgTest
🟢 test_ActsITkTest
🟢 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

Ragansu pushed a commit to Ragansu/acts that referenced this pull request Apr 19, 2024
@andiwand @Ragansu
feat: Pythia8 label secondary vertices based on proximity in Examples (…
9ff5c8f 
…acts-project#3048)

Implements a spatial proximity match criteria for secondary vertices with Pythia8.

blocked by
- acts-project#2998
@andiwand andiwand modified the milestones: next, v34.1.0 Apr 25, 2024
EleniXoch pushed a commit to EleniXoch/acts that referenced this pull request May 6, 2024
@andiwand @EleniXoch
feat: Pythia8 label secondary vertices based on proximity in Examples (…
1029a6d 
…acts-project#3048)

Implements a spatial proximity match criteria for secondary vertices with Pythia8.

blocked by
- acts-project#2998
asalzburger pushed a commit to asalzburger/acts that referenced this pull request May 21, 2024
@andiwand @asalzburger
feat: Pythia8 label secondary vertices based on proximity in Examples (…
128998d 
…acts-project#3048)

Implements a spatial proximity match criteria for secondary vertices with Pythia8.

blocked by
- acts-project#2998
@andiwand andiwand deleted the ex-pythia8-lable-secondaries branch June 26, 2024 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AJPfleger AJPfleger AJPfleger approved these changes

Assignees
No one assigned
Labels
Changes Performance Component - Examples Affects the Examples module Infrastructure Changes to build tools, continous integration, ...
Projects
None yet
Milestone
v34.1.0
Development

Successfully merging this pull request may close these issues.
3 participants
@andiwand @acts-project-service @AJPfleger