Commit fd71110c authored by bliss administrator's avatar bliss administrator
Browse files

Add additional motors in metadata for halftomo, zseries and topotomo

parent 0e0260c7
......@@ -49,7 +49,7 @@ class TomoMetaData:
alias_name = "None"
if setup_globals.ALIASES.get_alias(self.tomo.rotation_axis.name) is not None:
alias_name = setup_globals.ALIASES.get_alias(self.tomo.rotation_axis.name)
scan["motor"] = (self.tomo.rotation_axis.name, alias_name)
scan["motor"] = ["rotation",self.tomo.rotation_axis.name, alias_name]
scan["scan_type"] = self.tomo.parameters.scan_type.name
scan["scan_range"] = (
self.tomo.parameters.end_pos - self.tomo.parameters.start_pos
......
......@@ -593,6 +593,10 @@ class HalfTomo(FastTomo, TomoParameters):
"""
with cleanup(self.scan_cleanup):
scan_info = self.tomo.meta_data.tomo_scan_info()
alias_name = "None"
if setup_globals.ALIASES.get_alias(self.lat_align_axis.name) is not None:
alias_name = setup_globals.ALIASES.get_alias(self.lat_align_axis.name)
scan_info["technique"]["scan"]["motor"].extend(["lateral_axis",self.lat_align_axis.name,alias_name])
if self.tomo.parameters.sinogram_active:
......@@ -808,6 +812,10 @@ class ZSeries(FastTomo):
scan_info["technique"]["scan"]["nb_scans"] = self.nb_scans
scan_info["technique"]["scan"]["start_nb"] = self.start_nb
alias_name = "None"
if setup_globals.ALIASES.get_alias(self.z_axis.name) is not None:
alias_name = setup_globals.ALIASES.get_alias(self.z_axis.name)
scan_info["technique"]["scan"]["motor"].extend(["z_axis",self.z_axis.name,alias_name])
ScanDisplay.NB_SCANS = self.nb_scans
ScanDisplay.SCAN_NB = 0
......@@ -1164,8 +1172,14 @@ class TopoTomo(FastTomo):
with cleanup(
self.scan_cleanup, self.nested_axis, restore_list=(cleanup_axis.POS,)
):
scan_info=self.tomo.meta_data.tomo_scan_info()
alias_name = "None"
if setup_globals.ALIASES.get_alias(self.nested_axis.name) is not None:
alias_name = setup_globals.ALIASES.get_alias(self.nested_axis.name)
scan_info["technique"]["scan"]["motor"].extend(["nested_axis",self.nested_axis.name,alias_name])
seq = Sequence(
title=self.tomo.sequence, scan_info=self.tomo.meta_data.tomo_scan_info()
title=self.tomo.sequence, scan_info=scan_info
)
with seq.sequence_context() as scan_seq:
self.tomo.run_sequence(scan_seq)
......
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