Use xsocs.process.fit to import things

xsocs/gui/process/FitWidget.py

@@ -40,7 +40,7 @@ from ..widgets.Containers import GroupBox
 from ..widgets.RoiAxisWidget import RoiAxisWidget
 from ..widgets.Input import StyledLineEdit
 
-from ...process.fit.peak_fit import PeakFitter, FitTypes
+from ...process.fit import PeakFitter, FitTypes
 from ...io.FitH5 import BackgroundTypes
 
 

xsocs/gui/view/FitView.py

@@ -46,7 +46,7 @@ from .fitview.FitModel import FitModel, FitH5Node
 from .fitview.DropPlotWidget import DropPlotWidget
 
 from .fitview.Plotter import GaussianPlotter, CentroidPlotter
-from ...process.fit.peak_fit import background_estimation, BackgroundTypes
+from ...process.fit import background_estimation, BackgroundTypes
 from ...util import project
 
 

xsocs/gui/view/fitview/DropPlotWidget.py

@@ -34,7 +34,7 @@ import numpy as np
 from silx.gui import qt as Qt
 
 from ....io.FitH5 import FitH5, FitH5QAxis
-from ....process.fit.fitresults import FitStatus
+from ....process.fit import FitStatus
 
 from ...widgets.XsocsPlot2D import XsocsPlot2D
 

xsocs/gui/view/fitview/FitModel.py

@@ -43,9 +43,7 @@ from ...project.Hdf5Nodes import H5File
 from ...project.Hdf5Nodes import H5Base, H5NodeClassDef
 
 from ....io.FitH5 import FitH5, FitH5QAxis
-from ....process.fit.fitresults import FitStatus
-
-
+from ....process.fit import FitStatus
 
 
 @H5NodeClassDef('FitH5')

xsocs/process/fit/__init__.py

@@ -26,3 +26,6 @@
 __authors__ = ["D. Naudet"]
 __license__ = "MIT"
 __date__ = "01/05/2017"
+
+from .peak_fit import FitTypes, FitStatus, PeakFitter  # noqa
+from .peak_fit import BackgroundTypes, background_estimation  # noqa

xsocs/process/test/test_fitter.py

@@ -44,7 +44,7 @@ from silx.utils.testutils import ParametricTestCase
 from xsocs import config
 from xsocs.test.utils import test_resources
 
-from xsocs.process.fit.peak_fit import PeakFitter
+from xsocs.process.fit import PeakFitter
 from xsocs.io.FitH5 import FitH5