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
ixstools
xrstools
Commits
a79301c5
Commit
a79301c5
authored
Dec 07, 2020
by
myron
Browse files
changed some scan ordering
parent
5e390289
Changes
2
Hide whitespace changes
Inline
Side-by-side
XRStools/XRS_swissknife.py
View file @
a79301c5
...
...
@@ -127,13 +127,19 @@ def filterRoiList(l, strip=False, prefix="ROI"):
result
=
[
str
(
int
(
stripROI
(
t
)))
for
t
in
l
if
(
t
not
in
[
"motorDict"
,
"response"
]
and
t
[:
len
(
prefix
)]
==
prefix
)]
else
:
result
=
[
t
for
t
in
l
if
(
t
not
in
[
"motorDict"
,
"response"
]
and
t
[:
len
(
prefix
)]
==
prefix
)
]
result
.
sort
()
result
=
sorted
(
result
,
key
=
lambda
x
:
int
(
''
.
join
(
filter
(
str
.
isdigit
,
str
(
x
)
)))
)
### result.sort()
return
result
def
filterScanList
(
l
,
prefix
=
"Scan"
):
result
=
[
t
for
t
in
l
if
(
t
not
in
[
"motorDict"
,
"response"
]
and
t
[:
len
(
prefix
)]
==
prefix
)
]
result
.
sort
()
result
=
sorted
(
result
,
key
=
lambda
x
:
int
(
''
.
join
(
filter
(
str
.
isdigit
,
str
(
x
)
)))
)
# result.sort()
return
result
...
...
@@ -1476,7 +1482,9 @@ def extract_spectra(mydata):
h5f
.
require_group
(
target_groupname
)
h5
=
h5f
[
target_groupname
]
listakeys
=
list
(
myres
[
ascan
].
keys
())
listakeys
.
sort
()
listakeys
=
sorted
(
listakeys
,
key
=
lambda
x
:
int
(
''
.
join
(
filter
(
str
.
isdigit
,
str
(
x
)
)))
)
# listakeys.sort()
for
k
in
listakeys
:
...
...
@@ -2561,7 +2569,9 @@ def superR_getVolume_Esynt(mydata):
h5
=
h5f
[
scalprods_groupname
]
vkeys
=
list
(
h5
.
keys
())
vkeys
.
sort
()
vkeys
=
sorted
(
vkeys
,
key
=
lambda
x
:
int
(
''
.
join
(
filter
(
str
.
isdigit
,
str
(
x
)
)))
)
### vkeys.sort()
DS
=
[]
...
...
@@ -3448,8 +3458,6 @@ def superR_scal_deltaXimages_Esynt(mydata):
roi_keys
=
new_roi_keys
roi_keys
=
sorted
(
roi_keys
,
key
=
int
)
fattori
=
{}
## This is used for balancing. Will stay to 1.0 for all rois if solution is not given in input
for
i
,
rk
in
enumerate
(
roi_keys
):
...
...
nonregressions/volumes/esrf_scans/fourmis/interp/batch_extraction_interp.py
View file @
a79301c5
...
...
@@ -50,7 +50,7 @@ def main():
volume_retrieval_niter
=
100
steps_to_do
=
{
"do_step_make_roi"
:
Fals
e
,
"do_step_make_roi"
:
Tru
e
,
"do_step_sample_extraction"
:
False
,
"do_step_interpolation"
:
False
,
"do_step_extract_reference_scan"
:
False
,
...
...
@@ -59,7 +59,7 @@ def main():
"do_step_resynthetise_reference"
:
False
,
"do_step_scalars"
:
False
,
"do_step_volume_retrieval"
:
False
,
"do_step_put_all_in_one_stack"
:
Tru
e
"do_step_put_all_in_one_stack"
:
Fals
e
}
...
...
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