Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
workflow
ewoksapps
est
Commits
9bbcd359
Commit
9bbcd359
authored
Jul 21, 2021
by
payno
Browse files
move imports from esrftaskXXX to ewoksXXX
parent
15dcce9b
Changes
18
Hide whitespace changes
Inline
Side-by-side
est/core/process/ignoreprocess.py
View file @
9bbcd359
from
e
srftaskgraph
import
Task
from
e
wokscore.task
import
Task
class
IgnoreTask
(
Task
):
...
...
est/core/process/process.py
View file @
9bbcd359
...
...
@@ -34,7 +34,7 @@ from est.core.types import XASObject
from
..utils
import
extract_properties_from_dict
import
logging
from
collections
import
namedtuple
from
e
srftaskgraph
.task
import
Task
from
e
wokscore
.task
import
Task
from
typing
import
Iterable
_logger
=
logging
.
getLogger
(
__name__
)
...
...
est/core/types/xasobject.py
View file @
9bbcd359
...
...
@@ -47,7 +47,6 @@ from .dim import Dim
from
.spectra
import
Spectra
from
est.settings
import
DEFAULT_READ_TIMEOUT
from
est.thirdparty.silx.hdf5file
import
get_data
,
HDF5File
from
esrftaskgraph
import
Variable
try
:
import
larch
...
...
orangecontrib/est/widgets/larch/autobk.py
View file @
9bbcd359
...
...
@@ -32,7 +32,7 @@ import functools
import
logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
silx.gui
import
qt
...
...
@@ -142,8 +142,8 @@ class AutobkWindow(qt.QMainWindow):
class
AutobkOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
larch
.
autobk
.
Larch_autobk
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
larch
.
autobk
.
Larch_autobk
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/larch/mback.py
View file @
9bbcd359
...
...
@@ -32,7 +32,7 @@ import functools
import
logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
silx.gui
import
qt
...
...
@@ -115,8 +115,8 @@ class MbackWindow(qt.QMainWindow):
class
MbackOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
larch
.
mback
.
Larch_mback
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
larch
.
mback
.
Larch_mback
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/larch/mback_norm.py
View file @
9bbcd359
...
...
@@ -32,7 +32,7 @@ import functools
import
logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
silx.gui
import
qt
...
...
@@ -115,8 +115,8 @@ class Mback_normWindow(qt.QMainWindow):
class
Mback_normOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
larch
.
mback_norm
.
Larch_mback_norm
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
larch
.
mback_norm
.
Larch_mback_norm
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/larch/pre_edge.py
View file @
9bbcd359
...
...
@@ -32,7 +32,7 @@ import functools
import
logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
silx.gui
import
qt
...
...
@@ -129,8 +129,8 @@ class _PreEdgeWindow(qt.QMainWindow):
class
PreEdgeOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
larch
.
pre_edge
.
Larch_pre_edge
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
larch
.
pre_edge
.
Larch_pre_edge
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/larch/xftf.py
View file @
9bbcd359
...
...
@@ -32,7 +32,7 @@ import functools
import
logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
silx.gui
import
qt
...
...
@@ -151,8 +151,8 @@ class XFTFWindow(qt.QMainWindow):
class
XFTFOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
larch
.
xftf
.
Larch_xftf
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
larch
.
xftf
.
Larch_xftf
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/pymca/exafs.py
View file @
9bbcd359
...
...
@@ -33,7 +33,7 @@ import logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
est.core.types
import
XASObject
...
...
@@ -119,8 +119,8 @@ class ExafsWindow(qt.QMainWindow):
class
ExafsOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
pymca
.
exafs
.
PyMca_exafs
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
pymca
.
exafs
.
PyMca_exafs
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/pymca/ft.py
View file @
9bbcd359
...
...
@@ -33,7 +33,7 @@ import logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
PyMca5.PyMcaGui.physics.xas.XASFourierTransformParameters
import
(
...
...
@@ -137,8 +137,8 @@ class FTWindow(qt.QMainWindow):
class
FTOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
pymca
.
ft
.
PyMca_ft
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
pymca
.
ft
.
PyMca_ft
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/pymca/k_weight.py
View file @
9bbcd359
...
...
@@ -32,7 +32,7 @@ import logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
silx.gui
import
qt
...
...
@@ -68,8 +68,8 @@ class KWeightWindow(qt.QMainWindow):
class
KWeightOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
pymca
.
k_weight
.
PyMca_k_weight
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
pymca
.
k_weight
.
PyMca_k_weight
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/pymca/normalization.py
View file @
9bbcd359
...
...
@@ -33,7 +33,7 @@ import logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
PyMca5.PyMcaGui.physics.xas.XASNormalizationParameters
import
(
...
...
@@ -185,8 +185,8 @@ class NormalizationWindow(qt.QMainWindow):
class
NormalizationOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
pymca
.
normalization
.
PyMca_normalization
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
pymca
.
normalization
.
PyMca_normalization
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/utils/e0calculator.py
View file @
9bbcd359
...
...
@@ -30,7 +30,7 @@ __date__ = "02/10/2018"
import
logging
from
Orange.widgets
import
gui
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
orangecontrib.est.utils
import
Converter
...
...
@@ -45,8 +45,8 @@ _logger = logging.getLogger(__file__)
class
E0calculatorOW
(
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
ignoreprocess
.
IgnoreE0Calculation
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
ignoreprocess
.
IgnoreE0Calculation
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/utils/energyroi.py
View file @
9bbcd359
...
...
@@ -31,7 +31,7 @@ import logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
orangecontrib.est.utils
import
Converter
...
...
@@ -45,8 +45,8 @@ _logger = logging.getLogger(__file__)
class
EnergyRoiOW
(
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
energyroi
.
EnergyROIProcess
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
energyroi
.
EnergyROIProcess
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
@@ -155,7 +155,7 @@ class EnergyRoiOW(
except
Exception
as
e
:
_logger
.
error
(
e
)
else
:
OWE
SRF
Widget
.
accept
(
self
)
OWE
woks
Widget
.
accept
(
self
)
def
updateProperties
(
self
):
# as dim are named tuple we have to cast them to dict
...
...
orangecontrib/est/widgets/utils/noise.py
View file @
9bbcd359
...
...
@@ -31,7 +31,7 @@ import logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
from
orangecontrib.est.progress
import
QProgress
from
orangecontrib.est.process
import
ProcessRunnable
...
...
@@ -49,8 +49,8 @@ _logger = logging.getLogger(__file__)
class
NoiseOW
(
_ProcessForOrangeMixIn
,
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
noise
.
NoiseProcess
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
noise
.
NoiseProcess
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/utils/roi.py
View file @
9bbcd359
...
...
@@ -31,7 +31,7 @@ import logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Input
,
Output
import
Orange.data
from
orangecontrib.est.utils
import
Converter
...
...
@@ -45,8 +45,8 @@ _logger = logging.getLogger(__file__)
class
RoiSelectionOW
(
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
roi
.
ROIProcess
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
roi
.
ROIProcess
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
@@ -140,7 +140,7 @@ class RoiSelectionOW(
except
Exception
as
e
:
_logger
.
error
(
e
)
else
:
OWE
SRF
Widget
.
accept
(
self
)
OWE
woks
Widget
.
accept
(
self
)
def
updateProperties
(
self
):
# as dim are named tuple we have to cast them to dict
...
...
orangecontrib/est/widgets/utils/xas_input.py
View file @
9bbcd359
...
...
@@ -31,7 +31,7 @@ __date__ = "06/11/2019"
import
logging
from
Orange.widgets
import
gui
from
Orange.widgets.settings
import
Setting
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.widget
import
Output
from
silx.gui
import
qt
from
silx.io.url
import
DataUrl
...
...
@@ -48,8 +48,8 @@ _DEBUG = False
class
XASInputOW
(
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
io
.
ReadXasObject
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
io
.
ReadXasObject
,
inputnamemap
=
{},
outputnamemap
=
{
"xas_obj"
:
"toto"
},
):
...
...
orangecontrib/est/widgets/utils/xas_output.py
View file @
9bbcd359
...
...
@@ -29,12 +29,11 @@ __date__ = "06/11/2019"
from
Orange.widgets
import
gui
from
e
srf2
orange
3
.bindings
import
OWE
SRF
Widget
from
e
woks
orange.bindings
import
OWE
woks
Widget
from
Orange.widgets.settings
import
Setting
from
Orange.widgets.widget
import
Input
from
silx.gui
import
qt
from
est.core.types
import
XASObject
import
est.core.io
import
est.core.process.io
import
logging
import
h5py
...
...
@@ -43,8 +42,8 @@ _logger = logging.getLogger(__file__)
class
XASOutputOW
(
OWE
SRF
Widget
,
e
srf
taskclass
=
est
.
core
.
process
.
io
.
DumpXasObject
,
OWE
woks
Widget
,
e
woks
taskclass
=
est
.
core
.
process
.
io
.
DumpXasObject
,
inputnamemap
=
{
"xas_obj"
:
"toto"
},
outputnamemap
=
{},
):
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment