Commit 628a69b6 authored by PERNOT Guillaume's avatar PERNOT Guillaume
Browse files

don't do last move no scan[23]d

parent a13b8e7e
......@@ -135,8 +135,9 @@ def scan2d(atsctl, atik, y_inc, z_inc, n_y, n_z, _time, destdir):
if y < n_y-1:
cmd(atsctl, 'move_rel_pos_ats 0,{},0,0,0'.format(y_inc), error='ERROR')
cmd(atsctl, 'wait_move', error='ERROR')
cmd(atsctl, 'move_rel_pos_ats 0,0,{},0,0'.format(z_inc), error='ERROR')
cmd(atsctl, 'wait_move', error='ERROR')
if z < n_z-1:
cmd(atsctl, 'move_rel_pos_ats 0,0,{},0,0'.format(z_inc), error='ERROR')
cmd(atsctl, 'wait_move', error='ERROR')
y_inc = -y_inc # reverse scan
def scan3d(atsctl, atik, x_inc, y_inc, z_inc, n_x, n_y, n_z, _time, destdir):
......@@ -153,8 +154,9 @@ def scan3d(atsctl, atik, x_inc, y_inc, z_inc, n_x, n_y, n_z, _time, destdir):
cmd(atsctl, 'move_rel_pos_ats 0,{},0,0,0'.format(y_inc), error='ERROR')
cmd(atsctl, 'wait_move', error='ERROR')
x_inc = -x_inc # reverse scan
cmd(atsctl, 'move_rel_pos_ats 0,0,{},0,0'.format(z_inc), error='ERROR')
cmd(atsctl, 'wait_move', error='ERROR')
if z < n_z-1:
cmd(atsctl, 'move_rel_pos_ats 0,0,{},0,0'.format(z_inc), error='ERROR')
cmd(atsctl, 'wait_move', error='ERROR')
y_inc = -y_inc # reverse scan
def handle_client_connection(client_socket, atsctl, atik):
......
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