Commit c5320e77 authored by payno's avatar payno
Browse files

[ewoks] complete conversion to ewoks structure

- complete signature to be `run`
- fix test
- orangecontrib: make inheritance to `Registered` instead of `OWEwoksWidget`
Because `OWEwoksWidget` enforce to use the defined ewokstaskclass which is not something we want for now (avoid task associated with gui, processes on threads...)
parent 8ba5956d
Pipeline #51171 failed with stages
in 7 minutes and 41 seconds
......@@ -118,7 +118,7 @@ class TestStreamSingleSpectrum(unittest.TestCase):
out = PyMca_normalization(inputs={"xas_obj": out})()
exafs_process = PyMca_exafs(inputs={"xas_obj": out})
exafs_process.setConfiguration(configuration=self.exafs_configuration)
out = exafs_process(xas_obj=out)
out = exafs_process()
kweight_process = PyMca_k_weight(inputs={"xas_obj": out})
kweight_process.setConfiguration({"k_weight": 0})
out = kweight_process()
......@@ -183,12 +183,12 @@ class TestWorkflowAndH5LinkedFile(unittest.TestCase):
"KMax": 2.3,
}
exafs_process.setConfiguration(configuration=configuration)
out = exafs_process(xas_obj=out)
out = exafs_process()
k_weight_process = PyMca_k_weight(inputs={"xas_obj": out})
k_weight_process.setConfiguration({"k_weight": 0})
out = k_weight_process(xas_obj=out)
out = k_weight_process()
out = PyMca_ft(inputs={"xas_obj": out})()
out = PyMca_normalization(inputs={"xas_obj": out})(xas_obj=out)
out = PyMca_normalization(inputs={"xas_obj": out})()
assert isinstance(out, XASObject)
assert out.linked_h5_file is self.h5_file
# then check all process are correctly registered with the valid id...
......@@ -218,9 +218,9 @@ class TestWorkflowAndH5LinkedFile(unittest.TestCase):
}
exafs_process.setConfiguration(configuration=configuration)
out = exafs_process()
k_weight_process = PyMca_k_weight(inputs={"xas_obj": out})
k_weight_process = PyMca_k_weight(inputs={"xas_obj": out.to_dict()})
k_weight_process.setConfiguration({"k_weight": 0})
out = k_weight_process(xas_obj=out.to_dict())
out = k_weight_process()
out = PyMca_ft(inputs={"xas_obj": out.to_dict()})()
out = PyMca_normalization(inputs={"xas_obj": out.to_dict()})()
assert isinstance(out, XASObject)
......
......@@ -147,5 +147,4 @@ class ProcessQThread(qt.QThread):
self._process_obj = process_obj
def run(self):
return
# self._xas_obj = self._process_obj({"xas_obj": self._xas_obj}).run()
self._xas_obj = self._process_obj()
......@@ -32,7 +32,7 @@ import functools
import logging
from Orange.widgets import gui
from Orange.widgets.settings import Setting
from ewoksorange.bindings import OWEwoksWidget
from Orange.widgets.widget import OWWidget
from Orange.widgets.widget import Input, Output
import Orange.data
from silx.gui import qt
......@@ -52,6 +52,7 @@ from est.gui.larch.autobk import _AutobkParameters
from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__)
......@@ -140,13 +141,7 @@ class AutobkWindow(qt.QMainWindow):
)
class AutobkOW(
_ProcessForOrangeMixIn,
OWEwoksWidget,
ewokstaskclass=est.core.process.larch.autobk.Larch_autobk,
inputnamemap={},
outputnamemap={},
):
class AutobkOW(_ProcessForOrangeMixIn, OWWidget, Registered):
"""
Widget used for signal extraction
"""
......@@ -166,6 +161,8 @@ class AutobkOW(
_larchSettings = Setting(dict())
"""Store the configuration of the PyMca XASClass"""
ewokstaskclass = est.core.process.larch.autobk.Larch_autobk
class Inputs:
xas_obj = Input("xas_obj", XASObject, default=True)
# simple compatibility for some Orange widget and especialy the
......@@ -232,10 +229,11 @@ class AutobkOW(
self._startProcess()
# setup the normalization process
inputs = {"xas_obj": xas_obj}
if _USE_THREAD is True:
# note: for now with larch with cannot do thread computation (see
# PreEdgeOW )
process_obj = QLarch_autobk()
process_obj = QLarch_autobk(inputs=inputs)
process_obj._advancement.sigProgress.connect(self._setProgressValue)
process_obj.set_properties(
{"_larchSettings": self._window._parametersWindow.getParameters()}
......@@ -254,7 +252,7 @@ class AutobkOW(
# manage advancement
self._advancement.setAdvancement(0)
self._advancement.setMaxSpectrum(self._latest_xas_obj.n_spectrum)
process_obj = est.core.process.larch.autobk.Larch_autobk()
process_obj = est.core.process.larch.autobk.Larch_autobk(inputs=inputs)
process_obj.advancement = self._advancement
process_obj.set_properties(
{"_larchSettings": self._window._parametersWindow.getParameters()}
......@@ -263,7 +261,7 @@ class AutobkOW(
# to avoid gui freeze, processevents after each spectrum process
process_obj.addCallback(qt.QApplication.instance().processEvents)
process_obj.addCallback(self._advancement.increaseAdvancement)
process_obj.process(self._latest_xas_obj)
process_obj.run()
self._callback_finish = None
self._endProcess(self._latest_xas_obj)
......@@ -273,8 +271,8 @@ class QLarch_autobk(est.core.process.larch.autobk.Larch_autobk):
Normalization able to give advancement using qt.Signal and QThreadPool
"""
def __init__(self):
est.core.process.larch.autobk.Larch_autobk.__init__(self)
def __init__(self, *args, **kwargs):
est.core.process.larch.autobk.Larch_autobk.__init__(self, *args, **kwargs)
self._advancement = QProgress("autobk")
def _pool_process(self, xas_obj):
......
......@@ -32,7 +32,7 @@ import functools
import logging
from Orange.widgets import gui
from Orange.widgets.settings import Setting
from ewoksorange.bindings import OWEwoksWidget
from Orange.widgets.widget import OWWidget
from Orange.widgets.widget import Input, Output
import Orange.data
from silx.gui import qt
......@@ -47,6 +47,7 @@ from orangecontrib.est.progress import QProgress
from est.gui.XasObjectViewer import _plot_norm, _plot_raw, _plot_fpp, _plot_f2
from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__)
......@@ -113,13 +114,7 @@ class MbackWindow(qt.QMainWindow):
return len(self.xasObjViewer._spectrumViews[0]._plotWidget.getAllCurves())
class MbackOW(
_ProcessForOrangeMixIn,
OWEwoksWidget,
ewokstaskclass=est.core.process.larch.mback.Larch_mback,
inputnamemap={},
outputnamemap={},
):
class MbackOW(_ProcessForOrangeMixIn, OWWidget, Registered):
"""
Widget used for signal extraction
"""
......@@ -142,6 +137,8 @@ class MbackOW(
_larchSettings = Setting(dict())
"""Store the configuration of the larch configuration"""
ewokstaskclass = est.core.process.larch.mback.Larch_mback
class Inputs:
xas_obj = Input("xas_obj", XASObject, default=True)
# simple compatibility for some Orange widget and especialy the
......@@ -206,10 +203,11 @@ class MbackOW(
self._startProcess()
# setup the normalization process
inputs = {"xas_obj": xas_obj}
if _USE_THREAD is True:
# note: for now with larch with cannot do thread computation (see
# PreEdgeOW )
process_obj = QLarch_mback()
process_obj = QLarch_mback(inputs=inputs)
process_obj._advancement.sigProgress.connect(self._setProgressValue)
process_obj.set_properties(
{"_larchSettings": self._window._parametersWindow.getParameters()}
......@@ -227,7 +225,7 @@ class MbackOW(
# manage advancement
self._advancement.setAdvancement(0)
self._advancement.setMaxSpectrum(self._latest_xas_obj.n_spectrum)
process_obj = est.core.process.larch.mback.Larch_mback()
process_obj = est.core.process.larch.mback.Larch_mback(inputs=inputs)
process_obj.advancement = self._advancement
process_obj.set_properties(
{"_larchSettings": self._window._parametersWindow.getParameters()}
......@@ -236,7 +234,7 @@ class MbackOW(
# to avoid gui freeze, processevents after each spectrum process
process_obj.addCallback(qt.QApplication.instance().processEvents)
process_obj.addCallback(self._advancement.increaseAdvancement)
process_obj.process(self._latest_xas_obj)
process_obj.run()
self._callback_finish = None
self._endProcess(self._latest_xas_obj)
......@@ -246,8 +244,8 @@ class QLarch_mback(est.core.process.larch.mback.Larch_mback):
Normalization able to give advancement using qt.Signal and QThreadPool
"""
def __init__(self):
est.core.process.larch.mback.Larch_mback.__init__(self)
def __init__(self, *args, **kwargs):
est.core.process.larch.mback.Larch_mback.__init__(self, *args, **kwargs)
self._advancement = QProgress("mback")
def _pool_process(self, xas_obj):
......
......@@ -32,7 +32,7 @@ import functools
import logging
from Orange.widgets import gui
from Orange.widgets.settings import Setting
from ewoksorange.bindings import OWEwoksWidget
from Orange.widgets.widget import OWWidget
from Orange.widgets.widget import Input, Output
import Orange.data
from silx.gui import qt
......@@ -47,6 +47,7 @@ from est.gui.larch.mback import _MBackParameters
from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__)
......@@ -115,10 +116,8 @@ class Mback_normWindow(qt.QMainWindow):
class Mback_normOW(
_ProcessForOrangeMixIn,
OWEwoksWidget,
ewokstaskclass=est.core.process.larch.mback_norm.Larch_mback_norm,
inputnamemap={},
outputnamemap={},
OWWidget,
Registered,
):
"""
Widget used for signal extraction
......@@ -138,6 +137,7 @@ class Mback_normOW(
want_main_area = True
resizing_enabled = True
allows_cycle = False
ewokstaskclass = est.core.process.larch.mback_norm.Larch_mback_norm
_larchSettings = Setting(dict())
"""Store the configuration of the larch configuration"""
......@@ -206,10 +206,11 @@ class Mback_normOW(
self._startProcess()
# setup the normalization process
inputs = {"xas_obj": xas_obj}
if _USE_THREAD is True:
# note: for now with larch with cannot do thread computation (see
# PreEdgeOW )
process_obj = QLarch_mback_norm()
process_obj = QLarch_mback_norm(inputs=inputs)
process_obj._advancement.sigProgress.connect(self._setProgressValue)
process_obj.set_properties(
{"_larchSettings": self._window._parametersWindow.getParameters()}
......@@ -227,7 +228,9 @@ class Mback_normOW(
# manage advancement
self._advancement.setAdvancement(0)
self._advancement.setMaxSpectrum(self._latest_xas_obj.n_spectrum)
process_obj = est.core.process.larch.mback_norm.Larch_mback_norm()
process_obj = est.core.process.larch.mback_norm.Larch_mback_norm(
inputs=inputs
)
process_obj.advancement = self._advancement
process_obj.set_properties(
{"_larchSettings": self._window._parametersWindow.getParameters()}
......@@ -236,7 +239,7 @@ class Mback_normOW(
# to avoid gui freeze, processevents after each spectrum process
process_obj.addCallback(qt.QApplication.instance().processEvents)
process_obj.addCallback(self._advancement.increaseAdvancement)
process_obj.process(self._latest_xas_obj)
process_obj.run()
self._callback_finish = None
self._endProcess(self._latest_xas_obj)
......@@ -246,8 +249,10 @@ class QLarch_mback_norm(est.core.process.larch.mback_norm.Larch_mback_norm):
Normalization able to give advancement using qt.Signal and QThreadPool
"""
def __init__(self):
est.core.process.larch.mback_norm.Larch_mback_norm.__init__(self)
def __init__(self, *args, **kwargs):
est.core.process.larch.mback_norm.Larch_mback_norm.__init__(
self, *args, **kwargs
)
self._advancement = QProgress("mback_norm")
def _pool_process(self, xas_obj):
......
......@@ -32,7 +32,7 @@ import functools
import logging
from Orange.widgets import gui
from Orange.widgets.settings import Setting
from ewoksorange.bindings import OWEwoksWidget
from Orange.widgets.widget import OWWidget
from Orange.widgets.widget import Input, Output
import Orange.data
from silx.gui import qt
......@@ -54,6 +54,7 @@ from est.gui.larch.pre_edge import _MPreEdgeParameters
from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__)
......@@ -129,10 +130,8 @@ class _PreEdgeWindow(qt.QMainWindow):
class PreEdgeOW(
_ProcessForOrangeMixIn,
OWEwoksWidget,
ewokstaskclass=est.core.process.larch.pre_edge.Larch_pre_edge,
inputnamemap={},
outputnamemap={},
OWWidget,
Registered,
):
"""
Widget used for signal extraction
......@@ -157,6 +156,7 @@ class PreEdgeOW(
want_main_area = True
resizing_enabled = True
allows_cycle = False
ewokstaskclass = est.core.process.larch.pre_edge.Larch_pre_edge
_larchSettings = Setting(dict())
"""Store the configuration of the larch configuration"""
......@@ -230,6 +230,7 @@ class PreEdgeOW(
self._startProcess()
# setup the normalization process
inputs = {"xas_obj": xas_obj}
if _USE_THREAD is True:
# larch is using sqlite3 for database. access to the database
# require a 'connection' and 'cursor'. theoretically we should be
......@@ -253,7 +254,7 @@ class PreEdgeOW(
# so fo rnow we are making the processing in the main thread that
# larch is happy about and splitting it in a way to avoid gui
# freeze
process_obj = QLarch_pre_edge()
process_obj = QLarch_pre_edge(inputs=inputs)
process_obj._advancement.sigProgress.connect(self._setProgressValue)
process_obj.set_properties(
{"_larchSettings": self._window._parametersWindow.getParameters()}
......@@ -271,7 +272,7 @@ class PreEdgeOW(
# manage advancement
self._advancement.setAdvancement(0)
self._advancement.setMaxSpectrum(self._latest_xas_obj.n_spectrum)
process_obj = est.core.process.larch.pre_edge.Larch_pre_edge()
process_obj = est.core.process.larch.pre_edge.Larch_pre_edge(inputs=inputs)
process_obj.advancement = self._advancement
process_obj.set_properties(
{"_larchSettings": self._window._parametersWindow.getParameters()}
......@@ -280,7 +281,7 @@ class PreEdgeOW(
# to avoid gui freeze, processevents after each spectrum process
process_obj.addCallback(qt.QApplication.instance().processEvents)
process_obj.addCallback(self._advancement.increaseAdvancement)
process_obj.process(self._latest_xas_obj)
process_obj.run()
self._callback_finish = None
self._endProcess(self._latest_xas_obj)
......@@ -290,8 +291,8 @@ class QLarch_pre_edge(est.core.process.larch.pre_edge.Larch_pre_edge):
Normalization able to give advancement using qt.Signal and QThreadPool
"""
def __init__(self):
est.core.process.larch.pre_edge.Larch_pre_edge.__init__(self)
def __init__(self, *args, **kwargs):
est.core.process.larch.pre_edge.Larch_pre_edge.__init__(self, *args, **kwargs)
self._advancement = QProgress("pre_edge")
def _pool_process(self, xas_obj):
......
......@@ -32,7 +32,7 @@ import functools
import logging
from Orange.widgets import gui
from Orange.widgets.settings import Setting
from ewoksorange.bindings import OWEwoksWidget
from Orange.widgets.widget import OWWidget
from Orange.widgets.widget import Input, Output
import Orange.data
from silx.gui import qt
......@@ -53,6 +53,7 @@ from est.gui.larch.xftf import _MXFTFParameters
from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter
from orangecontrib.est.widgets.container import _ParameterWindowContainer
from ewokscore.registration import Registered
_logger = logging.getLogger(__file__)
......@@ -151,10 +152,8 @@ class XFTFWindow(qt.QMainWindow):
class XFTFOW(
_ProcessForOrangeMixIn,
OWEwoksWidget,
ewokstaskclass=est.core.process.larch.xftf.Larch_xftf,
inputnamemap={},
outputnamemap={},
OWWidget,
Registered,
):
"""
Widget used for signal extraction
......@@ -174,6 +173,7 @@ class XFTFOW(
want_main_area = True
resizing_enabled = True
allows_cycle = False
ewokstaskclass = est.core.process.larch.xftf.Larch_xftf
_larchSettings = Setting(dict())
"""Store the configuration of the larch configuration"""
......@@ -251,8 +251,9 @@ class XFTFOW(
self._startProcess()
# setup the normalization process
inputs = {"xas_obj": xas_obj}
if _USE_THREAD is True:
process_obj = QLarch_xftf()
process_obj = QLarch_xftf(inputs=inputs)
process_obj._advancement.sigProgress.connect(self._setProgressValue)
process_obj.set_properties(
{
......@@ -272,7 +273,7 @@ class XFTFOW(
# manage advancement
self._advancement.setAdvancement(0)
self._advancement.setMaxSpectrum(self._latest_xas_obj.n_spectrum)
process_obj = est.core.process.larch.xftf.Larch_xftf()
process_obj = est.core.process.larch.xftf.Larch_xftf(inputs=inputs)
process_obj.advancement = self._advancement
process_obj.set_properties(
{"_larchSettings": self._window._parametersWindow.getParameters()}
......@@ -281,7 +282,7 @@ class XFTFOW(
# to avoid gui freeze, processevents after each spectrum process
process_obj.addCallback(qt.QApplication.instance().processEvents)
process_obj.addCallback(self._advancement.increaseAdvancement)
process_obj.process(self._latest_xas_obj)
process_obj.run()
self._callback_finish = None
self._endProcess(self._latest_xas_obj)
......@@ -291,8 +292,8 @@ class QLarch_xftf(est.core.process.larch.xftf.Larch_xftf):
Normalization able to give advancement using qt.Signal and QThreadPool
"""
def __init__(self):
est.core.process.larch.xftf.Larch_xftf.__init__(self)
def __init__(self, *args, **kwargs):
est.core.process.larch.xftf.Larch_xftf.__init__(self, *args, **kwargs)
self._advancement = QProgress("xftf")
def _pool_process(self, xas_obj):
......
......@@ -33,14 +33,14 @@ import logging
from Orange.widgets import gui
from Orange.widgets.settings import Setting
from ewoksorange.bindings import OWEwoksWidget
from Orange.widgets.widget import OWWidget
from Orange.widgets.widget import Input, Output
import Orange.data
from est.core.types import XASObject
from PyMca5.PyMcaGui.physics.xas.XASPostEdgeParameters import XASPostEdgeParameters
from silx.gui import qt
from silx.gui.plot import LegendSelector
from ewokscore.registration import Registered
import est.core.process.pymca.exafs
from orangecontrib.est.process import _ProcessForOrangeMixIn, ProcessRunnable
from est.gui.XasObjectViewer import XasObjectViewer, ViewType
......@@ -119,10 +119,8 @@ class ExafsWindow(qt.QMainWindow):
class ExafsOW(
_ProcessForOrangeMixIn,
OWEwoksWidget,
ewokstaskclass=est.core.process.pymca.exafs.PyMca_exafs,
inputnamemap={},
outputnamemap={},
OWWidget,
Registered,
):
"""
Widget used for signal extraction
......@@ -139,6 +137,7 @@ class ExafsOW(
want_main_area = True
resizing_enabled = True
allows_cycle = False
ewokstaskclass = est.core.process.pymca.exafs.PyMca_exafs
_larchSettings = Setting(dict())
"""Store the configuration of the PyMca XASClass"""
......@@ -204,7 +203,7 @@ class ExafsOW(
self._startProcess()
# setup the exafs process
process_obj = QPyMca_exafs()
process_obj = QPyMca_exafs(inputs={"xas_obj": xas_obj})
process_obj._advancement.sigProgress.connect(self._setProgressValue)
process_obj.set_properties(
{"_pymcaSettings": self._window._pymcaWindow.getParameters()}
......@@ -229,8 +228,8 @@ class QPyMca_exafs(est.core.process.pymca.exafs.PyMca_exafs):
Normalization able to give advancement using qt.Signal and QThreadPool
"""
def __init__(self):
est.core.process.pymca.exafs.PyMca_exafs.__init__(self)
def __init__(self, *args, **kwargs):
est.core.process.pymca.exafs.PyMca_exafs.__init__(self, *args, **kwargs)
self._advancement = QProgress("normalization")
def _pool_process(self, xas_obj):
......
......@@ -33,7 +33,7 @@ import logging
from Orange.widgets import gui
from Orange.widgets.settings import Setting
from ewoksorange.bindings import OWEwoksWidget
from Orange.widgets.widget import OWWidget
from Orange.widgets.widget import Input, Output
import Orange.data
from PyMca5.PyMcaGui.physics.xas.XASFourierTransformParameters import (
......@@ -48,6 +48,7 @@ from est.core.types import XASObject
from est.gui.XasObjectViewer import XasObjectViewer, ViewType
from est.gui.XasObjectViewer import _normalized_exafs, _ft_window_plot
from est.gui.XasObjectViewer import _ft_intensity_plot, _ft_imaginary_plot
from ewokscore.registration import Registered
from orangecontrib.est.progress import QProgress
from orangecontrib.est.utils import Converter
......@@ -137,10 +138,8 @@ class FTWindow(qt.QMainWindow):
class FTOW(
_ProcessForOrangeMixIn,
OWEwoksWidget,
ewokstaskclass=est.core.process.pymca.ft.PyMca_ft,
inputnamemap={},
outputnamemap={},
OWWidget,
Registered,
):
"""
Widget used for signal extraction
......@@ -157,6 +156,7 @@ class FTOW(
want_main_area = True
resizing_enabled = True
allows_cycle = False
ewokstaskclass = est.core.process.pymca.ft.PyMca_ft
_pymcaSettings = Setting(dict())
"""Store the configuration of the PyMca XASClass"""
......@@ -218,7 +218,7 @@ class FTOW(
self._startProcess()
# setup the ft process
process_obj = QPyMca_ft()
process_obj = QPyMca_ft(inputs={"xas_obj": xas_obj})
process_obj._advancement.sigProgress.connect(self._setProgressValue)
process_obj.set_properties(
{"_pymcaSettings": self._window._pymcaWindow.getParameters()}
......@@ -247,8 +247,8 @@ class QPyMca_ft(est.core.process.pymca.ft.PyMca_ft):
Normalization able to give advancement using qt.Signal and QThreadPool
"""
def __init__(self):
est.core.process.pymca.ft.PyMca_ft.__init__(self)
def __init__(self, *args, **kwargs):
est.core.process.pymca.ft.PyMca_ft.__init__(self, *args, **kwargs)
self._advancement = QProgress("normalization")
def _pool_process(self, xas_obj):
......
......@@ -32,11 +32,11 @@ import logging
from Orange.widgets import gui
from Orange.widgets.settings import Setting
from ewoksorange.bindings import OWEwoksWidget
from Orange.widgets.widget import OWWidget
from Orange.widgets.widget import Input, Output
import Orange.data
from silx.gui import qt
from ewokscore.registration import Registered
import est.core.process.pymca.k_weight
from orangecontrib.est.process import _ProcessForOrangeMixIn, ProcessRunnable
from est.core.types import XASObject
......@@ -68,10 +68,8 @@ class KWeightWindow(qt.QMainWindow):
class KWeightOW(
_ProcessForOrangeMixIn,
OWEwoksWidget,
ewokstaskclass=est.core.process.pymca.k_weight.PyMca_k_weight,
inputnamemap={},
outputnamemap={},
OWWidget,
Registered,
):
"""
Widget used for signal extraction
......@@ -88,6 +86,7 @@ class KWeightOW(
want_main_area = True
resizing_enabled = True
allows_cycle = False
ewokstaskclass = est.core.process.pymca.k_weight.PyMca_k_weight
_kWeightSetting = Setting(int(3))
"""Store the configuration of the PyMca XASClass"""
......@@ -148,7 +147,7 @@ class KWeightOW(
self._startProcess()
# setup the k weight process
process_obj = QPyMca_k_weight()
process_obj = QPyMca_k_weight(inputs={"xas_obj": xas_obj})
process_obj._advancement.sigProgress.connect(self._setProgressValue)
process_obj.set_properties(
{"_kWeightSetting": self._window._k_spin_box.value()}
......@@ -176,8 +175,8 @@ class QPyMca_k_weight(est.core.process.pymca.k_weight.PyMca_k_weight):
Normalization able to give advancement using qt.Signal and QThreadPool
"""