diff --git a/src/aare/daq/devices.py b/src/aare/daq/devices.py index 70f13710..80a529e4 100644 --- a/src/aare/daq/devices.py +++ b/src/aare/daq/devices.py @@ -27,8 +27,9 @@ class BeamlineDevices: self.__ring_current_pv = PV(f"ARS07-DPCT-0100:CURR") self.__dtz = MyMotor(f"{BEAMLINE}-ES-DET:TRZ") self.__sample_cam = epicsAD(f"{BEAMLINE}-SAMCAM:") - self.__back_light = EnumPv(f"{BEAMLINE}-ES-BL") - self.__zoom = PV("{BEAMLINE}-ES-SAMCAM:ZOOM") + self.__back_light = PV(f"{BEAMLINE}-ES-BL") + self.__zoom_set = PV(f"{BEAMLINE}-ES-SAMCAM:ZOOM.VAL") + self.__zoom_get = PV(f"{BEAMLINE}-ES-SAMCAM:ZOOM.RBV") self.__aerotech = aerotech.AerotechControllerEpics(beamline) # Transmission @@ -54,14 +55,14 @@ class BeamlineDevices: # Zoom @property def zoom(self) -> float: - return self.__zoom.get() + return self.__zoom_get.get() @zoom.setter def zoom(self, value: float): self.set_zoom(value, wait=False) def set_zoom(self, value: float, /, wait: bool = True): - self.__zoom.put(value, wait=wait) + self.__zoom_set.put(value, wait=wait) # Collimator @property