Fix/change gap with energy and use cached read from BEC #187
@@ -275,11 +275,11 @@ class BeamlineDevices:
|
||||
# Detector Z
|
||||
@property
|
||||
def dtz(self) -> float:
|
||||
return self._dtz.user_setpoint.get()
|
||||
return self._dtz.user_setpoint.get(cached=True)
|
||||
|
||||
@property
|
||||
def dty(self) -> float:
|
||||
return self._dty.user_setpoint.get()
|
||||
return self._dty.user_setpoint.get(cached=True)
|
||||
|
||||
@dtz.setter
|
||||
def dtz(self, value: float):
|
||||
|
||||
@@ -383,7 +383,7 @@ class BECClientWorker:
|
||||
logger.info(f"Current energy: {current_energy:.1f} eV")
|
||||
logger.info(f"Change energy requested: from {current_energy:.1f} to {value:.1f} eV")
|
||||
try:
|
||||
self.macros.bl_energy(value, move_gap=False, mono_scan=True, plot=plot)
|
||||
self.macros.bl_energy(value, move_gap=True, mono_scan=True, plot=plot)
|
||||
except Exception as e:
|
||||
raise self._bec_error(
|
||||
e,
|
||||
@@ -530,7 +530,7 @@ class BECClientWorker:
|
||||
@property
|
||||
def ring_current(self) -> float:
|
||||
try:
|
||||
return self._ring_current.get()
|
||||
return self._ring_current.get(cached=True)
|
||||
except (RPCError, ScanRequestError):
|
||||
return 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user