post-p21592 HVE commissioning cleanup

This commit is contained in:
2023-12-13 14:25:59 +01:00
parent a40a4be2b4
commit 7b9f3fa9b7
7 changed files with 346 additions and 43 deletions

View File

@ -9,7 +9,7 @@
"""
from slic.core.adjustable import Adjustable
from slic.core.adjustable import Adjustable, PrimarySecondary
from slic.core.device import Device, SimpleDevice
from slic.devices.general.motor import Motor
@ -27,12 +27,24 @@ class Diffractometer(Device):
self.tr_x = Motor("SARES30-CPCL-ECMC02:TRX")
self.tr_y = Motor("SARES30-CPCL-ECMC02:TRY")
self.tr_z = Motor("SARES30-CPCL-ECMC02:TRZ")
self.td = Motor("SARES30-CPCL-ECMC02:TD")
diffractometer = Diffractometer("diffractometer")
# Set speed:
# diffractometer.theta._motor.VELO = 0.25
# diffractometer.theta._motor.VELO = 0.25
class ThetasCombined(PrimarySecondary):
def __init__(self, *args, **kwargs):
super().__init__(self, *args, **kwargs)
def connect_axis(self):
"""
calculate offset to match scale factor
"""
offset = self.secondary.get_current_value() - self.primary.get_current_value() * self.scale_factor
self.offset = offset