Condense InterpSolverPhase and InterpLeastSqSolverPhase

ATTPC · Nov 6, 2024 · 8b74c86 · 8b74c86
1 parent 6d1d3f1
commit 8b74c86
Show file tree

Hide file tree

Showing 7 changed files with 139 additions and 573 deletions.
diff --git a/src/spyral/__init__.py b/src/spyral/__init__.py
@@ -25,7 +25,6 @@
 from .phases.cluster_phase import ClusterPhase
 from .phases.estimation_phase import EstimationPhase
 from .phases.interp_solver_phase import InterpSolverPhase
-from .phases.interp_leastsq_solver_phase import InterpLeastSqSolverPhase
 from .phases.schema import (
     TRACE_SCHEMA,
     POINTCLOUD_SCHEMA,
@@ -54,7 +53,6 @@
     "ClusterPhase",
     "EstimationPhase",
     "InterpSolverPhase",
-    "InterpLeastSqSolverPhase",
     "TRACE_SCHEMA",
     "POINTCLOUD_SCHEMA",
     "CLUSTER_SCHEMA",

diff --git a/src/spyral/core/config.py b/src/spyral/core/config.py
@@ -212,6 +212,8 @@ class SolverParameters:
         Control whether or not the vertex phi position is fitted (True=fitted, False=fixed)
     fit_azimuthal: bool
         Control whether or not the trajectory azimuthal angle is fitted (True=fitted, False=fixed)
+    fit_method: str
+        What type of fitting to use, options are "lbfgsb" or "leastsq"
     """
 
     gas_data_path: Path
@@ -228,3 +230,4 @@ class SolverParameters:
     fit_vertex_rho: bool
     fit_vertex_phi: bool
     fit_azimuthal: bool
+    fit_method: str
diff --git a/src/spyral/phases/interp_leastsq_solver_phase.py b/src/spyral/phases/interp_leastsq_solver_phase.py