Commit 7bb468b9 authored by payno's avatar 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
......@@ -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)
......
......@@ -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
......
Markdown is supported
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