Merge pull request #482 from krasznaa/BugFixes-main-20231106

Bug Fixes, main branch (2023.11.06.)

Author: krasznaa

.github/workflows/builds.yml

@@ -27,6 +27,9 @@ jobs:
           - name: CPU
             container: ghcr.io/acts-project/ubuntu2004:v30
             options:
+          - name: CPU
+            container: ghcr.io/acts-project/ubuntu2004:v30
+            options: -DTRACCC_USE_ROOT=FALSE
           - name: CUDA
             container: ghcr.io/acts-project/ubuntu2004_cuda:v30
             options: -DTRACCC_BUILD_CUDA=TRUE

extern/algebra-plugins/CMakeLists.txt

@@ -18,7 +18,7 @@ message( STATUS "Building Algebra Plugins as part of the TRACCC project" )
 
 # Declare where to get Algebra Plugins from.
 set( TRACCC_ALGEBRA_PLUGINS_SOURCE
-   "URL;https://github.com/acts-project/algebra-plugins/archive/refs/tags/v0.19.0.tar.gz;URL_MD5;8357b024b1bcdb70350d8a378055cfee"   
+   "URL;https://github.com/acts-project/algebra-plugins/archive/refs/tags/v0.19.0.tar.gz;URL_MD5;8357b024b1bcdb70350d8a378055cfee"
    CACHE STRING "Source for Algebra Plugins, when built as part of this project" )
 
 mark_as_advanced( TRACCC_ALGEBRA_PLUGINS_SOURCE )
@@ -44,6 +44,8 @@ set( ALGEBRA_PLUGINS_SETUP_VECMEM FALSE CACHE BOOL
    "Do not set up VecMem in Algebra Plugins" )
 set( ALGEBRA_PLUGINS_SETUP_GOOGLETEST FALSE CACHE BOOL
    "Do not set up GoogleTest in Algebra Plugins" )
+set( ALGEBRA_PLUGINS_SETUP_BENCHMARK FALSE CACHE BOOL
+   "Do not set up GoogleTest in Algebra Plugins" )
 
 # Get it into the current directory.
 FetchContent_MakeAvailable( AlgebraPlugins )

performance/src/resolution/res_plot_tool.cpp

@@ -103,6 +103,8 @@ void res_plot_tool::fill(res_plot_cache& cache,
 
     // Avoid unused variable warnings when building the code without ROOT.
     (void)cache;
+    (void)eta;
+    (void)pT;
 
     for (std::size_t idx = 0; idx < m_cfg.param_names.size(); idx++) {
         std::string par_name = m_cfg.param_names.at(idx);
@@ -129,14 +131,14 @@ void res_plot_tool::fill(res_plot_cache& cache,
         (void)residual;
         (void)pull;
 
+#ifdef TRACCC_HAVE_ROOT
         const auto eta_idx =
             std::min(cache.resolutions_eta[par_name]->FindBin(eta) - 1,
                      cache.resolutions_eta[par_name]->GetNbinsX() - 1);
         const auto pT_idx =
             std::min(cache.resolutions_pT[par_name]->FindBin(pT) - 1,
                      cache.resolutions_pT[par_name]->GetNbinsX() - 1);
 
-#ifdef TRACCC_HAVE_ROOT
         cache.residuals.at(par_name)->Fill(residual);
         cache.pulls.at(par_name)->Fill(pull);
         cache.residuals_eta.at(par_name)->Fill(eta, residual);

simulation/CMakeLists.txt

@@ -5,11 +5,11 @@
 # Mozilla Public License Version 2.0
 
 # Set up the "build" of the traccc::io library.
-traccc_add_library( traccc_simulation simulation 
+traccc_add_library( traccc_simulation simulation TYPE INTERFACE
   # Public headers
   "include/traccc/simulation/measurement_smearer.hpp"
   "include/traccc/simulation/simulator.hpp"
   "include/traccc/simulation/smearing_writer.hpp" )
 target_link_libraries( traccc_simulation
-  PUBLIC traccc::core traccc::io detray::core detray::utils 
-  PRIVATE dfelibs::dfelibs )
+  INTERFACE traccc::core traccc::io detray::core detray::utils
+            dfelibs::dfelibs )