copy current SwissMX.conf, minor fixes

epics_widgets/MotorTweak.py

@@ -8,9 +8,8 @@ from PyQt5.QtGui import QPainter, QBrush, QColor, QPainterPath, QPen, QDoubleVal
 from PyQt5.QtWidgets import QMenu, QInputDialog, QAction
 from PyQt5.uic import loadUiType
 from epics import Motor
-from epics.ca import pend_event
 
-from app_utils import assert_motor_positions
+from app_utils import assert_tweaker_positions
 
 Ui_MotorTweak, QWidget = loadUiType('epics_widgets/MotorTweak.ui')
 SPMG_STOP = 0
@@ -150,7 +149,7 @@ class MotorTweak(QWidget, Ui_MotorTweak):
     m=self._motor
     m.move(drive, wait=wait, ignore_limits=True, relative=False)
     if assert_position:
-      assert_motor_positions([(m, drive, 0.1)], timeout=1)
+      assert_tweaker_positions([(self, drive, 0.1)], timeout=1)
 
   def emit_signals(self, **kw):
     '''