Rebase

CMakeLists.txt

@@ -278,13 +278,14 @@ if( TRACCC_BUILD_ALPAKA )
    add_subdirectory( device/alpaka )
 endif()
 add_subdirectory( io )
+add_subdirectory( performance )
 add_subdirectory( plugins )
+add_subdirectory( simulation )
 
 if ( TRACCC_BUILD_EXAMPLES )
    # Find Boost.
    find_package( Boost REQUIRED COMPONENTS program_options filesystem)
 
-   add_subdirectory( performance )
    add_subdirectory( examples )
 endif()
 

cmake/traccc-compiler-options-cpp.cmake

@@ -14,7 +14,8 @@ endif()
 
 # Turn on a number of warnings for the "known compilers".
 if( ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" ) OR
-    ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) )
+    ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) OR
+    ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "IntelLLVM" ) )
 
    # Basic flags for all build modes.
    traccc_add_flag( CMAKE_CXX_FLAGS "-Wall" )

cmake/traccc-compiler-options-sycl.cmake

@@ -7,6 +7,12 @@
 # Include the helper function(s).
 include( traccc-functions )
 
+# Only tweak the flags for the Intel compiler.
+if( NOT ( ( "${CMAKE_SYCL_COMPILER_ID}" STREQUAL "IntelLLVM" ) OR
+          ( "${CMAKE_SYCL_COMPILER_ID}" MATCHES "Clang" ) ) )
+   return()
+endif()
+
 # Basic flags for all build modes.
 foreach( mode RELEASE RELWITHDEBINFO MINSIZEREL DEBUG )
    traccc_add_flag( CMAKE_SYCL_FLAGS_${mode} "-Wall" )

core/CMakeLists.txt

@@ -4,6 +4,9 @@
 #
 # Mozilla Public License Version 2.0
 
+# Project include(s).
+include( traccc-compiler-options-cpp )
+
 # Set up the "build" of the traccc::core library.
 traccc_add_library( traccc_core core TYPE SHARED
   # Common definitions.
@@ -19,7 +22,6 @@ traccc_add_library( traccc_core core TYPE SHARED
   "include/traccc/edm/cluster.hpp"
   "include/traccc/edm/spacepoint.hpp"
   "include/traccc/edm/measurement.hpp"
-  "include/traccc/edm/alt_measurement.hpp"
   "include/traccc/edm/track_parameters.hpp"
   "include/traccc/edm/container.hpp"
   "include/traccc/edm/internal_spacepoint.hpp"
@@ -37,6 +39,7 @@ traccc_add_library( traccc_core core TYPE SHARED
   "include/traccc/utils/type_traits.hpp"
   "include/traccc/utils/memory_resource.hpp"
   "include/traccc/utils/seed_generator.hpp"
+  "include/traccc/utils/subspace.hpp"
   # Clusterization algorithmic code.
   "include/traccc/clusterization/detail/measurement_creation_helper.hpp"
   "include/traccc/clusterization/detail/sparse_ccl.hpp"
@@ -67,6 +70,8 @@ traccc_add_library( traccc_core core TYPE SHARED
   "include/traccc/seeding/detail/singlet.hpp"
   "include/traccc/seeding/detail/seeding_config.hpp"
   "include/traccc/seeding/detail/spacepoint_grid.hpp"
+  "include/traccc/seeding/experimental/spacepoint_formation.hpp"
+  "include/traccc/seeding/experimental/spacepoint_formation.ipp"
   "include/traccc/seeding/seed_selecting_helper.hpp"
   "include/traccc/seeding/seed_filtering.hpp"
   "src/seeding/seed_filtering.cpp"
@@ -85,7 +90,7 @@ traccc_add_library( traccc_core core TYPE SHARED
   "include/traccc/seeding/spacepoint_binning.hpp"
   "src/seeding/spacepoint_binning.cpp" )
 target_link_libraries( traccc_core
-  PUBLIC Eigen3::Eigen vecmem::core detray::core traccc::Thrust 
+  PUBLIC Eigen3::Eigen vecmem::core detray::core traccc::Thrust
          traccc::algebra )
 
 # Prevent Eigen from getting confused when building code for a

core/include/traccc/clusterization/clusterization_algorithm.hpp

@@ -10,8 +10,8 @@
 // Library include(s).
 #include "traccc/clusterization/component_connection.hpp"
 #include "traccc/clusterization/measurement_creation.hpp"
-#include "traccc/edm/alt_measurement.hpp"
 #include "traccc/edm/cell.hpp"
+#include "traccc/edm/measurement.hpp"
 #include "traccc/utils/algorithm.hpp"
 
 // VecMem include(s).
@@ -28,7 +28,7 @@ namespace traccc {
 /// module from the cells of the modules.
 ///
 class clusterization_algorithm
-    : public algorithm<alt_measurement_collection_types::host(
+    : public algorithm<measurement_collection_types::host(
           const cell_collection_types::host&,
           const cell_module_collection_types::host&)> {
 

core/include/traccc/clusterization/detail/measurement_creation_helper.hpp

@@ -10,9 +10,9 @@
 // Project include(s).
 #include "traccc/definitions/primitives.hpp"
 #include "traccc/definitions/qualifiers.hpp"
-#include "traccc/edm/alt_measurement.hpp"
 #include "traccc/edm/cell.hpp"
 #include "traccc/edm/cluster.hpp"
+#include "traccc/edm/measurement.hpp"
 
 namespace traccc::detail {
 
@@ -79,8 +79,8 @@ TRACCC_HOST inline void calc_cluster_properties(
 /// @param[in] module is the cell module where the cluster belongs to
 /// @param[in] module_link is the module index
 ///
-TRACCC_HOST void fill_measurement(
-    alt_measurement_collection_types::host& measurements,
+TRACCC_HOST inline void fill_measurement(
+    measurement_collection_types::host& measurements,
     const cell_collection_types::host& cluster, const cell_module& module,
     const unsigned int module_link) {
 
@@ -100,8 +100,9 @@ TRACCC_HOST void fill_measurement(
     detail::calc_cluster_properties(cluster, module, mean, var, totalWeight);
 
     if (totalWeight > 0.) {
-        alt_measurement m;
+        measurement m;
         m.module_link = module_link;
+        m.surface_link = module.surface_link;
         // normalize the cell position
         m.local = mean;
         // normalize the variance

core/include/traccc/clusterization/measurement_creation.hpp

@@ -8,9 +8,9 @@
 #pragma once
 
 // Library include(s).
-#include "traccc/edm/alt_measurement.hpp"
 #include "traccc/edm/cell.hpp"
 #include "traccc/edm/cluster.hpp"
+#include "traccc/edm/measurement.hpp"
 #include "traccc/utils/algorithm.hpp"
 
 // VecMem include(s).
@@ -28,7 +28,7 @@ namespace traccc {
 /// module.
 ///
 class measurement_creation
-    : public algorithm<alt_measurement_collection_types::host(
+    : public algorithm<measurement_collection_types::host(
           const cluster_container_types::host &,
           const cell_module_collection_types::host &)> {
 

core/include/traccc/clusterization/spacepoint_formation.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Library include(s).
-#include "traccc/edm/alt_measurement.hpp"
+#include "traccc/edm/measurement.hpp"
 #include "traccc/edm/spacepoint.hpp"
 #include "traccc/utils/algorithm.hpp"
 
@@ -26,7 +26,7 @@ namespace traccc {
 /// measurements made on every detector module, into 3D spacepoint coordinates.
 ///
 class spacepoint_formation : public algorithm<spacepoint_collection_types::host(
-                                 const alt_measurement_collection_types::host&,
+                                 const measurement_collection_types::host&,
                                  const cell_module_collection_types::host&)> {
 
     public:
@@ -45,7 +45,7 @@ class spacepoint_formation : public algorithm<spacepoint_collection_types::host(
     ///         measurement
     ///
     output_type operator()(
-        const alt_measurement_collection_types::host& measurements,
+        const measurement_collection_types::host& measurements,
         const cell_module_collection_types::host& modules) const override;
 
     private:

core/include/traccc/definitions/primitives.hpp

@@ -24,7 +24,6 @@
 namespace traccc {
 
 using geometry_id = uint64_t;
-using event_id = uint64_t;
 using channel_id = unsigned int;
 
 using vector2 = __plugin::point2<traccc::scalar>;

core/include/traccc/edm/cell.hpp

@@ -13,6 +13,9 @@
 #include "traccc/edm/container.hpp"
 #include "traccc/geometry/pixel_data.hpp"
 
+// Detray include(s).
+#include "detray/geometry/barcode.hpp"
+
 namespace traccc {
 
 /// Definition of a detector module
@@ -23,7 +26,7 @@ namespace traccc {
 ///
 struct cell_module {
 
-    geometry_id module = 0;
+    detray::geometry::barcode surface_link{0u};
     transform3 placement = transform3{};
     scalar threshold = 0;
 
@@ -37,7 +40,7 @@ using cell_module_collection_types = collection_types<cell_module>;
 /// Equality operator for cell module
 TRACCC_HOST_DEVICE
 inline bool operator==(const cell_module& lhs, const cell_module& rhs) {
-    return lhs.module == rhs.module;
+    return lhs.surface_link == rhs.surface_link;
 }
 
 /// Definition for one detector cell

core/include/traccc/edm/measurement.hpp

@@ -1,50 +1,65 @@
 /** TRACCC library, part of the ACTS project (R&D line)
  *
- * (c) 2021-2022 CERN for the benefit of the ACTS project
+ * (c) 2022 CERN for the benefit of the ACTS project
  *
  * Mozilla Public License Version 2.0
  */
 
 #pragma once
 
 // Project include(s).
-#include "traccc/definitions/common.hpp"
 #include "traccc/definitions/primitives.hpp"
 #include "traccc/definitions/qualifiers.hpp"
+#include "traccc/definitions/track_parametrization.hpp"
 #include "traccc/edm/cell.hpp"
 #include "traccc/edm/container.hpp"
+#include "traccc/utils/subspace.hpp"
+
+// Detray include(s).
+#include "detray/geometry/barcode.hpp"
 
 // System include(s).
-#include <climits>
-#include <cmath>
+#include <limits>
 
 namespace traccc {
 
-/// Measurement expressed in local coordinates
-///
-/// It describes the 2D position and the uncertainty of that position
-/// of a measurement on a detector element.
+/// Measurement structure which contains both the measurement and
+/// a link to its module (held in a separate collection).
 ///
+/// This can be used for storing all information in a single collection, whose
+/// objects need to have both the header and item information from the
+/// measurement container types.
 struct measurement {
+
     /// Local 2D coordinates for a measurement on a detector module
     point2 local{0., 0.};
     /// Variance on the 2D coordinates of the measurement
     variance2 variance{0., 0.};
+
+    /// Geometry ID
+    detray::geometry::barcode surface_link;
+
+    /// Link to Module vector index
+    using link_type = cell_module_collection_types::view::size_type;
+    link_type module_link = 0;
+
     /// Cluster link
-    std::size_t cluster_link = std::numeric_limits<std::size_t>::infinity();
-};
+    std::size_t cluster_link = std::numeric_limits<std::size_t>::max();
+
+    /// Measurement dimension
+    unsigned int meas_dim = 2u;
 
-/// Measurement with surface link
-struct measurement_link {
-    geometry_id surface_link;
-    measurement meas;
+    /// subspace
+    subspace<transform3, e_bound_size, 2u> subs{{0u, 1u}};
 };
 
 /// Comparison / ordering operator for measurements
-TRACCC_HOST_DEVICE
-inline bool operator<(const measurement& lhs, const measurement& rhs) {
+TRACCC_HOST_DEVICE inline bool operator<(const measurement& lhs,
+                                         const measurement& rhs) {
 
-    if (std::abs(lhs.local[0] - rhs.local[0]) > float_epsilon) {
+    if (lhs.surface_link != rhs.surface_link) {
+        return lhs.surface_link < rhs.surface_link;
+    } else if (std::abs(lhs.local[0] - rhs.local[0]) > float_epsilon) {
         return (lhs.local[0] < rhs.local[0]);
     } else {
         return (lhs.local[1] < rhs.local[1]);
@@ -55,12 +70,28 @@ inline bool operator<(const measurement& lhs, const measurement& rhs) {
 TRACCC_HOST_DEVICE
 inline bool operator==(const measurement& lhs, const measurement& rhs) {
 
-    return ((std::abs(lhs.local[0] - rhs.local[0]) < float_epsilon) &&
+    return ((lhs.surface_link == rhs.surface_link) &&
+            (std::abs(lhs.local[0] - rhs.local[0]) < float_epsilon) &&
             (std::abs(lhs.local[1] - rhs.local[1]) < float_epsilon) &&
             (std::abs(lhs.variance[0] - rhs.variance[0]) < float_epsilon) &&
             (std::abs(lhs.variance[1] - rhs.variance[1]) < float_epsilon));
 }
 
+/// Comparator based on detray barcode value
+struct measurement_sort_comp {
+    TRACCC_HOST_DEVICE
+    bool operator()(const measurement& lhs, const measurement& rhs) {
+        return lhs.surface_link < rhs.surface_link;
+    }
+};
+
+struct measurement_equal_comp {
+    TRACCC_HOST_DEVICE
+    bool operator()(const measurement& lhs, const measurement& rhs) {
+        return lhs.surface_link == rhs.surface_link;
+    }
+};
+
 /// Declare all measurement collection types
 using measurement_collection_types = collection_types<measurement>;
 /// Declare all measurement container types