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

Corrected variable names and added info

parent e5d40d99
...@@ -118,7 +118,7 @@ class TomoOptic(TomoParameters): ...@@ -118,7 +118,7 @@ class TomoOptic(TomoParameters):
except: except:
self.__scintillator = None self.__scintillator = None
try: try:
self.__focus_steps_per_unit = config["__focus_steps_per_unit"] self.__focus_steps_per_unit = config["focus_steps_per_unit"]
except: except:
self.__focus_steps_per_unit = 0 self.__focus_steps_per_unit = 0
...@@ -421,11 +421,10 @@ class TomoOptic(TomoParameters): ...@@ -421,11 +421,10 @@ class TomoOptic(TomoParameters):
scan_params["focus_scan_steps"] = self.__focus_scan_steps scan_params["focus_scan_steps"] = self.__focus_scan_steps
scan_params["focus_lim_pos"] = self.__focus_lim_pos scan_params["focus_lim_pos"] = self.__focus_lim_pos
scan_params["focus_lim_neg"] = self.__focus_lim_neg scan_params["focus_lim_neg"] = self.__focus_lim_neg
scan_params["focus_steps_per_unit"] = self.__focus_steps_per_unit
return scan_params return scan_params
def focus_activate_config(self): def focus_config_apply(self):
""" """
Update focus motor steps per unit Update focus motor steps per unit
""" """
...@@ -444,6 +443,12 @@ class TomoOptic(TomoParameters): ...@@ -444,6 +443,12 @@ class TomoOptic(TomoParameters):
info_str += f" focus motor = None \n" info_str += f" focus motor = None \n"
else: else:
info_str += f" focus motor = {self.focus_motor().name} \n" info_str += f" focus motor = {self.focus_motor().name} \n"
if self.focus_steps_per_unit == 0:
info_str += f" focus steps per unit = {self.focus_motor().steps_per_unit}\n"
else:
info_str += f" focus motor steps per unit = {self.focus_motor().steps_per_unit}\n"
info_str += f" focus config steps per unit = {self.__focus_steps_per_unit} \n"
info_str += f" focus scan = {self.focus_scan_parameters()} \n" info_str += f" focus scan = {self.focus_scan_parameters()} \n"
return info_str return info_str
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