diff --git a/cmake/jana_plugin.cmake b/cmake/jana_plugin.cmake index c9fcf98b4a..5e0baa0a34 100644 --- a/cmake/jana_plugin.cmake +++ b/cmake/jana_plugin.cmake @@ -248,6 +248,12 @@ macro(plugin_add_acts _name) ActsPluginDD4hep ${ActsCore_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}ActsExamplesFramework${CMAKE_SHARED_LIBRARY_SUFFIX} ) + if(${_name}_WITH_LIBRARY) + target_compile_definitions(${PLUGIN_NAME}_library PRIVATE "Acts_VERSION_MAJOR=${Acts_VERSION_MAJOR}") + endif() + if(${_name}_WITH_PLUGIN) + target_compile_definitions(${PLUGIN_NAME}_plugin PRIVATE "Acts_VERSION_MAJOR=${Acts_VERSION_MAJOR}") + endif() endmacro() diff --git a/src/algorithms/tracking/IterativeVertexFinder.cc b/src/algorithms/tracking/IterativeVertexFinder.cc index ff1c89625b..8ec8876642 100644 --- a/src/algorithms/tracking/IterativeVertexFinder.cc +++ b/src/algorithms/tracking/IterativeVertexFinder.cc @@ -86,11 +86,15 @@ std::unique_ptr eicrecon::IterativeVertexFinder::prod VertexSeeder::Config seederCfg(ipEst); VertexSeeder seeder(seederCfg); // Set up the actual vertex finder - VertexFinder::Config finderCfg(vertexFitter, std::move(linearizer), - std::move(seeder), ipEst); + VertexFinder::Config finderCfg(std::move(vertexFitter), std::move(linearizer), + std::move(seeder), std::move(ipEst)); finderCfg.maxVertices = m_cfg.m_maxVertices; finderCfg.reassignTracksAfterFirstFit = m_cfg.m_reassignTracksAfterFirstFit; + #if Acts_VERSION_MAJOR >= 31 + VertexFinder finder(std::move(finderCfg)); + #else VertexFinder finder(finderCfg); + #endif VertexFinder::State state(*m_BField, m_fieldctx); VertexFinderOptions finderOpts(m_geoctx, m_fieldctx);