diff --git a/superxas_bec/devices/mo1_bragg/mo1_bragg_devices.py b/superxas_bec/devices/mo1_bragg/mo1_bragg_devices.py index 5db78a6..571661d 100644 --- a/superxas_bec/devices/mo1_bragg/mo1_bragg_devices.py +++ b/superxas_bec/devices/mo1_bragg/mo1_bragg_devices.py @@ -66,8 +66,8 @@ class Mo1BraggStatus(Device): class Mo1BraggCrystal(Device): """Mo1 Bragg PVs to set the crystal parameters""" - offset_si111 = Cpt(EpicsSignalWithRBV, suffix="offset_si111", kind="config") - offset_si311 = Cpt(EpicsSignalWithRBV, suffix="offset_si311", kind="config") + bragg_off_si111 = Cpt(EpicsSignalWithRBV, suffix="bragg_off_si111", kind="config") + bragg_off_si311 = Cpt(EpicsSignalWithRBV, suffix="bragg_off_si311", kind="config") xtal_enum = Cpt(EpicsSignalWithRBV, suffix="xtal_ENUM", kind="config") d_spacing_si111 = Cpt(EpicsSignalWithRBV, suffix="d_spacing_si111", kind="config") d_spacing_si311 = Cpt(EpicsSignalWithRBV, suffix="d_spacing_si311", kind="config") @@ -75,8 +75,8 @@ class Mo1BraggCrystal(Device): current_d_spacing = Cpt( EpicsSignalRO, suffix="current_d_spacing_RBV", kind="normal", auto_monitor=True ) - current_offset = Cpt( - EpicsSignalRO, suffix="current_offset_RBV", kind="normal", auto_monitor=True + current_bragg_off = Cpt( + EpicsSignalRO, suffix="current_bragg_off_RBV", kind="normal", auto_monitor=True ) current_xtal = Cpt( EpicsSignalRO, suffix="current_xtal_ENUM_RBV", kind="normal", auto_monitor=True @@ -373,8 +373,8 @@ class Mo1BraggPositioner(Device, PositionerBase): def set_xtal( self, xtal_enum: Literal["111", "311"], - offset_si111: float = None, - offset_si311: float = None, + bragg_off_si111: float = None, + bragg_off_si311: float = None, d_spacing_si111: float = None, d_spacing_si311: float = None, ) -> None: @@ -382,15 +382,15 @@ class Mo1BraggPositioner(Device, PositionerBase): Args: xtal_enum (Literal["111", "311"]) : Enum to set the crystal orientation - offset_si111 (float) : Offset for the 111 crystal - offset_si311 (float) : Offset for the 311 crystal + bragg_off_si111 (float) : Offset for the 111 crystal + bragg_off_si311 (float) : Offset for the 311 crystal d_spacing_si111 (float) : d-spacing for the 111 crystal d_spacing_si311 (float) : d-spacing for the 311 crystal """ - if offset_si111 is not None: - self.crystal.offset_si111.put(offset_si111) - if offset_si311 is not None: - self.crystal.offset_si311.put(offset_si311) + if bragg_off_si111 is not None: + self.crystal.bragg_off_si111.put(bragg_off_si111) + if bragg_off_si311 is not None: + self.crystal.bragg_off_si311.put(bragg_off_si311) if d_spacing_si111 is not None: self.crystal.d_spacing_si111.put(d_spacing_si111) if d_spacing_si311 is not None: