Commit 47b51663 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

Acts 14.1.0 requires VoidReverseFilteringLogic in KalmanFitterOptions

parent 080bc329
......@@ -17,7 +17,12 @@ add_definitions("-Dpodio_VERSION_PATCH=${podio_VERSION_PATCH}")
find_package(ROOT COMPONENTS Core RIO Tree MathCore GenVector Geom REQUIRED)
find_package(DD4hep COMPONENTS DDG4 DDG4IO DDRec REQUIRED)
find_package(Acts REQUIRED COMPONENTS Core PluginIdentification PluginTGeo PluginDD4hep PluginJson)
add_definitions("-DActs_VERSION_MAJOR=${Acts_VERSION_MAJOR}")
add_definitions("-DActs_VERSION_MINOR=${Acts_VERSION_MINOR}")
add_definitions("-DActs_VERSION_PATCH=${Acts_VERSION_PATCH}")
find_library(genfit2 genfit2 /usr/local/lib REQUIRED)
find_path(genfit2_INCLUDE_DIR NAMES GFGbl.h PATHS /usr/local/include ${genfit2}/../include REQUIRED)
......
......@@ -104,9 +104,16 @@ namespace Jug::Reco {
// kfOptions.multipleScattering = m_cfg.multipleScattering;
// kfOptions.energyLoss = m_cfg.energyLoss;
#if Acts_VERSION_MAJOR < 14
Acts::KalmanFitterOptions<MeasurementCalibrator, Acts::VoidOutlierFinder> kfOptions(
m_geoctx, m_fieldctx, m_calibctx, MeasurementCalibrator(*measurements),
Acts::VoidOutlierFinder(), Acts::LoggerWrapper{logger()}, pOptions, &(*pSurface));
#else
Acts::KalmanFitterOptions<MeasurementCalibrator, Acts::VoidOutlierFinder, Acts::VoidReverseFilteringLogic> kfOptions(
m_geoctx, m_fieldctx, m_calibctx, MeasurementCalibrator(*measurements),
Acts::VoidOutlierFinder(), Acts::VoidReverseFilteringLogic(),
Acts::LoggerWrapper{logger()}, pOptions, &(*pSurface));
#endif
// used for processing the data
std::vector<IndexSourceLink> trackSourceLinks;
......
......@@ -43,8 +43,17 @@ namespace Jug::Reco {
public:
/// Track fitter function that takes input measurements, initial trackstate
/// and fitter options and returns some track-fitter-specific result.
#if Acts_VERSION_MAJOR < 14
using TrackFitterOptions =
Acts::KalmanFitterOptions<MeasurementCalibrator, Acts::VoidOutlierFinder>;
#else
using TrackFitterOptions =
Acts::KalmanFitterOptions<
MeasurementCalibrator,
Acts::VoidOutlierFinder,
Acts::VoidReverseFilteringLogic
>;
#endif
//using TrackFinderResult = Acts::Result<Acts::CombinatorialKalmanFilterResult<SourceLink>>;
using FitterResult = Acts::Result<Acts::KalmanFitterResult<IndexSourceLink>>;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment