-
Notifications
You must be signed in to change notification settings - Fork 174
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: Update Json converters and enhance Detray version writing #2608
feat: Update Json converters and enhance Detray version writing #2608
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2608 +/- ##
=======================================
Coverage 49.73% 49.73%
=======================================
Files 474 474
Lines 26874 26874
Branches 12365 12365
=======================================
Hits 13366 13366
Misses 4704 4704
Partials 8804 8804 ☔ View full report in Codecov by Sentry. |
Needs unit test fixing. |
Plugins/Json/include/Acts/Plugins/Json/IndexedGridJsonHelper.hpp
Outdated
Show resolved
Hide resolved
Could you attach a sample json file to the PR? Just wondering what this ends up looking like. |
Yes, I will, there's still some refinement to be done in the interplay with detray, so we will do this once the chain is closed. |
Some Json schemas for the detray files exist in https://github.com/acts-project/detray/tree/main/tests/validation/python/validation/json_schema |
@niermann999 now that is excellent! Is this the standard json schema format? It might make sense to put them into separate JSON files so they are usable with standard command line tools. |
Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp
Show resolved
Hide resolved
Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp
Outdated
Show resolved
Hide resolved
As far as I know it is (I used https://json-schema.org to write the thing). Up to this point there is a small python executable that runs the validation on a given input json file using the |
Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp
Outdated
Show resolved
Hide resolved
Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp
Outdated
Show resolved
Hide resolved
Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp
Show resolved
Hide resolved
Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp
Outdated
Show resolved
Hide resolved
Invalidated by push of 445f355
Sorry @niermann999 - needs re-approving, I fixed clang-tidy and doc build. |
Co-authored-by: Paul Gessinger <[email protected]>
…nConverter.hpp Co-authored-by: Joana Niermann <[email protected]>
…onverter.hpp Co-authored-by: Joana Niermann <[email protected]>
…erter.hpp Co-authored-by: Joana Niermann <[email protected]>
a538d42
to
20c62cc
Compare
Invalidated by push of 20c62cc
This ran into |
Since all other tests ran through, and it has been two days waiting for merging - I do this manually now. |
This PR updates the Json writers for the new Detector geometry, and particular for the detray export.
The final output needs still a bit fine-tuning and the material files are still empty.
It adds also support for the
IndexedRootVolumes
, a grid to find the initial volume to start from, it uses the same infrastructure as theIndexedSurfacesUpdators
hence this code was centrally put into a helper function.