Emotion: refactor variables in Axis.prepare_move

bliss/common/axis.py

@@ -645,20 +645,19 @@ class Axis(object):
     def prepare_move(self, user_target_pos, relative=False):
         """Prepare a motion. Internal usage only"""
         elog.debug("user_target_pos=%g, relative=%r" % (user_target_pos, relative))
-        user_initial_dial_pos = self.dial()
+        dial_initial_pos = self.dial()
         hw_pos = self._read_dial_and_update()
 
-        elog.debug("hw_position=%g user_initial_dial_pos=%g" % (hw_pos, user_initial_dial_pos))
+        elog.debug("hw_position=%g dial_initial_pos=%g" % (hw_pos, dial_initial_pos))
 
-        if abs(user_initial_dial_pos - hw_pos) > self.tolerance:
+        if abs(dial_initial_pos - hw_pos) > self.tolerance:
             raise RuntimeError(
 					"%s: discrepancy between dial (%f) and controller position (%f), aborting" % (
-                     self.name, user_initial_dial_pos, hw_pos))
+                     self.name, dial_initial_pos, hw_pos))
 
         if relative:
             user_target_pos += self._set_position()
-        user_initial_pos = self.dial2user(user_initial_dial_pos)
-        dial_initial_pos = self.user2dial(user_initial_pos)
+        user_initial_pos = self.dial2user(dial_initial_pos)
         dial_target_pos = self.user2dial(user_target_pos)
         self._set_position(user_target_pos)
         if abs(dial_target_pos - dial_initial_pos) < 1E-6: