add relChi2changeCutOff bindings

AJPfleger · Oct 26, 2023 · cef6866 · cef6866
1 parent 46d0763
commit cef6866
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFitterFunction.hpp b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFitterFunction.hpp
@@ -100,7 +100,8 @@ std::shared_ptr<TrackFitterFunction> makeGsfFitterFunction(
 /// @param energyLoss bool
 /// @param freeToBoundCorrection bool
 /// @param nUpdateMax max number of iterations during the fit
-/// @param zerofield disables the QoP fit in case of missing B-field
+/// @param zerofield Disables the QoP fit in case of missing B-field.
+/// @param relChi2changeCutOff Check for convergence (abort condition). Set to 0 to skip.
 /// @param logger a logger instance
 std::shared_ptr<TrackFitterFunction> makeGlobalChiSquareFitterFunction(
     std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry,
@@ -109,6 +110,7 @@ std::shared_ptr<TrackFitterFunction> makeGlobalChiSquareFitterFunction(
     Acts::FreeToBoundCorrection freeToBoundCorrection =
         Acts::FreeToBoundCorrection(),
     size_t nUpdateMax = 5, bool zeroField = false,
+    double relChi2changeCutOff = 1e-7,
     const Acts::Logger& logger = *Acts::getDefaultLogger("Gx2f",
                                                          Acts::Logging::INFO));
 

diff --git a/Examples/Algorithms/TrackFitting/src/GlobalChiSquareFitterFunction.cpp b/Examples/Algorithms/TrackFitting/src/GlobalChiSquareFitterFunction.cpp
@@ -70,6 +70,7 @@ struct GlobalChiSquareFitterFunctionImpl final : public TrackFitterFunction {
   Acts::FreeToBoundCorrection freeToBoundCorrection;
   size_t nUpdateMax = 5;
   bool zeroField = false;
+  double relChi2changeCutOff = 1e-7;
 
   IndexSourceLink::SurfaceAccessor m_slSurfaceAccessor;
 
@@ -94,7 +95,7 @@ struct GlobalChiSquareFitterFunctionImpl final : public TrackFitterFunction {
         options.geoContext, options.magFieldContext, options.calibrationContext,
         extensions, options.propOptions, &(*options.referenceSurface),
         multipleScattering, energyLoss, freeToBoundCorrection, nUpdateMax,
-        zeroField);
+        zeroField, relChi2changeCutOff);
 
     return gx2fOptions;
   }
@@ -131,7 +132,7 @@ ActsExamples::makeGlobalChiSquareFitterFunction(
     std::shared_ptr<const Acts::MagneticFieldProvider> magneticField,
     bool multipleScattering, bool energyLoss,
     Acts::FreeToBoundCorrection freeToBoundCorrection, size_t nUpdateMax,
-    bool zeroField, const Acts::Logger& logger) {
+    bool zeroField, double relChi2changeCutOff, const Acts::Logger& logger) {
   // Stepper should be copied into the fitters
   const Stepper stepper(std::move(magneticField));
 
@@ -162,6 +163,7 @@ ActsExamples::makeGlobalChiSquareFitterFunction(
   fitterFunction->freeToBoundCorrection = freeToBoundCorrection;
   fitterFunction->nUpdateMax = nUpdateMax;
   fitterFunction->zeroField = zeroField;
+  fitterFunction->relChi2changeCutOff = relChi2changeCutOff;
 
   return fitterFunction;
 }
diff --git a/Examples/Python/python/acts/examples/reconstruction.py b/Examples/Python/python/acts/examples/reconstruction.py
@@ -1144,6 +1144,7 @@ def addGx2fTracks(
     energyLoss: bool = False,
     nUpdateMax: int = 5,
     zeroField: bool = False,
+    relChi2changeCutOff: float = 1e-7,
     clusters: str = None,
     calibrator: acts.examples.MeasurementCalibrator = acts.examples.makePassThroughCalibrator(),
     logLevel: Optional[acts.logging.Level] = None,
@@ -1156,6 +1157,7 @@ def addGx2fTracks(
         "freeToBoundCorrection": acts.examples.FreeToBoundCorrection(False),
         "nUpdateMax": nUpdateMax,
         "zeroField": zeroField,
+        "relChi2changeCutOff": relChi2changeCutOff,
         "level": customLogLevel(),
     }
 

diff --git a/Examples/Python/src/TrackFitting.cpp b/Examples/Python/src/TrackFitting.cpp
@@ -134,16 +134,16 @@ void addTrackFitting(Context& ctx) {
            std::shared_ptr<const Acts::MagneticFieldProvider> magneticField,
            bool multipleScattering, bool energyLoss,
            Acts::FreeToBoundCorrection freeToBoundCorrection, size_t nUpdateMax,
-           bool zeroField, Logging::Level level) {
+           bool zeroField, double relChi2changeCutOff, Logging::Level level) {
           return ActsExamples::makeGlobalChiSquareFitterFunction(
               trackingGeometry, magneticField, multipleScattering, energyLoss,
-              freeToBoundCorrection, nUpdateMax, zeroField,
+              freeToBoundCorrection, nUpdateMax, zeroField, relChi2changeCutOff,
               *Acts::getDefaultLogger("Gx2f", level));
         },
         py::arg("trackingGeometry"), py::arg("magneticField"),
         py::arg("multipleScattering"), py::arg("energyLoss"),
         py::arg("freeToBoundCorrection"), py::arg("nUpdateMax"),
-        py::arg("zeroField"), py::arg("level"));
+        py::arg("zeroField"), py::arg("relChi2changeCutOff"), py::arg("level"));
   }
 
   {

diff --git a/Examples/Scripts/Python/truth_tracking_gx2f.py b/Examples/Scripts/Python/truth_tracking_gx2f.py
@@ -96,6 +96,7 @@ def runTruthTrackingGx2f(
         trackingGeometry,
         field,
         nUpdateMax=17,
+        relChi2changeCutOff=1e-7,
     )
 
     # Output