Merge branch 'main' into fix-chi2-track-helpers

acts-project · Dec 3, 2024 · 3581d3a · 3581d3a
2 parents 468743a + d806df0
commit 3581d3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Core/include/Acts/Utilities/GridAccessHelpers.hpp b/Core/include/Acts/Utilities/GridAccessHelpers.hpp
@@ -212,7 +212,7 @@ class LocalSubspace : public IBoundToGridLocal {
   }
 };
 
-class BoundCylinderToZPhi final : public IBoundToGridLocal {
+class BoundCylinderToZPhi : public IBoundToGridLocal {
  public:
   double radius = 1.;
   double shift = 0.;

diff --git a/Plugins/Json/src/GridJsonConverter.cpp b/Plugins/Json/src/GridJsonConverter.cpp
@@ -439,6 +439,11 @@ nlohmann::json Acts::GridAccessJsonConverter::toJson(
     jBoundToGridLocal["shift"] = boundCylinderToZPhi->shift;
   }
 
+  if (jBoundToGridLocal.empty()) {
+    throw std::invalid_argument(
+        "GridAccessJsonConverter: boundToGridLocal type not supported.");
+  }
+
   return jBoundToGridLocal;
 }