ref: Cleanup detray includes

benchmarks/common/benchmarks/toy_detector_benchmark.hpp

@@ -18,15 +18,15 @@
 #include "traccc/simulation/smearing_writer.hpp"
 
 // Detray include(s).
-#include "detray/detectors/bfield.hpp"
-#include "detray/io/frontend/detector_reader.hpp"
-#include "detray/io/frontend/detector_writer.hpp"
-#include "detray/navigation/detail/ray.hpp"
-#include "detray/navigation/navigator.hpp"
-#include "detray/propagator/propagator.hpp"
-#include "detray/propagator/rk_stepper.hpp"
-#include "detray/test/utils/detectors/build_toy_detector.hpp"
-#include "detray/test/utils/simulation/event_generator/track_generators.hpp"
+#include <detray/detectors/bfield.hpp>
+#include <detray/io/frontend/detector_reader.hpp>
+#include <detray/io/frontend/detector_writer.hpp>
+#include <detray/navigation/detail/ray.hpp>
+#include <detray/navigation/navigator.hpp>
+#include <detray/propagator/propagator.hpp>
+#include <detray/propagator/rk_stepper.hpp>
+#include <detray/test/utils/detectors/build_toy_detector.hpp>
+#include <detray/test/utils/simulation/event_generator/track_generators.hpp>
 
 // VecMem include(s).
 #include <vecmem/memory/host_memory_resource.hpp>

benchmarks/cpu/toy_detector_cpu.cpp

@@ -24,12 +24,12 @@
 #include "benchmarks/toy_detector_benchmark.hpp"
 
 // Detray include(s).
-#include "detray/core/detector.hpp"
-#include "detray/detectors/bfield.hpp"
-#include "detray/io/frontend/detector_reader.hpp"
-#include "detray/navigation/navigator.hpp"
-#include "detray/propagator/propagator.hpp"
-#include "detray/propagator/rk_stepper.hpp"
+#include <detray/core/detector.hpp>
+#include <detray/detectors/bfield.hpp>
+#include <detray/io/frontend/detector_reader.hpp>
+#include <detray/navigation/navigator.hpp>
+#include <detray/propagator/propagator.hpp>
+#include <detray/propagator/rk_stepper.hpp>
 
 // VecMem include(s).
 #include <vecmem/memory/host_memory_resource.hpp>

benchmarks/cuda/toy_detector_cuda.cpp

@@ -22,12 +22,12 @@
 #include "benchmarks/toy_detector_benchmark.hpp"
 
 // Detray include(s).
-#include "detray/core/detector.hpp"
-#include "detray/detectors/bfield.hpp"
-#include "detray/io/frontend/detector_reader.hpp"
-#include "detray/navigation/navigator.hpp"
-#include "detray/propagator/propagator.hpp"
-#include "detray/propagator/rk_stepper.hpp"
+#include <detray/core/detector.hpp>
+#include <detray/detectors/bfield.hpp>
+#include <detray/io/frontend/detector_reader.hpp>
+#include <detray/navigation/navigator.hpp>
+#include <detray/propagator/propagator.hpp>
+#include <detray/propagator/rk_stepper.hpp>
 
 // VecMem include(s).
 #include <vecmem/memory/cuda/device_memory_resource.hpp>

core/include/traccc/definitions/common.hpp

@@ -11,7 +11,7 @@
 #include "traccc/definitions/primitives.hpp"
 
 // Detray include(s).
-#include "detray/definitions/units.hpp"
+#include <detray/definitions/units.hpp>
 
 namespace traccc {
 

core/include/traccc/definitions/track_parametrization.hpp

@@ -8,63 +8,11 @@
 #pragma once
 
 // Detray include(s)
-// #include "detray/definitions/track_parametrization.hpp"
+#include <detray/definitions/track_parametrization.hpp>
 
 namespace traccc {
 
-// @todo: Wait for c++20
-// using enum detray::bound_indices;
-// using enum detray::free_indices;
-
-/// Components of a bound track parameters vector.
-///
-/// TODO: consider to use enum class instead of enum
-enum bound_indices : unsigned int {
-    // Local position on the reference surface.
-    // This is intentionally named different from the position components in
-    // the other data vectors, to clarify that this is defined on a surface
-    // while the others are defined in free space.
-    e_bound_loc0 = 0,
-    e_bound_loc1 = 1,
-    // Direction angles
-    e_bound_phi = 2,
-    e_bound_theta = 3,
-    // Global inverse-momentum-like parameter, i.e. q/p or 1/p
-    // The naming is inconsistent for the case of neutral track parameters where
-    // the value is interpreted as 1/p not as q/p. This is intentional to avoid
-    // having multiple aliases for the same element and for lack of an
-    // acceptable
-    // common name.
-    e_bound_qoverp = 4,
-    e_bound_time = 5,
-    // Last uninitialized value contains the total number of components
-    e_bound_size,
-};
-
-/// Components of a free track parameters vector.
-///
-/// To be used to access components by named indices instead of just numbers.
-/// This must be a regular `enum` and not a scoped `enum class` to allow
-/// implicit conversion to an integer. The enum value are thus visible directly
-/// in `namespace Acts` and are prefixed to avoid naming collisions.
-enum free_indices : unsigned int {
-    // Spatial position
-    // The spatial position components must be stored as one continous block.
-    e_free_pos0 = 0u,
-    e_free_pos1 = e_free_pos0 + 1u,
-    e_free_pos2 = e_free_pos0 + 2u,
-    // Time
-    e_free_time = 3u,
-    // (Unit) direction
-    // The direction components must be stored as one continous block.
-    e_free_dir0 = 4u,
-    e_free_dir1 = e_free_dir0 + 1u,
-    e_free_dir2 = e_free_dir0 + 2u,
-    // Global inverse-momentum-like parameter, i.e. q/p or 1/p
-    // See BoundIndices for further information
-    e_free_qoverp = 7u,
-    // Last uninitialized value contains the total number of components
-    e_free_size,
-};
+using enum detray::bound_indices;
+using enum detray::free_indices;
 
 }  // namespace traccc

core/include/traccc/edm/measurement.hpp

@@ -17,7 +17,7 @@
 #include "traccc/utils/subspace.hpp"
 
 // Detray include(s).
-#include "detray/geometry/barcode.hpp"
+#include <detray/geometry/barcode.hpp>
 
 // System include(s).
 #include <limits>

core/include/traccc/edm/track_candidate.hpp

@@ -11,9 +11,6 @@
 #include "traccc/edm/measurement.hpp"
 #include "traccc/edm/track_parameters.hpp"
 
-// Detray include(s).
-#include "detray/geometry/barcode.hpp"
-
 namespace traccc {
 
 /// Track candidate is the measurement

core/include/traccc/edm/track_parameters.hpp

@@ -16,7 +16,7 @@
 #include "traccc/edm/container.hpp"
 
 // detray include(s).
-#include "detray/tracks/tracks.hpp"
+#include <detray/tracks/tracks.hpp>
 
 namespace traccc {
 

core/include/traccc/edm/track_state.hpp

@@ -15,8 +15,7 @@
 #include "traccc/edm/track_candidate.hpp"
 
 // detray include(s).
-#include "detray/navigation/navigator.hpp"
-#include "detray/tracks/bound_track_parameters.hpp"
+#include <detray/tracks/bound_track_parameters.hpp>
 
 namespace traccc {
 

core/include/traccc/finding/actors/ckf_aborter.hpp

@@ -8,11 +8,12 @@
 #pragma once
 
 // Project include(s)
-#include "detray/definitions/detail/qualifiers.hpp"
-#include "detray/propagator/base_actor.hpp"
-#include "detray/propagator/base_stepper.hpp"
 #include "traccc/definitions/primitives.hpp"
 
+// detray include(s)
+#include <detray/definitions/detail/qualifiers.hpp>
+#include <detray/propagator/base_actor.hpp>
+
 // System include(s)
 #include <limits>
 

core/include/traccc/finding/actors/interaction_register.hpp

@@ -11,8 +11,7 @@
 #include "traccc/definitions/qualifiers.hpp"
 
 // Detray include(s).
-#include "detray/propagator/base_actor.hpp"
-#include "detray/propagator/base_stepper.hpp"
+#include <detray/propagator/base_actor.hpp>
 
 namespace traccc {
 

core/include/traccc/finding/finding_config.hpp

@@ -12,8 +12,8 @@
 #include "traccc/definitions/primitives.hpp"
 
 // detray include(s).
-#include "detray/definitions/pdg_particle.hpp"
-#include "detray/propagator/propagation_config.hpp"
+#include <detray/definitions/pdg_particle.hpp>
+#include <detray/propagator/propagation_config.hpp>
 
 namespace traccc {
 

core/include/traccc/fitting/fitting_config.hpp

@@ -12,8 +12,8 @@
 #include "traccc/definitions/primitives.hpp"
 
 // detray include(s).
-#include "detray/definitions/pdg_particle.hpp"
-#include "detray/propagator/propagation_config.hpp"
+#include <detray/definitions/pdg_particle.hpp>
+#include <detray/propagator/propagation_config.hpp>
 
 namespace traccc {
 

core/include/traccc/fitting/kalman_filter/gain_matrix_smoother.hpp

@@ -12,6 +12,9 @@
 #include "traccc/edm/track_parameters.hpp"
 #include "traccc/edm/track_state.hpp"
 
+// Detray inlcude(s)
+#include <detray/geometry/shapes/line.hpp>
+
 namespace traccc {
 
 /// Type unrolling functor to smooth the track parameters after the Kalman

core/include/traccc/fitting/kalman_filter/gain_matrix_updater.hpp

@@ -12,6 +12,9 @@
 #include "traccc/definitions/track_parametrization.hpp"
 #include "traccc/edm/track_state.hpp"
 
+// Detray inlcude(s)
+#include <detray/geometry/shapes/line.hpp>
+
 namespace traccc {
 
 /// Type unrolling functor for Kalman updating

core/include/traccc/fitting/kalman_filter/kalman_actor.hpp

@@ -15,7 +15,7 @@
 #include "traccc/utils/particle.hpp"
 
 // detray include(s).
-#include "detray/propagator/base_actor.hpp"
+#include <detray/propagator/base_actor.hpp>
 
 namespace traccc {
 

core/include/traccc/fitting/kalman_filter/kalman_fitter.hpp

@@ -21,12 +21,12 @@
 #include "traccc/utils/particle.hpp"
 
 // detray include(s).
-#include "detray/propagator/actor_chain.hpp"
-#include "detray/propagator/actors/aborters.hpp"
-#include "detray/propagator/actors/parameter_resetter.hpp"
-#include "detray/propagator/actors/parameter_transporter.hpp"
-#include "detray/propagator/actors/pointwise_material_interactor.hpp"
-#include "detray/propagator/propagator.hpp"
+#include <detray/propagator/actor_chain.hpp>
+#include <detray/propagator/actors/aborters.hpp>
+#include <detray/propagator/actors/parameter_resetter.hpp>
+#include <detray/propagator/actors/parameter_transporter.hpp>
+#include <detray/propagator/actors/pointwise_material_interactor.hpp>
+#include <detray/propagator/propagator.hpp>
 
 // System include(s).
 #include <limits>

core/include/traccc/fitting/kalman_filter/kalman_step_aborter.hpp

@@ -11,7 +11,7 @@
 #include "traccc/definitions/qualifiers.hpp"
 
 // Detray include(s).
-#include "detray/propagator/base_actor.hpp"
+#include <detray/propagator/base_actor.hpp>
 
 // VecMem include(s).
 #include <vecmem/utils/debug.hpp>

core/include/traccc/seeding/impl/spacepoint_formation.ipp

@@ -11,7 +11,7 @@
 #include "traccc/definitions/primitives.hpp"
 
 // Detray include(s).
-#include "detray/geometry/tracking_surface.hpp"
+#include <detray/geometry/tracking_surface.hpp>
 
 namespace traccc::details {
 

core/include/traccc/utils/particle.hpp

@@ -13,7 +13,7 @@
 #include "traccc/edm/track_parameters.hpp"
 
 // detray include(s).
-#include "detray/definitions/pdg_particle.hpp"
+#include <detray/definitions/pdg_particle.hpp>
 
 // System include(s).
 #include <stdexcept>

core/include/traccc/utils/seed_generator.hpp

@@ -11,15 +11,15 @@
 #include "traccc/edm/track_parameters.hpp"
 
 // detray include(s).
-#include "detray/geometry/barcode.hpp"
-#include "detray/geometry/tracking_surface.hpp"
-#include "detray/propagator/actor_chain.hpp"
-#include "detray/propagator/actors/aborters.hpp"
-#include "detray/propagator/actors/parameter_resetter.hpp"
-#include "detray/propagator/actors/parameter_transporter.hpp"
-#include "detray/propagator/actors/pointwise_material_interactor.hpp"
-#include "detray/propagator/base_actor.hpp"
-#include "detray/propagator/propagator.hpp"
+#include <detray/geometry/barcode.hpp>
+#include <detray/geometry/tracking_surface.hpp>
+#include <detray/propagator/actor_chain.hpp>
+#include <detray/propagator/actors/aborters.hpp>
+#include <detray/propagator/actors/parameter_resetter.hpp>
+#include <detray/propagator/actors/parameter_transporter.hpp>
+#include <detray/propagator/actors/pointwise_material_interactor.hpp>
+#include <detray/propagator/base_actor.hpp>
+#include <detray/propagator/propagator.hpp>
 
 // System include(s).
 #include <random>

core/src/ambiguity_resolution/greedy_ambiguity_resolution_algorithm.cpp

@@ -15,6 +15,7 @@
 #include <limits>
 #include <map>
 #include <set>
+#include <sstream>
 #include <unordered_map>
 #include <vector>
 

device/common/include/traccc/finding/device/impl/find_tracks.ipp

@@ -21,6 +21,9 @@
 // Project include(s).
 #include "traccc/fitting/kalman_filter/gain_matrix_updater.hpp"
 
+// Detray include(s)
+#include <detray/geometry/tracking_surface.hpp>
+
 // Thrust include(s).
 #include <thrust/binary_search.h>
 #include <thrust/execution_policy.h>

device/common/include/traccc/finding/device/impl/propagate_to_next_surface.ipp

@@ -11,8 +11,8 @@
 #include "traccc/utils/particle.hpp"
 
 // Detray include(s).
-#include "detray/propagator/constrained_step.hpp"
-#include "detray/utils/tuple_helpers.hpp"
+#include <detray/propagator/constrained_step.hpp>
+#include <detray/utils/tuple_helpers.hpp>
 
 namespace traccc::device {
 

device/cuda/include/traccc/cuda/finding/finding_algorithm.hpp

@@ -19,12 +19,12 @@
 #include "traccc/utils/memory_resource.hpp"
 
 // detray include(s).
-#include "detray/propagator/actor_chain.hpp"
-#include "detray/propagator/actors/aborters.hpp"
-#include "detray/propagator/actors/parameter_resetter.hpp"
-#include "detray/propagator/actors/parameter_transporter.hpp"
-#include "detray/propagator/actors/pointwise_material_interactor.hpp"
-#include "detray/propagator/propagator.hpp"
+#include <detray/propagator/actor_chain.hpp>
+#include <detray/propagator/actors/aborters.hpp>
+#include <detray/propagator/actors/parameter_resetter.hpp>
+#include <detray/propagator/actors/parameter_transporter.hpp>
+#include <detray/propagator/actors/pointwise_material_interactor.hpp>
+#include <detray/propagator/propagator.hpp>
 
 // VecMem include(s).
 #include <vecmem/utils/copy.hpp>

device/cuda/src/finding/finding_algorithm.cu

@@ -27,17 +27,17 @@
 #include "traccc/utils/projections.hpp"
 
 // detray include(s).
-#include "detray/detectors/bfield.hpp"
-#include "detray/navigation/navigator.hpp"
-#include "detray/propagator/rk_stepper.hpp"
-#include "vecmem/containers/data/vector_view.hpp"
-#include "vecmem/memory/unique_ptr.hpp"
+#include <detray/detectors/bfield.hpp>
+#include <detray/navigation/navigator.hpp>
+#include <detray/propagator/rk_stepper.hpp>
 
 // VecMem include(s).
 #include <vecmem/containers/data/vector_buffer.hpp>
+#include <vecmem/containers/data/vector_view.hpp>
 #include <vecmem/containers/device_vector.hpp>
 #include <vecmem/containers/jagged_device_vector.hpp>
 #include <vecmem/containers/vector.hpp>
+#include <vecmem/memory/unique_ptr.hpp>
 
 // Thrust include(s).
 #include <thrust/copy.h>