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

Swapped deadband assignment and applied to diffractometer initialisation

Browse Source
This commit is contained in:
vonka_j
2025-04-16 15:44:10 +02:00
parent ca3a5199b6
commit befcebb9b7
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crq_exp/diffractometer.py
View File

@ -17,30 +17,30 @@ class MotorECMC(Motor):
'''Regular motor class with extra EPICS and ECMC tolerance deadbands for motion.''' '''Regular motor class with extra EPICS and ECMC tolerance deadbands for motion.'''
def __init__(self, ID, **kwargs): def __init__(self, ID, **kwargs):
super().__init__(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_epics = PVAdjustable(self.name+'-SetAtTrgtDB',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') self.deadband_ecmc = PVAdjustable(self.name+'-SetCtrlDB',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):
super().__init__(ID, **kwargs) super().__init__(ID, **kwargs)
self.twotheta = Motor(ID + ":ROT2THETA") # , ID=None, name=None, units=None, internal=False): self.twotheta = MotorECMC(ID + ":ROT2THETA") # , ID=None, name=None, units=None, internal=False):
self.theta = Motor(ID + ":ROTTHETA") # , ID=None, name=None, units=None, internal=False): self.theta = MotorECMC(ID + ":ROTTHETA") # , ID=None, name=None, units=None, internal=False):
self.trx_base = Motor(ID + ":TRXBASE") # , ID=None, name=None, units=None, internal=False): self.trx_base = MotorECMC(ID + ":TRXBASE") # , ID=None, name=None, units=None, internal=False):
self.try_base = Motor(ID + ":TRYBASE") # , ID=None, name=None, units=None, internal=False): self.try_base = MotorECMC(ID + ":TRYBASE") # , ID=None, name=None, units=None, internal=False):
self.tr_x = Motor(ID + ":TRX") self.tr_x = MotorECMC(ID + ":TRX")
self.tr_y = Motor(ID + ":TRY") self.tr_y = MotorECMC(ID + ":TRY")
self.tr_z = Motor(ID + ":TRZ") self.tr_z = MotorECMC(ID + ":TRZ")
self.td = Motor(ID + ":TD") self.td = MotorECMC(ID + ":TD")
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.rot_x = Motor(ID + ":ROTX") self.rot_x = MotorECMC(ID + ":ROTX")
self.rot_z = Motor(ID + ":ROTZ") self.rot_z = MotorECMC(ID + ":ROTZ")
if ID == "SARES31-GPS": if ID == "SARES31-GPS":
self.name = "DM1: Cristallina dilution fridge diffractometer" self.name = "DM1: Cristallina dilution fridge diffractometer"