Commit b9f73b6b authored by payno's avatar payno
Browse files

[moving to ewoks] fix a few typo

parent de635f03
...@@ -46,8 +46,8 @@ def xas_energy_roi(xas_obj): ...@@ -46,8 +46,8 @@ def xas_energy_roi(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: :class:`.XASObject` :rtype: :class:`.XASObject`
""" """
xas_roi_process = EnergyROIProcess() xas_roi_process = EnergyROIProcess(inputs={"xas_obj": xas_obj})
return xas_roi_process.process(xas_obj=xas_obj) return xas_roi_process.run()
class ROI1D: class ROI1D:
......
...@@ -126,8 +126,8 @@ def larch_autobk(xas_obj): ...@@ -126,8 +126,8 @@ def larch_autobk(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: XASObject :rtype: XASObject
""" """
mback_obj = Larch_autobk() mback_obj = Larch_autobk(inputs={"xas_obj": xas_obj})
return mback_obj.process(xas_obj=xas_obj) return mback_obj.run()
_USE_MULTIPROCESSING_POOL = False _USE_MULTIPROCESSING_POOL = False
......
...@@ -117,8 +117,8 @@ def larch_mback(xas_obj): ...@@ -117,8 +117,8 @@ def larch_mback(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: XASObject :rtype: XASObject
""" """
mback_obj = Larch_mback() mback_obj = Larch_mback(inputs={"xas_obj": xas_obj})
return mback_obj.process(xas_obj=xas_obj) return mback_obj.run()
_USE_MULTIPROCESSING_POOL = False _USE_MULTIPROCESSING_POOL = False
......
...@@ -126,8 +126,8 @@ def larch_mback_norm(xas_obj): ...@@ -126,8 +126,8 @@ def larch_mback_norm(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: XASObject :rtype: XASObject
""" """
mback_obj = Larch_mback_norm() mback_obj = Larch_mback_norm(inputs={"xas_obj": xas_obj})
return mback_obj.process(xas_obj=xas_obj) return mback_obj.run()
_USE_MULTIPROCESSING_POOL = False _USE_MULTIPROCESSING_POOL = False
......
...@@ -122,8 +122,8 @@ def larch_pre_edge(xas_obj): ...@@ -122,8 +122,8 @@ def larch_pre_edge(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: XASObject :rtype: XASObject
""" """
mback_obj = Larch_pre_edge() mback_obj = Larch_pre_edge(inputs={"xas_obj": xas_obj})
return mback_obj.process(xas_obj=xas_obj) return mback_obj.run()
_USE_MULTIPROCESSING_POOL = False _USE_MULTIPROCESSING_POOL = False
......
...@@ -149,8 +149,8 @@ def larch_xftf(xas_obj): ...@@ -149,8 +149,8 @@ def larch_xftf(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: XASObject :rtype: XASObject
""" """
mback_obj = Larch_xftf() mback_obj = Larch_xftf(inputs={"xas_obj": xas_obj})
return mback_obj.process(xas_obj=xas_obj) return mback_obj.run()
_USE_MULTIPROCESSING_POOL = False _USE_MULTIPROCESSING_POOL = False
...@@ -175,7 +175,7 @@ class Larch_xftf(Process): ...@@ -175,7 +175,7 @@ class Larch_xftf(Process):
def run(self, xas_obj=None): def run(self, xas_obj=None):
if xas_obj is None: if xas_obj is None:
xas_obj = self.input.xas_obj.value xas_obj = self.inputs.xas_obj
_xas_obj = self.getXasObject(xas_obj=xas_obj) _xas_obj = self.getXasObject(xas_obj=xas_obj)
if self._settings: if self._settings:
_xas_obj.configuration["xftf"] = self._settings _xas_obj.configuration["xftf"] = self._settings
...@@ -247,7 +247,7 @@ class Larch_xftf(Process): ...@@ -247,7 +247,7 @@ class Larch_xftf(Process):
), ),
), ),
) )
self.output.xas_obj.value = _xas_obj.to_dict() self.outputs.xas_obj = _xas_obj.to_dict()
return _xas_obj return _xas_obj
def _pool_process(self, xas_obj): def _pool_process(self, xas_obj):
......
...@@ -145,8 +145,8 @@ def xas_noise(xas_obj): ...@@ -145,8 +145,8 @@ def xas_noise(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: :class:`.XASObject` :rtype: :class:`.XASObject`
""" """
xas_noise_process = NoiseProcess() xas_noise_process = NoiseProcess(inputs={"xas_obj": xas_obj})
return xas_noise_process.process(xas_obj=xas_obj) return xas_noise_process.run()
class NoiseProcess(Process): class NoiseProcess(Process):
......
...@@ -137,8 +137,8 @@ def pymca_exafs(xas_obj): ...@@ -137,8 +137,8 @@ def pymca_exafs(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: XASObject :rtype: XASObject
""" """
exafs_obj = PyMca_exafs() exafs_obj = PyMca_exafs(inputs={"xas_obj": xas_obj})
return exafs_obj.run(xas_obj=xas_obj) return exafs_obj.run()
_USE_MULTIPROCESSING_POOL = False _USE_MULTIPROCESSING_POOL = False
......
...@@ -141,9 +141,9 @@ def pymca_ft(xas_obj): ...@@ -141,9 +141,9 @@ def pymca_ft(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: dict :rtype: dict
""" """
ft_obj = PyMca_ft()
assert xas_obj is not None assert xas_obj is not None
return ft_obj.process(xas_obj=xas_obj) ft_obj = PyMca_ft(inputs={"xas_obj": xas_obj})
return ft_obj.run()
_USE_MULTIPROCESSING_POOL = False _USE_MULTIPROCESSING_POOL = False
......
...@@ -129,8 +129,8 @@ def pymca_k_weight(xas_obj): ...@@ -129,8 +129,8 @@ def pymca_k_weight(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: :class:`.XASObject` :rtype: :class:`.XASObject`
""" """
k_weight_obj = PyMca_k_weight() k_weight_obj = PyMca_k_weight(inputs={"xas_obj": xas_obj})
return k_weight_obj.run(xas_obj=xas_obj) return k_weight_obj.run()
_USE_MULTIPROCESSING_POOL = False _USE_MULTIPROCESSING_POOL = False
......
...@@ -116,8 +116,8 @@ def pymca_normalization(xas_obj): ...@@ -116,8 +116,8 @@ def pymca_normalization(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: dict :rtype: dict
""" """
normalization_obj = PyMca_normalization() normalization_obj = PyMca_normalization(inputs={"xas_obj": xas_obj})
return normalization_obj.run(xas_obj=xas_obj) return normalization_obj.run()
_USE_MULTIPROCESSING_POOL = False _USE_MULTIPROCESSING_POOL = False
......
...@@ -50,8 +50,8 @@ def xas_roi(xas_obj): ...@@ -50,8 +50,8 @@ def xas_roi(xas_obj):
:return: spectra dict :return: spectra dict
:rtype: :class:`.XASObject` :rtype: :class:`.XASObject`
""" """
xas_roi_process = ROIProcess() xas_roi_process = ROIProcess(inputs={"xas_obj": xas_obj})
return xas_roi_process.process(xas_obj=xas_obj) return xas_roi_process.run()
class _ROI(object): class _ROI(object):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment