Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tomotools
nxtomomill
Commits
7bb468b9
Commit
7bb468b9
authored
Apr 22, 2021
by
payno
Browse files
Merge branch '0.5' of
https://gitlab.esrf.fr/tomotools/nxtomomill
into 0.5
parents
f6a6d9e3
82ccdeb7
Pipeline
#45419
passed with stages
in 5 minutes and 31 seconds
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
nxtomomill/converter/hdf5/hdf5converter.py
View file @
7bb468b9
...
...
@@ -398,7 +398,15 @@ class _H5ToNxConverter:
entry_type
=
get_entry_type
(
url
=
url
,
configuration
=
self
.
configuration
)
if
self
.
configuration
.
is_xrdc_ct
:
if
(
if
entry_type
is
AcquisitionStep
.
INITIALIZATION
:
current_acquisition
=
None
_logger
.
warning
(
"Found several acquisition type "
"in the same file. Stop conversion at"
" {}"
.
format
(
url
)
)
break
elif
(
not
self
.
_ignore_entry_frm_titles
(
group_name
)
and
current_acquisition
is
None
or
current_acquisition
.
is_different_sequence
(
url
)
...
...
nxtomomill/io/confighandler.py
View file @
7bb468b9
...
...
@@ -229,6 +229,8 @@ class HDF5ConfigHandler:
def
conv_xrd_ct_to_format
(
str_bool
):
if
str_bool
in
(
"True"
,
True
):
return
Format
.
XRD_CT
elif
str_bool
in
(
"False"
,
False
):
return
Format
.
STANDARD
else
:
return
None
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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