sf-mx/SwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

copy current SwissMX.conf, minor fixes

Browse Source
This commit is contained in:
zamofing_t
2022-09-21 16:11:03 +02:00
parent 1393269ceb
commit d8399e901c
8 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
epics_widgets/MotorTweak.py
View File

@@ -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):
'''

2
epics_widgets/SmaractMotorTweak.py
View File

@@ -7,7 +7,7 @@ from PyQt5.QtWidgets import QMenu, QInputDialog, QAction
from PyQt5.uic import loadUiType
from epics import PV
from epics.ca import pend_event
from motor_utils import assert_tweaker_positions
from app_utils import assert_tweaker_positions
Ui_MotorTweak, QWidget = loadUiType('epics_widgets/MotorTweak.ui')
logger = logging.getLogger(__name__)