feat: Introduce Json Converter for Surfaces #662
Conversation
asalzburger
added
Component - Plugins
|
@Corentin-Allaire this one is waiting for the |
I have the material converter in the PR that am finishing, just need to update the CI and the initialisation script for the mat map. Would you have 5min after tomorrow's morning meeting to discuss what we want to do with the json conversion ? |
Codecov Report
@@ Coverage Diff @@
## master #662 +/- ##
=======================================
Coverage 49.06% 49.06%
=======================================
Files 329 329
Lines 16438 16438
Branches 7657 7657
=======================================
Hits 8066 8066
Misses 2998 2998
Partials 5374 5374 Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Looks good to me. I think this should go in before #667, I might be able to modify it to use the surfaces.
| /// @param j the read-in json object | ||
| /// | ||
| /// @return a shared_ptr to a surface object for type polymorphism | ||
| std::shared_ptr<Surface> surfaceFromJson(const nlohmann::json&); |
There was a problem hiding this comment.
You could also instead of surfaceFromJson use from_json(const nlohmann::json& j, std::shared_ptr<Surface>& t) not sure it would be better but that is an option.
|
I actually wanted to make this clear that it's sort of a different way, but you're right. Will change it, I think. |
|
Thinking about it - not really, one would have to provide a nullptr which is then unnulled - not a big fan. |
This PR modify the JsonGeometryConverter that is used in the material mapping process to use the geometry hierarchy this give us a more uniform Json output compare to other Acts json files. The python script used to configure which surface with which binning to use for the material mapping have been modify to accommodate the file structure. I modify the key used for the ID in GeometryHierarchyMapJsonConverter.hpp, with the previous key the element would be order alphabetically in the file (which made them extremely hard to read). In the same way some key used in the writing of the material mapping use Capital letter, this is not a mistake it is to for the element to be ordered in a more readable way in the files. Added 2 files with to_json and from_json, the first one is used to convert material, material surface and material volume. The second convert pointer on surface and tracking volume to initialise the material map json file used to configure the mapping surface/volume and binning. This shouldn't conflict with #662 but we should keep an eye on it.
This PR modify the JsonGeometryConverter that is used in the material mapping process to use the geometry hierarchy this give us a more uniform Json output compare to other Acts json files. The python script used to configure which surface with which binning to use for the material mapping have been modify to accommodate the file structure. I modify the key used for the ID in GeometryHierarchyMapJsonConverter.hpp, with the previous key the element would be order alphabetically in the file (which made them extremely hard to read). In the same way some key used in the writing of the material mapping use Capital letter, this is not a mistake it is to for the element to be ordered in a more readable way in the files. Added 2 files with to_json and from_json, the first one is used to convert material, material surface and material volume. The second convert pointer on surface and tracking volume to initialise the material map json file used to configure the mapping surface/volume and binning. This shouldn't conflict with acts-project#662 but we should keep an eye on it.
This PR modify the JsonGeometryConverter that is used in the material mapping process to use the geometry hierarchy this give us a more uniform Json output compare to other Acts json files. The python script used to configure which surface with which binning to use for the material mapping have been modify to accommodate the file structure. I modify the key used for the ID in GeometryHierarchyMapJsonConverter.hpp, with the previous key the element would be order alphabetically in the file (which made them extremely hard to read). In the same way some key used in the writing of the material mapping use Capital letter, this is not a mistake it is to for the element to be ordered in a more readable way in the files. Added 2 files with to_json and from_json, the first one is used to convert material, material surface and material volume. The second convert pointer on surface and tracking volume to initialise the material map json file used to configure the mapping surface/volume and binning. This shouldn't conflict with acts-project#662 but we should keep an eye on it.
This PR sits on top of #660 and introduces Json converters for Surfaces.
It comes with unit tests that show the round test for all surface types to work.