Skip to content

Commit

Permalink
Fix stage error handling. Closes #81
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdvancedImagingUTSW
AdvancedImagingUTSW committed Jun 20, 2022
1 parent 98250ff commit faa33b6
Showing 1 changed file with 0 additions and 43 deletions.
43 changes: 0 additions & 43 deletions src/aslm/model/devices/stages.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,6 @@ def __init__(self, model, verbose):
except GCSError as e:
logger.exception(GCSError(e)) # Need to test this on the stage or somehow simulate, otherwise the documented way will work, but if this works it will be more clear what happened
# raise
logger.error("Reset Error Axis: 5/Focus to Start Position")
self.pidevice.RES(5) # Resets error for axis

def __del__(self):
try:
Expand Down Expand Up @@ -454,9 +452,6 @@ def move_relative(self, move_dictionary, wait_until_done=False):
self.pidevice.MVR({1: x_rel})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 1/X Relative")
self.pidevice.RES(1) # Resets error for axis
else:
logger.info("Relative movement stopped: X Motion limit would be reached!, 1000")
print(
Expand All @@ -472,9 +467,6 @@ def move_relative(self, move_dictionary, wait_until_done=False):
self.pidevice.MVR({2: y_rel})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 2/Y Relative")
self.pidevice.RES(2) # Resets error for axis
else:
logger.info("Relative movement stopped: Y Motion limit would be reached!, 1000")
print(
Expand All @@ -490,9 +482,6 @@ def move_relative(self, move_dictionary, wait_until_done=False):
self.pidevice.MVR({3: z_rel})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 3/Z Relative")
self.pidevice.RES(3) # Resets error for axis
else:
logger.info("Relative movement stopped: Z Motion limit would be reached!, 1000")
print(
Expand All @@ -506,9 +495,6 @@ def move_relative(self, move_dictionary, wait_until_done=False):
self.pidevice.MVR({4: theta_rel})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 4/Theta Relative")
self.pidevice.RES(4) # Resets error for axis
else:
logger.info("Relative movement stopped: Theta Motion limit would be reached!, 1000")
print(
Expand All @@ -523,9 +509,6 @@ def move_relative(self, move_dictionary, wait_until_done=False):
self.pidevice.MVR({5: f_rel})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 5/Focus Relative")
self.pidevice.RES(5) # Resets error for axis
else:
logger.info("Relative movement stopped: F Motion limit would be reached!, 1000")
print(
Expand All @@ -551,9 +534,6 @@ def move_absolute(self, move_dictionary, wait_until_done=False):
self.pidevice.MOV({1: x_abs})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 1/X Absolute")
self.pidevice.RES(1) # Resets error for axis
else:
logger.info("Absolute movement stopped: X Motion limit would be reached!, 1000")
print(
Expand All @@ -569,9 +549,6 @@ def move_absolute(self, move_dictionary, wait_until_done=False):
self.pidevice.MOV({2: y_abs})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 2/Y Absolute")
self.pidevice.RES(2) # Resets error for axis
else:
logger.info("Absolute movement stopped: Y Motion limit would be reached!, 1000")
print(
Expand All @@ -587,9 +564,6 @@ def move_absolute(self, move_dictionary, wait_until_done=False):
self.pidevice.MOV({3: z_abs})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 3/Z Absolute")
self.pidevice.RES(3) # Resets error for axis
else:
logger.info("Absolute movement stopped: Z Motion limit would be reached!, 1000")
print(
Expand All @@ -605,9 +579,6 @@ def move_absolute(self, move_dictionary, wait_until_done=False):
self.pidevice.MOV({5: f_abs})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 5/Focus Absolute")
self.pidevice.RES(5) # Resets error for axis
else:
logger.info("Absolute movement stopped: F Motion limit would be reached!, 1000")
print(
Expand All @@ -622,9 +593,6 @@ def move_absolute(self, move_dictionary, wait_until_done=False):
self.pidevice.MOV({4: theta_abs})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 4/Theta Absolute")
self.pidevice.RES(4) # Resets error for axis
else:
logger.info("Absolute movement stopped: Theta Motion limit would be reached!, 1000")
print(
Expand Down Expand Up @@ -664,9 +632,6 @@ def load_sample(self):
self.pidevice.MOV({2: y_abs})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 2/Y Absolute on Load Sample")
self.pidevice.RES(2) # Resets error for axis


def unload_sample(self):
Expand All @@ -675,9 +640,6 @@ def unload_sample(self):
self.pidevice.MOV({2: y_abs})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 2/Y Absolute on Unload Sample")
self.pidevice.RES(2) # Resets error for axis

def mark_rotation_position(self):
"""
Expand All @@ -699,11 +661,6 @@ def go_to_rotation_position(self, wait_until_done=False):
self.pidevice.MOV({1: x_abs, 2: y_abs, 3: z_abs})
except GCSError as e:
logger.exception(GCSError(e))
# raise
logger.error("Reset Error Axis: 1,2,3/X, Y, Z on Goto Rotation Position")
self.pidevice.RES(1) # Resets error for axis
self.pidevice.RES(2)
self.pidevice.RES(3)
if wait_until_done is True:
self.pitools.waitontarget(self.pidevice)

Expand Down

0 comments on commit faa33b6

Please sign in to comment.