Merge branch 'main' into patch-6

acts-project · Oct 30, 2024 · 42b5486 · 42b5486
2 parents dad4990 + 1ace19a
commit 42b5486
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp b/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp
@@ -399,7 +399,7 @@ class CombinatorialKalmanFilter {
               measurementSelector(trackStateCandidates, isOutlier, logger);
       if (!selectorResult.ok()) {
         ACTS_ERROR("Selection of calibrated measurements failed: "
-                   << selectorResult.error());
+                   << selectorResult.error().message());
         resultTrackStateList =
             ResultTrackStateList::failure(selectorResult.error());
       } else {

diff --git a/Core/src/TrackFinding/MeasurementSelector.cpp b/Core/src/TrackFinding/MeasurementSelector.cpp
@@ -29,6 +29,11 @@ MeasurementSelector::MeasurementSelector(const MeasurementSelectorCuts& cuts)
     : MeasurementSelector({{GeometryIdentifier(), cuts}}) {}
 
 MeasurementSelector::MeasurementSelector(const Config& config) {
+  if (config.empty()) {
+    throw std::invalid_argument(
+        "MeasurementSelector: Configuration must not be empty");
+  }
+
   std::vector<InternalConfig::InputElement> tmp;
   tmp.reserve(config.size());
   for (std::size_t i = 0; i < config.size(); ++i) {