Merge pull request #1051 from krasznaa/InhomBFieldThroughput-main-20250702

Inhomogeneous Magnetic Field Throughput Applications, main branch (2025.07.02.)

Author: stephenswat

examples/run/alpaka/CMakeLists.txt

@@ -36,7 +36,7 @@ add_library( traccc_examples_alpaka STATIC
    "full_chain_algorithm.cpp" )
 target_link_libraries( traccc_examples_alpaka
    PUBLIC vecmem::core detray::core detray::detectors
-   traccc::core traccc::device_common traccc::alpaka ${EXTRA_LIBS})
+   traccc::core traccc::device_common traccc::alpaka traccc_examples_common ${EXTRA_LIBS})
 
 traccc_add_executable( throughput_st_alpaka "throughput_st.cpp"
    LINK_LIBRARIES indicators::indicators ${LIBRARIES} ${DETRAY} traccc_examples_alpaka )

examples/run/alpaka/full_chain_algorithm.cpp

@@ -22,7 +22,7 @@ full_chain_algorithm::full_chain_algorithm(
     const seedfilter_config& filter_config,
     const finding_algorithm::config_type& finding_config,
     const fitting_algorithm::config_type& fitting_config,
-    const silicon_detector_description::host& det_descr,
+    const silicon_detector_description::host& det_descr, const bfield& field,
     host_detector_type* detector, std::unique_ptr<const traccc::Logger> logger)
     : messaging(logger->clone()),
       m_queue(),
@@ -32,8 +32,7 @@ full_chain_algorithm::full_chain_algorithm(
           std::make_unique<::vecmem::binary_page_memory_resource>(
               m_vecmem_objects.device_mr())),
       m_field_vec{0.f, 0.f, finder_config.bFieldInZ},
-      m_field(traccc::construct_const_bfield<host_detector_type::scalar_type>(
-          m_field_vec)),
+      m_field(field),
       m_det_descr(det_descr),
       m_device_det_descr(
           static_cast<silicon_detector_description::buffer::size_type>(

examples/run/alpaka/full_chain_algorithm.hpp

@@ -83,7 +83,7 @@ class full_chain_algorithm
                          const finding_algorithm::config_type& finding_config,
                          const fitting_algorithm::config_type& fitting_config,
                          const silicon_detector_description::host& det_descr,
-                         host_detector_type* detector,
+                         const bfield& field, host_detector_type* detector,
                          std::unique_ptr<const traccc::Logger> logger);
 
     /// Copy constructor

examples/run/common/throughput_mt.ipp

@@ -7,13 +7,17 @@
 
 #pragma once
 
+// Local include(s).
+#include "make_magnetic_field.hpp"
+
 // Project include(s)
 #include "traccc/geometry/detector.hpp"
 
 // Command line option include(s).
 #include "traccc/options/clusterization.hpp"
 #include "traccc/options/detector.hpp"
 #include "traccc/options/input_data.hpp"
+#include "traccc/options/magnetic_field.hpp"
 #include "traccc/options/program_options.hpp"
 #include "traccc/options/threading.hpp"
 #include "traccc/options/throughput.hpp"
@@ -65,6 +69,7 @@ int throughput_mt(std::string_view description, int argc, char* argv[],
 
     // Program options.
     opts::detector detector_opts;
+    opts::magnetic_field bfield_opts;
     opts::input_data input_opts;
     opts::clusterization clusterization_opts;
     opts::track_seeding seeding_opts;
@@ -75,9 +80,9 @@ int throughput_mt(std::string_view description, int argc, char* argv[],
     opts::threading threading_opts;
     opts::program_options program_opts{
         description,
-        {detector_opts, input_opts, clusterization_opts, seeding_opts,
-         finding_opts, propagation_opts, fitting_opts, throughput_opts,
-         threading_opts},
+        {detector_opts, bfield_opts, input_opts, clusterization_opts,
+         seeding_opts, finding_opts, propagation_opts, fitting_opts,
+         throughput_opts, threading_opts},
         argc,
         argv,
         logger().cloneWithSuffix("Options")};
@@ -103,6 +108,9 @@ int throughput_mt(std::string_view description, int argc, char* argv[],
             detector_opts.material_file, detector_opts.grid_file);
     }
 
+    // Construct the magnetic field object.
+    traccc::bfield field{details::make_magnetic_field(bfield_opts)};
+
     // Read in all input events into memory.
     vecmem::vector<edm::silicon_cell_collection::host> input{&uncached_host_mr};
     {
@@ -174,6 +182,7 @@ int throughput_mt(std::string_view description, int argc, char* argv[],
              finding_cfg,
              fitting_cfg,
              det_descr,
+             field,
              (detector_opts.use_detray_detector ? &detector : nullptr),
              logger().clone()});
     }

examples/run/common/throughput_st.ipp

@@ -7,13 +7,17 @@
 
 #pragma once
 
+// Local include(s).
+#include "make_magnetic_field.hpp"
+
 // Project include(s)
 #include "traccc/geometry/detector.hpp"
 
 // Command line option include(s).
 #include "traccc/options/clusterization.hpp"
 #include "traccc/options/detector.hpp"
 #include "traccc/options/input_data.hpp"
+#include "traccc/options/magnetic_field.hpp"
 #include "traccc/options/program_options.hpp"
 #include "traccc/options/throughput.hpp"
 #include "traccc/options/track_finding.hpp"
@@ -54,6 +58,7 @@ int throughput_st(std::string_view description, int argc, char* argv[],
 
     // Program options.
     opts::detector detector_opts;
+    opts::magnetic_field bfield_opts;
     opts::input_data input_opts;
     opts::clusterization clusterization_opts;
     opts::track_seeding seeding_opts;
@@ -63,8 +68,9 @@ int throughput_st(std::string_view description, int argc, char* argv[],
     opts::throughput throughput_opts;
     opts::program_options program_opts{
         description,
-        {detector_opts, input_opts, clusterization_opts, seeding_opts,
-         finding_opts, propagation_opts, fitting_opts, throughput_opts},
+        {detector_opts, bfield_opts, input_opts, clusterization_opts,
+         seeding_opts, finding_opts, propagation_opts, fitting_opts,
+         throughput_opts},
         argc,
         argv,
         logger->cloneWithSuffix("Options")};
@@ -92,6 +98,9 @@ int throughput_st(std::string_view description, int argc, char* argv[],
             detector_opts.material_file, detector_opts.grid_file);
     }
 
+    // Construct the magnetic field object.
+    traccc::bfield field{details::make_magnetic_field(bfield_opts)};
+
     vecmem::memory_resource& alg_host_mr =
         use_host_caching
             ? static_cast<vecmem::memory_resource&>(*cached_host_mr)
@@ -131,7 +140,7 @@ int throughput_st(std::string_view description, int argc, char* argv[],
     std::unique_ptr<FULL_CHAIN_ALG> alg = std::make_unique<FULL_CHAIN_ALG>(
         alg_host_mr, clustering_cfg, seeding_opts.seedfinder,
         spacepoint_grid_config{seeding_opts.seedfinder},
-        seeding_opts.seedfilter, finding_cfg, fitting_cfg, det_descr,
+        seeding_opts.seedfilter, finding_cfg, fitting_cfg, det_descr, field,
         (detector_opts.use_detray_detector ? &detector : nullptr),
         logger->clone("FullChainAlg"));
 

examples/run/cpu/full_chain_algorithm.cpp

@@ -17,14 +17,12 @@ full_chain_algorithm::full_chain_algorithm(
     const seedfilter_config& filter_config,
     const finding_algorithm::config_type& finding_config,
     const fitting_algorithm::config_type& fitting_config,
-    const silicon_detector_description::host& det_descr,
+    const silicon_detector_description::host& det_descr, const bfield& field,
     detector_type* detector, std::unique_ptr<const traccc::Logger> logger)
     : messaging(logger->clone()),
       m_copy{std::make_unique<vecmem::copy>()},
       m_field_vec{0.f, 0.f, finder_config.bFieldInZ},
-      m_field(
-          traccc::construct_const_bfield<typename detector_type::scalar_type>(
-              m_field_vec)),
+      m_field(field),
       m_det_descr(det_descr),
       m_detector(detector),
       m_clusterization(mr, logger->cloneWithSuffix("ClusteringAlg")),

examples/run/cpu/full_chain_algorithm.hpp

@@ -76,7 +76,7 @@ class full_chain_algorithm : public algorithm<track_state_container_types::host(
                          const finding_algorithm::config_type& finding_config,
                          const fitting_algorithm::config_type& fitting_config,
                          const silicon_detector_description::host& det_descr,
-                         detector_type* detector,
+                         const bfield& field, detector_type* detector,
                          std::unique_ptr<const traccc::Logger> logger);
 
     /// Reconstruct track parameters in the entire detector

examples/run/cuda/full_chain_algorithm.cpp

@@ -8,6 +8,9 @@
 // Local include(s).
 #include "full_chain_algorithm.hpp"
 
+// Project include(s).
+#include "traccc/cuda/utils/make_bfield.hpp"
+
 // CUDA include(s).
 #include <cuda_runtime_api.h>
 
@@ -35,7 +38,7 @@ full_chain_algorithm::full_chain_algorithm(
     const seedfilter_config& filter_config,
     const finding_algorithm::config_type& finding_config,
     const fitting_algorithm::config_type& fitting_config,
-    const silicon_detector_description::host& det_descr,
+    const silicon_detector_description::host& det_descr, const bfield& field,
     host_detector_type* detector, std::unique_ptr<const traccc::Logger> logger)
     : messaging(logger->clone()),
       m_host_mr(host_mr),
@@ -45,8 +48,7 @@ full_chain_algorithm::full_chain_algorithm(
           std::make_unique<vecmem::binary_page_memory_resource>(m_device_mr)),
       m_copy(m_stream.cudaStream()),
       m_field_vec{0.f, 0.f, finder_config.bFieldInZ},
-      m_field(traccc::construct_const_bfield<host_detector_type::scalar_type>(
-          m_field_vec)),
+      m_field(make_bfield(field)),
       m_det_descr(det_descr),
       m_device_det_descr(
           static_cast<silicon_detector_description::buffer::size_type>(

examples/run/cuda/full_chain_algorithm.hpp

@@ -84,7 +84,7 @@ class full_chain_algorithm
                          const finding_algorithm::config_type& finding_config,
                          const fitting_algorithm::config_type& fitting_config,
                          const silicon_detector_description::host& det_descr,
-                         host_detector_type* detector,
+                         const bfield& field, host_detector_type* detector,
                          std::unique_ptr<const traccc::Logger> logger);
 
     /// Copy constructor

examples/run/sycl/full_chain_algorithm.hpp

@@ -80,7 +80,7 @@ class full_chain_algorithm
                          const finding_algorithm::config_type& finding_config,
                          const fitting_algorithm::config_type& fitting_config,
                          const silicon_detector_description::host& det_descr,
-                         host_detector_type* detector,
+                         const bfield& field, host_detector_type* detector,
                          std::unique_ptr<const traccc::Logger> logger);
 
     /// Copy constructor