-
Notifications
You must be signed in to change notification settings - Fork 168
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: GeoShapes to DetectorVolumes and GeoMaterial Converters #3268
base: main
Are you sure you want to change the base?
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3268 +/- ##
==========================================
- Coverage 47.37% 47.31% -0.06%
==========================================
Files 511 512 +1
Lines 30249 30437 +188
Branches 14677 14795 +118
==========================================
+ Hits 14329 14400 +71
- Misses 5386 5404 +18
- Partials 10534 10633 +99 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally, this seems sensible to me.
- Do we have any way to test this in an isolated way in CI?
- Medium term, I'll likely want to reuse the volume bounds creation, as that will translate 1:1 into the Gen3 geometry model.
Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetVol.hpp
Outdated
Show resolved
Hide resolved
Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetVol.hpp
Outdated
Show resolved
Hide resolved
Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp
Outdated
Show resolved
Hide resolved
@noemina should be all set now. |
@Matthewharri it seems there is still a problem with the compilation? |
There seems to be a build error @Matthewharri https://github.com/acts-project/acts/actions/runs/10212537654/job/28256057425?pr=3268 |
Apparently there was, but I think it should be fixed now. |
Looking at the compile command
It seems that GeoModel is not included using |
This is blocked by #3476 which is blocked by having an external build for GeoModel |
Bumps GeoModel version and deals with the necessary changes. This is a subset of #3268 which isolates the version change and tackles the CI errors faced there. --------- Co-authored-by: Paul Gessinger <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple of nitpicks from my side. Otherwise looks good to go
Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp
Show resolved
Hide resolved
Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp
Outdated
Show resolved
Hide resolved
Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp
Outdated
Show resolved
Hide resolved
Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp
Show resolved
Hide resolved
Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp
Outdated
Show resolved
Hide resolved
Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp
Outdated
Show resolved
Hide resolved
Co-authored-by: Andreas Stefl <[email protected]>
@andiwand Ok, I addressed your things, so assuming nothing got messed up the CI should be fine, and then this is good to go |
should we override sonarcloud in this case @paulgessinger ? |
Quality Gate failedFailed conditions |
This PR introduces a converter to convert geoShapes to DetectorVolumes. Some of the shapes added are very simple converters, i.e. simple bounding boxes which will probably be changed later on. I also bump the GeoModel version from 4.6.0 to 6.0.0 since Athena is using a much newer version. I also change (with the help of @paulgessinger) how cmake looks for the system installation of GeoModel.
I also include a way to convert
GeoMaterial
toActs::Material
@junggjo9
blocked by