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

feat: add helper and fusing infrastructure for cuboidal detectors #2754

Merged
merged 33 commits into from
Jan 16, 2024

Conversation

asalzburger
Copy link
Contributor

@asalzburger asalzburger commented Nov 30, 2023

This PR adds a new

detail/CuboidalDetectorHelper.h/cpp

for creating cuboid shape detectors.

Since it reuses some code from the cylindrical infrastructure, this is encapsulated into sub helpers to not be duplicated.

CuboidalDetector00

Blocked by:

This relaxes the Portal fusing to allow for two portals with same direction filled to be fused (necessary for box-2-box)

@asalzburger asalzburger added this to the next milestone Nov 30, 2023
@asalzburger asalzburger added the 🛑 blocked This item is blocked by another item label Nov 30, 2023
@github-actions github-actions bot added the Component - Core Affects the Core module label Nov 30, 2023
Copy link

codecov bot commented Nov 30, 2023

Codecov Report

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

Comparison is base (7f6f131) 0.00% compared to head (4be3eb8) 48.84%.

Files Patch % Lines
...ore/src/Detector/detail/CuboidalDetectorHelper.cpp 34.59% 50 Missing and 71 partials ⚠️
.../src/Detector/detail/DetectorVolumeConsistency.cpp 25.58% 4 Missing and 28 partials ⚠️
Core/src/Detector/detail/PortalHelper.cpp 61.11% 0 Missing and 7 partials ⚠️
Core/src/Detector/Portal.cpp 66.66% 1 Missing and 5 partials ⚠️
.../src/Detector/detail/CylindricalDetectorHelper.cpp 25.00% 0 Missing and 3 partials ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##           main    #2754       +/-   ##
=========================================
+ Coverage      0   48.84%   +48.84%     
=========================================
  Files         0      491      +491     
  Lines         0    28529    +28529     
  Branches      0    13477    +13477     
=========================================
+ Hits          0    13936    +13936     
- Misses        0     4868     +4868     
- Partials      0     9725     +9725     

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

@asalzburger asalzburger removed the 🛑 blocked This item is blocked by another item label Nov 30, 2023
@asalzburger
Copy link
Contributor Author

Container - container fusing is missing in the tests.

Copy link
Contributor

@AJPfleger AJPfleger left a comment

Choose a reason for hiding this comment

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

Do you plan to include the tests for the container fusing in this PR?

asalzburger and others added 8 commits December 12, 2023 17:38
Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com>
Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com>
Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com>
Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com>
Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com>
@asalzburger
Copy link
Contributor Author

Do you plan to include the tests for the container fusing in this PR?

Yes, I have included this test now.

Copy link
Contributor

@AJPfleger AJPfleger left a comment

Choose a reason for hiding this comment

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

Just a few tiny things

Core/src/Detector/Portal.cpp Outdated Show resolved Hide resolved
Core/src/Detector/Portal.cpp Outdated Show resolved Hide resolved
Core/src/Detector/Portal.cpp Outdated Show resolved Hide resolved
asalzburger and others added 5 commits December 19, 2023 06:10
Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com>
Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com>
Co-authored-by: Alexander J. Pfleger <70842573+AJPfleger@users.noreply.github.com>
@asalzburger
Copy link
Contributor Author

Just a few tiny things

Done.

@kodiakhq kodiakhq bot merged commit b418aee into acts-project:main Jan 16, 2024
52 checks passed
@acts-project-service
Copy link
Collaborator

✅ Athena integration test results [b418aee]

✅ All tests successful

status job report
🟢 run_unit_tests
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsBenchmarkWithSpot.sh 8 100
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsWorkflow.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsValidateAmbiguityResolution.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsValidateResolvedTracks.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsValidateTracks.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsValidateActsCoreSpacePoints.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsValidateActsSpacePoints.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsValidateSeeds.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsValidateOrthogonalSeeds.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsValidateClusters.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsPersistifyEDM.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/test/ActsGSFRefitting.sh
🟢 run_ci_tests: ../athena/Tracking/Acts/ActsConfig/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 modified the milestones: next, v32.0.0 Jan 19, 2024
LaraCalic pushed a commit to LaraCalic/acts that referenced this pull request Feb 10, 2024
…ts-project#2754)

This PR adds a new

`detail/CuboidalDetectorHelper.h/cpp`

for creating cuboid shape detectors.

Since it reuses some code from the cylindrical infrastructure, this is encapsulated into sub helpers to not be duplicated.


![CuboidalDetector00](https://github.com/acts-project/acts/assets/26623879/19fc7cb9-7189-4535-ada9-aa2fef33f7d4)

Blocked by:
- acts-project#2753 (merged)

This relaxes the Portal fusing to allow for two portals with same direction filled to be fused (necessary for box-2-box)
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