Commit 178a44dd authored by Tomas Farago's avatar Tomas Farago
Browse files

Merge branch '0.4' of https://gitlab.esrf.fr/tomotools/nxtomomill into 0.4

parents ccd9bed9 81f1eb3e
......@@ -803,7 +803,7 @@ def h5_to_nx(
):
continue
entry = "entry" + str(i_acquisition).zfill(4)
if single_file:
if single_file or len(acquisitions) == 1:
en_output_file = output_file
else:
ext = file_extension_ or file_extension
......@@ -842,7 +842,7 @@ def h5_to_nx(
en_output_file, os.path.dirname(output_file)
)
master_file[entry] = h5py.ExternalLink(link_file, entry)
res.append((output_file, entry))
res.append((en_output_file, entry))
else:
res.append((en_output_file, entry))
except Exception as e:
......@@ -903,8 +903,11 @@ def _get_entry_type(
except Exception as e:
_logger.error("fail to find title for %s, skip this group" % entry.name)
init_titles = list(scan_titles.init_titles)
init_titles.extend(scan_titles.init_zserie_titles)
step_titles = {
AcquisitionStep.INITIALIZATION: scan_titles.init_titles,
AcquisitionStep.INITIALIZATION: init_titles,
AcquisitionStep.DARK: scan_titles.dark_titles,
AcquisitionStep.REFERENCE: scan_titles.ref_titles,
AcquisitionStep.PROJECTION: scan_titles.proj_titles,
......
......@@ -79,7 +79,7 @@ MAJOR = 0
MINOR = 4
MICRO = 0
RELEV = "rc" # <16
SERIAL = 8 # <16
SERIAL = 9 # <16
date = __date__
......
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