From dbc454f0a76455648415d924f6addd10f6487dc2 Mon Sep 17 00:00:00 2001 From: Juraj Smiesko Date: Wed, 22 Mar 2023 11:30:28 +0100 Subject: [PATCH 1/4] Turning ACTS OFF by default --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb42c8fad5..01793d963f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ include(CTest) #--- options ------------------------------------------------------------------ -set(WITH_ACTS AUTO CACHE STRING "Build analyzers that need Acts") +set(WITH_ACTS OFF CACHE STRING "Build analyzers that need Acts") set_property(CACHE WITH_ACTS PROPERTY STRINGS AUTO ON OFF) set(WITH_DD4HEP AUTO CACHE STRING "Build analyzers that need DD4hep") From f4649bc0e9892dddd3d199fdadd21ab7c69ab50a Mon Sep 17 00:00:00 2001 From: Juraj Smiesko Date: Thu, 23 Mar 2023 15:11:40 +0100 Subject: [PATCH 2/4] compatibility with latest acts master (mar2023) --- analyzers/dataframe/src/VertexFinderActs.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/analyzers/dataframe/src/VertexFinderActs.cc b/analyzers/dataframe/src/VertexFinderActs.cc index ad8eac8726..e679077a1d 100644 --- a/analyzers/dataframe/src/VertexFinderActs.cc +++ b/analyzers/dataframe/src/VertexFinderActs.cc @@ -68,7 +68,8 @@ VertexFinderAMVF(ROOT::VecOps::RVec tracks ){ // Set up deterministic annealing with user-defined temperatures std::vector temperatures{8.0, 4.0, 2.0, 1.4142136, 1.2247449, 1.0}; - Acts::AnnealingUtility::Config annealingConfig(temperatures); + Acts::AnnealingUtility::Config annealingConfig; + annealingConfig.setOfTemperatures = temperatures; Acts::AnnealingUtility annealingUtility(annealingConfig); @@ -101,7 +102,7 @@ VertexFinderAMVF(ROOT::VecOps::RVec tracks ){ using Finder = Acts::AdaptiveMultiVertexFinder; //using Finder = Acts::AdaptiveMultiVertexFinder; //Finder::Config finderConfig(std::move(fitter), seedFinder, ipEstimator, linearizer); - Finder::Config finderConfig(std::move(fitter), seedFinder, ipEstimator, linearizer, bField); + Finder::Config finderConfig = {std::move(fitter), seedFinder, ipEstimator, std::move(linearizer), bField}; // We do not want to use a beamspot constraint here finderConfig.useBeamSpotConstraint = false; From 9c2bd40d15fed9bb59ccbbb62b12ef9b77253fd4 Mon Sep 17 00:00:00 2001 From: Juraj Smiesko Date: Thu, 23 Mar 2023 15:45:08 +0100 Subject: [PATCH 3/4] Formatting --- analyzers/dataframe/src/VertexFinderActs.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/analyzers/dataframe/src/VertexFinderActs.cc b/analyzers/dataframe/src/VertexFinderActs.cc index e679077a1d..75853a190c 100644 --- a/analyzers/dataframe/src/VertexFinderActs.cc +++ b/analyzers/dataframe/src/VertexFinderActs.cc @@ -102,7 +102,8 @@ VertexFinderAMVF(ROOT::VecOps::RVec tracks ){ using Finder = Acts::AdaptiveMultiVertexFinder; //using Finder = Acts::AdaptiveMultiVertexFinder; //Finder::Config finderConfig(std::move(fitter), seedFinder, ipEstimator, linearizer); - Finder::Config finderConfig = {std::move(fitter), seedFinder, ipEstimator, std::move(linearizer), bField}; + Finder::Config finderConfig = {std::move(fitter), seedFinder, ipEstimator, + std::move(linearizer), bField}; // We do not want to use a beamspot constraint here finderConfig.useBeamSpotConstraint = false; From 8e9bab5bac67ae50f33ef673f9555c12c4e76f87 Mon Sep 17 00:00:00 2001 From: Juraj Smiesko Date: Tue, 28 Mar 2023 12:00:38 +0200 Subject: [PATCH 4/4] Changing back to AUTO --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01793d963f..cb42c8fad5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ include(CTest) #--- options ------------------------------------------------------------------ -set(WITH_ACTS OFF CACHE STRING "Build analyzers that need Acts") +set(WITH_ACTS AUTO CACHE STRING "Build analyzers that need Acts") set_property(CACHE WITH_ACTS PROPERTY STRINGS AUTO ON OFF) set(WITH_DD4HEP AUTO CACHE STRING "Build analyzers that need DD4hep")