Commit ea886ca7 authored by Holger Witsch's avatar Holger Witsch Committed by bliss administrator
Browse files

Changes to make the server print out the axis name, when logging.

Probably more, which I can't remember today, while trying to rebase the PiezoJack branch with the master branch.
parent c170d0e8
......@@ -100,20 +100,10 @@ class PI_E712(Controller):
elog.info("initialize_axis: ref=%s" % axis)
axis.channel = axis.config.get("channel", int)
add_axis_method(axis, self._get_gain, name = "Get_Gain", types_info = (None, float))
add_axis_method(axis, self._set_gain, name = "Set_Gain", types_info = (float, None))
add_axis_method(axis, self._get_gain, name = "Get_Gain", types_info = (None, float))
add_axis_method(axis, self._set_gain, name = "Set_Gain", types_info = (float, None))
# add custom attributes
add_axis_attribute(axis, self._get_vol, name='VOL', type_info="float")
add_axis_attribute(axis, self._get_sva, name='SVA', type_info="float")
add_axis_attribute(axis, self._get_tad, name='TAD', type_info="float")
add_axis_attribute(axis, self._get_tns, name='TNS', type_info="float")
add_axis_attribute(axis, self._get_gain, self._set_gain, name='Gain', type_info="float")
axis.paranoia_mode = axis.config.get("paranoia_mode", bool, default=True) # check error after each command
try:
axis.paranoia_mode = axis.config.get("paranoia_mode") # check error after each command
except KeyError :
axis.paranoia_mode = False
self._gate_enabled = False
......
......@@ -49,6 +49,7 @@ class PiezoSize:
"""
Piezo characteristics.
"""
def __init__(self, length, band, backlash):
self.length = length # microns (15)
self.band = band # microns (11)
......
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