Add new fitting functions: Multi-Lorentzian, Planckian, Two half-Gaussian, and Double exponential

Author: PierreRaybaut

datalab/gui/actionhandler.py

@@ -918,6 +918,29 @@ def cra_fit(title, fitdlgfunc, iconname, tip: str | None = None):
                     triggered=self.panel.processor.compute_multigaussianfit,
                     icon_name="multigaussfit.svg",
                 )
+                self.new_action(
+                    _("Multi-Lorentzian fit"),
+                    triggered=self.panel.processor.compute_multilorentzianfit,
+                    icon_name="lorentzfit.svg",
+                )
+                cra_fit(
+                    _("Planckian fit"),
+                    fitdialog.planckianfit,
+                    "expfit.svg",
+                    tip=_("Planckian (blackbody radiation) fitting"),
+                )
+                cra_fit(
+                    _("Two half-Gaussian fit"),
+                    fitdialog.twohalfgaussianfit,
+                    "gaussfit.svg",
+                    tip=_("Asymmetric peak fitting with two half-Gaussians"),
+                )
+                cra_fit(
+                    _("Double exponential fit"),
+                    fitdialog.doubleexponentialfit,
+                    "expfit.svg",
+                    tip=_("Double exponential decay fitting"),
+                )
                 cra_fit(_("Exponential fit"), fitdialog.exponentialfit, "expfit.svg")
                 cra_fit(_("Sinusoidal fit"), fitdialog.sinusoidalfit, "sinfit.svg")
                 cra_fit(

datalab/gui/processor/signal.py

@@ -641,6 +641,25 @@ def multigaussianfit(x, y, parent=None):
 
                 self.__row_compute_fit(obj, _("Multi-Gaussian fit"), multigaussianfit)
 
+    @qt_try_except()
+    def compute_multilorentzianfit(self) -> None:
+        """Compute Multi-Lorentzian fitting curve using an interactive dialog"""
+        fitdlgfunc = fitdialog.multilorentzianfit
+        for obj in self.panel.objview.get_sel_objects():
+            dlg = signalpeak.SignalPeakDetectionDialog(obj, parent=self.panel)
+            if exec_dialog(dlg):
+                # Computing x, y
+                peaks = dlg.get_peak_indices()
+
+                def multilorentzianfit(x, y, parent=None):
+                    """Multi-Lorentzian fit dialog function"""
+                    # pylint: disable=cell-var-from-loop
+                    return fitdlgfunc(x, y, peaks, parent=parent)
+
+                self.__row_compute_fit(
+                    obj, _("Multi-Lorentzian fit"), multilorentzianfit
+                )
+
     @qt_try_except()
     def _extract_multiple_roi_in_single_object(self, params: list[ROI1DParam]) -> None:
         """Extract multiple Regions Of Interest (ROIs) from data in a single object"""

datalab/tests/features/signal/fitdialog_unit_test.py

@@ -55,6 +55,18 @@ def test_fit_dialog():
         # CDF curve fitting test
         execenv.print(fdlg.cdffit(x, y))
 
+        # Planckian curve fitting test
+        execenv.print(fdlg.planckianfit(x, y))
+
+        # N-Lorentzian curve fitting test (needs peaks)
+        execenv.print(fdlg.nlorentzianfit(x, y, peakidx))
+
+        # Two half-Gaussian curve fitting test
+        execenv.print(fdlg.twohalfgaussianfit(x, y))
+
+        # Double exponential curve fitting test
+        execenv.print(fdlg.doubleexponentialfit(x, y))
+
 
 if __name__ == "__main__":
     test_fit_dialog()

datalab/tests/scenarios/common.py

@@ -210,6 +210,9 @@ def run_signal_computations(
         (_("Exponential fit"), fitdialog.exponentialfit),
         (_("CDF fit"), fitdialog.cdffit),
         (_("Sinusoidal fit"), fitdialog.sinusoidalfit),
+        (_("Planckian fit"), fitdialog.planckianfit),
+        (_("Two half-Gaussian fit"), fitdialog.twohalfgaussianfit),
+        (_("Double exponential fit"), fitdialog.doubleexponentialfit),
     ):
         panel.objview.set_current_object(sig)
         panel.processor.compute_fit(fittitle, fitfunc)