Build detectors with custom metadata

Author: niermann999

CMakeLists.txt

@@ -87,7 +87,7 @@ endif()
 # In order to generate specializations for our kernels, we need to have both
 # a working Python interpreter, and a list of supported detectors.
 find_package (Python COMPONENTS Interpreter REQUIRED)
-set(TRACCC_SUPPORTED_DETECTORS "default_detector;telescope_detector;toy_detector")
+set(TRACCC_SUPPORTED_DETECTORS "default_detector;telescope_detector;toy_detector;itk_detector;odd_detector")
 
 # Set up build profiling for the project.
 if( CTEST_USE_LAUNCHERS )

core/include/traccc/geometry/detector.hpp

@@ -13,6 +13,8 @@
 // Detray include(s).
 #include <detray/core/detector.hpp>
 #include <detray/detectors/default_metadata.hpp>
+#include <detray/detectors/itk_metadata.hpp>
+#include <detray/detectors/odd_metadata.hpp>
 #include <detray/detectors/telescope_metadata.hpp>
 #include <detray/detectors/toy_metadata.hpp>
 
@@ -87,5 +89,14 @@ using telescope_detector = detector_traits<
 using toy_detector =
     detector_traits<detray::toy_metadata<traccc::default_algebra>>;
 
-using detector_type_list = std::tuple<default_detector, telescope_detector>;
+/// ITk detector
+using itk_detector =
+    detector_traits<detray::itk_metadata<traccc::default_algebra>>;
+
+/// ITk detector
+using odd_detector =
+    detector_traits<detray::odd_metadata<traccc::default_algebra>>;
+
+using detector_type_list = std::tuple<default_detector, telescope_detector,
+                                      itk_detector, odd_detector>;
 }  // namespace traccc

device/sycl/src/utils/detector_types.hpp

@@ -18,6 +18,8 @@ namespace traccc::sycl {
  */
 struct default_detector_kernel_tag {};
 struct telescope_detector_kernel_tag {};
+struct odd_detector_kernel_tag {};
+struct itk_detector_kernel_tag {};
 
 template <typename T>
 struct detector_tag_selector {};
@@ -32,6 +34,16 @@ struct detector_tag_selector<telescope_detector> {
     using type = telescope_detector_kernel_tag;
 };
 
+template <>
+struct detector_tag_selector<odd_detector> {
+    using type = odd_detector_kernel_tag;
+};
+
+template <>
+struct detector_tag_selector<itk_detector> {
+    using type = itk_detector_kernel_tag;
+};
+
 template <typename T>
 using detector_tag_selector_t = typename detector_tag_selector<T>::type;
 

extern/detray/CMakeLists.txt

@@ -13,7 +13,8 @@ message( STATUS "Building Detray as part of the TRACCC project" )
 
 # Declare where to get Detray from.
 set( TRACCC_DETRAY_SOURCE
-   "URL;https://github.com/acts-project/detray/archive/refs/tags/v0.106.0.tar.gz;URL_MD5;cf79d6936866a4d6e8b6cf3ee56b05a6"
+  GIT_REPOSITORY https://github.com/niermann999/detray.git
+  GIT_TAG        origin/feat-volume-finder
    CACHE STRING "Source for Detray, when built as part of this project" )
 mark_as_advanced( TRACCC_DETRAY_SOURCE )
 FetchContent_Declare( Detray SYSTEM ${TRACCC_DETRAY_SOURCE} )

io/src/read_detector.cpp

@@ -59,8 +59,11 @@ void read_detector(host_detector& detector, vecmem::memory_resource& mr,
 
     // TODO: Update this
     if (header.detector == "Cylindrical detector from DD4hep blueprint") {
-        ::read_detector<default_detector>(detector, mr, geometry_file,
-                                          material_file, grid_file);
+        ::read_detector<odd_detector>(detector, mr, geometry_file,
+                                      material_file, grid_file);
+    } else if (header.detector == "detray_detector") {
+        ::read_detector<itk_detector>(detector, mr, geometry_file,
+                                      material_file, grid_file);
     } else {
         // TODO: Warning here
         ::read_detector<default_detector>(detector, mr, geometry_file,

io/src/read_detector_description.cpp

@@ -15,6 +15,7 @@
 
 // Detray include(s)
 #include <detray/geometry/tracking_surface.hpp>
+#include <detray/io/frontend/impl/json_readers.hpp>
 #include <detray/utils/type_registry.hpp>
 
 // VecMem include(s).
@@ -49,8 +50,8 @@ void read_json_dd_impl(traccc::silicon_detector_description::host& dd,
                        const traccc::digitization_config& digi)
     requires(traccc::is_detector_traits<detector_traits_t>)
 {
-    const traccc::default_detector::host& detector_host =
-        detector.as<traccc::default_detector>();
+    const typename detector_traits_t::host& detector_host =
+        detector.as<detector_traits_t>();
 
     // Iterate over the surfaces of the detector.
     const typename detector_traits_t::host::surface_lookup_container& surfaces =
@@ -118,8 +119,19 @@ void read_json_dd(traccc::silicon_detector_description::host& dd,
     traccc::host_detector detector;
     traccc::io::read_detector(detector, mr, geometry_file);
 
-    read_json_dd_impl<traccc::default_detector>(dd, detector, digi);
-    // detector_buffer_visitor
+    // TODO: Implement detector visitor!
+    // Peek at the header to determine the kind of detector that is needed
+    const auto header = detray::io::detail::deserialize_json_header(
+        traccc::io::get_absolute_path(geometry_file));
+
+    if (header.detector == "Cylindrical detector from DD4hep blueprint") {
+        read_json_dd_impl<traccc::odd_detector>(dd, detector, digi);
+    } else if (header.detector == "detray_detector") {
+        read_json_dd_impl<traccc::itk_detector>(dd, detector, digi);
+    } else {
+        // TODO: Warning here
+        read_json_dd_impl<traccc::default_detector>(dd, detector, digi);
+    }
 }
 
 }  // namespace