slic/cristallina
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added deadbands for diffractometer motors

Browse Source
This commit is contained in:
vonka_j
2025-04-16 14:58:02 +02:00
parent 64616cf98e
commit ca3a5199b6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crq_exp/diffractometer.py
View File

@ -9,11 +9,16 @@
""" """
from slic.core.adjustable import Adjustable, Linked from slic.core.adjustable import PVAdjustable, Linked, Adjustable
from slic.core.device import Device
from slic.core.device import Device, SimpleDevice
from slic.devices.general.motor import Motor from slic.devices.general.motor import Motor
class MotorECMC(Motor):
'''Regular motor class with extra EPICS and ECMC tolerance deadbands for motion.'''
def __init__(self, ID, **kwargs):
super().__init__(ID, **kwargs)
self.deadband_epics = PVAdjustable(self.name+'-SetCtrlDB',units='mm',name='Tolerance deadband for EPICS target reached flag.')
self.deadband_ecmc = PVAdjustable(self.name+'-SetAtTrgtDB',units='mm', name='Tolerance deadband for ECMC servo motor control')
class Diffractometer(Device): class Diffractometer(Device):
def __init__(self, ID, **kwargs): def __init__(self, ID, **kwargs):
@ -34,8 +39,8 @@ class Diffractometer(Device):
if ID == "SARES32-GPS": if ID == "SARES32-GPS":
self.name = "DM2: Cristallina pulsed magnet diffractometer" self.name = "DM2: Cristallina pulsed magnet diffractometer"
# This diffractometer also has extra swivel stages # This diffractometer also has extra swivel stages
self.rotx = Motor(ID + ":ROTX") self.rot_x = Motor(ID + ":ROTX")
self.rotz = Motor(ID + ":ROTZ") self.rot_z = Motor(ID + ":ROTZ")
if ID == "SARES31-GPS": if ID == "SARES31-GPS":
self.name = "DM1: Cristallina dilution fridge diffractometer" self.name = "DM1: Cristallina dilution fridge diffractometer"