bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-06-24 03:38:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: bugfix online fixes

Browse Source
This commit is contained in:
appel_c
2023-09-04 20:50:42 +02:00
parent 2dd8f25c87
commit ba9cb77ed9
4 changed files with 31 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ophyd_devices/epics/devices/bec_scaninfo_mixin.py
View File

@ -53,7 +53,9 @@ class BecScaninfoMixin:
self.scanID = scan_msg.content["scanID"]
self.scan_number = scan_msg.content["info"]["scan_number"]
self.exp_time = scan_msg.content["info"]["exp_time"]
self.num_frames = scan_msg.content["info"]["num_points"]
self.num_frames = (
scan_msg.content["info"]["num_points"] * scan_msg.content["info"]["frames_per_trigger"]
)
self.scan_type = scan_msg.content["info"].get("scan_type", "step")
self.readout_time = scan_msg.content["info"]["readout_time"]
self.username = self._get_username()

24
ophyd_devices/epics/devices/eiger9m_csaxs.py
View File

@ -126,9 +126,7 @@ class Eiger9mCsaxs(DetectorBase):
**kwargs,
)
if device_manager is None and not sim_mode:
raise EigerError(
"Add DeviceManager to initialization or init with sim_mode=True"
)
raise EigerError("Add DeviceManager to initialization or init with sim_mode=True")
self.name = name
self.wait_for_connection() # Make sure to be connected before talking to PVs
@ -142,9 +140,7 @@ class Eiger9mCsaxs(DetectorBase):
# TODO
self.filepath = ""
self.scaninfo.username = "e21206"
self.service_cfg = {
"base_path": f"/sls/X12SA/data/{self.scaninfo.username}/Data10/"
}
self.service_cfg = {"base_path": f"/sls/X12SA/data/{self.scaninfo.username}/Data10/"}
self.filewriter = FileWriterMixin(self.service_cfg)
self.reduce_readout = 1e-3 # 3 ms
self.triggermode = 0 # 0 : internal, scan must set this if hardware triggered
@ -172,9 +168,7 @@ class Eiger9mCsaxs(DetectorBase):
f"Type of new value {type(value)}:{value} does not match old value {type(old_value)}:{old_value}"
)
cfg.update({cfg_key: value})
logger.info(
f"Updated std_daq config for key {cfg_key} from {old_value} to {value}"
)
logger.info(f"Updated std_daq config for key {cfg_key} from {old_value} to {value}")
def _init_standard_daq(self) -> None:
self.std_rest_server_url = "http://xbl-daq-29:5000"
@ -204,9 +198,7 @@ class Eiger9mCsaxs(DetectorBase):
energy = self.cam.beam_energy.read()[self.cam.beam_energy.name]["value"]
if setp_energy != energy:
self.cam.beam_energy.set(setp_energy) # .wait()
threshold = self.cam.threshold_energy.read()[self.cam.threshold_energy.name][
"value"
]
threshold = self.cam.threshold_energy.read()[self.cam.threshold_energy.name]["value"]
if not np.isclose(setp_energy / 2, threshold, rtol=0.05):
self.cam.threshold_energy.set(setp_energy / 2) # .wait()
@ -267,9 +259,7 @@ class Eiger9mCsaxs(DetectorBase):
self.arm_acquisition()
logger.info("Waiting for detector to be armed")
while True:
det_ctrl = self.cam.detector_state.read()[self.cam.detector_state.name][
"value"
]
det_ctrl = self.cam.detector_state.read()[self.cam.detector_state.name]["value"]
if det_ctrl == int(DetectorState.RUNNING):
break
time.sleep(0.005)
@ -296,9 +286,7 @@ class Eiger9mCsaxs(DetectorBase):
# Message to BEC
state = True
msg = BECMessage.FileMessage(
file_path=self.filepath, done=True, successful=state
)
msg = BECMessage.FileMessage(file_path=self.filepath, done=True, successful=state)
self._producer.set_and_publish(
MessageEndpoints.public_file(self.scaninfo.scanID, self.name),
msg.dumps(),

21
ophyd_devices/epics/devices/mcs_csaxs.py
View File

@ -145,15 +145,14 @@ class McsCsaxs(SIS38XX):
parent=None,
device_manager=None,
sim_mode=False,
mcs_config = None,
mcs_config=None,
**kwargs,
):
self.mcs_config = {
f"{name}_num_lines": 1,
}
if mcs_config is not None:
[self.mcs_config.update({f'{name}_{key}' : value}) for key, value in mcs_config.items()]
[self.mcs_config.update({f"{name}_{key}": value}) for key, value in mcs_config.items()]
super().__init__(
prefix=prefix,
@ -166,9 +165,7 @@ class McsCsaxs(SIS38XX):
)
if device_manager is None and not sim_mode:
raise MCSError(
"Add DeviceManager to initialization or init with sim_mode=True"
)
raise MCSError("Add DeviceManager to initialization or init with sim_mode=True")
self.name = name
self._stream_ttl = 1800
@ -185,9 +182,7 @@ class McsCsaxs(SIS38XX):
self.scaninfo = BecScaninfoMixin(device_manager, sim_mode)
# TODO
self.scaninfo.username = "e21206"
self.service_cfg = {
"base_path": f"/sls/X12SA/data/{self.scaninfo.username}/Data10/"
}
self.service_cfg = {"base_path": f"/sls/X12SA/data/{self.scaninfo.username}/Data10/"}
self.filewriter = FileWriterMixin(self.service_cfg)
self._stopped = False
self._acquisition_done = False
@ -209,9 +204,7 @@ class McsCsaxs(SIS38XX):
self._set_trigger(TriggerSource.MODE3)
self.input_polarity.set(0)
self.count_on_start.set(0)
self.mca_names = [
signal for signal in self.component_names if signal.startswith("mca")
]
self.mca_names = [signal for signal in self.component_names if signal.startswith("mca")]
self.mca_data = defaultdict(lambda: [])
for mca in self.mca_names:
signal = getattr(self, mca)
@ -270,9 +263,7 @@ class McsCsaxs(SIS38XX):
def _set_acquisition_params(self) -> None:
n_points = self.scaninfo.num_frames / int(self.num_lines.get())
if n_points > 10000:
raise MCSError(
f"Requested number of points {n_points} exceeds hardware limit of 10000"
)
raise MCSError(f"Requested number of points {n_points} exceeds hardware limit of 10000")
self.num_use_all.set(n_points)
self.preset_real.set(0)

64
ophyd_devices/galil/sgalil_ophyd.py
View File

@ -285,9 +285,7 @@ class GalilController(Controller):
start_y *= sign_y
end_y *= sign_y
speed = np.abs(end_y - start_y) / (
(interval_y) * exp_time + (interval_y - 1) * readtime
)
speed = np.abs(end_y - start_y) / ((interval_y) * exp_time + (interval_y - 1) * readtime)
if speed > 2.00 or speed < 0.02:
raise LimitError(
f"Speed of {speed:.03f}mm/s is outside of acceptable range of 0.02 to 2 mm/s"
@ -299,9 +297,7 @@ class GalilController(Controller):
# Hard coded to maximum offset of 0.1mm to avoid long motions.
self.socket_put_and_receive(f"off={(0):f}")
self.socket_put_and_receive(
f"a_start={start_y:.04f};a_end={end_y:.04f};speed={speed:.04f}"
)
self.socket_put_and_receive(f"a_start={start_y:.04f};a_end={end_y:.04f};speed={speed:.04f}")
self.socket_put_and_receive(
f"b_start={start_x:.04f};gridmax={gridmax:d};b_step={step_grid:.04f}"
)
@ -321,9 +317,7 @@ class GalilController(Controller):
val_axis4 = [] # x axis
while self.is_thread_active(thread_id):
posct = int(self.socket_put_and_receive(f"MGposct").strip().split(".")[0])
logger.info(
f"SGalil is scanning - latest enconder position {posct+1} from {n_samples}"
)
logger.info(f"SGalil is scanning - latest enconder position {posct+1} from {n_samples}")
time.sleep(1)
if posct > last_readout:
positions = self.read_encoder_position(last_readout, posct)
@ -334,9 +328,7 @@ class GalilController(Controller):
time.sleep(1)
# Readout of last positions after scan finished
posct = int(self.socket_put_and_receive(f"MGposct").strip().split(".")[0])
logger.info(
f"SGalil is scanning - latest enconder position {posct} from {n_samples}"
)
logger.info(f"SGalil is scanning - latest enconder position {posct} from {n_samples}")
if posct > last_readout:
positions = self.read_encoder_position(last_readout, posct)
val_axis4.extend(positions[0])
@ -348,9 +340,7 @@ class GalilController(Controller):
val_axis2 = [] # y axis
val_axis4 = [] # x axis
for ii in range(fromval, toval + 1):
rts = self.socket_put_and_receive(
f"MGaposavg[{ii%2000}]*10,cposavg[{ii%2000}]*10"
)
rts = self.socket_put_and_receive(f"MGaposavg[{ii%2000}]*10,cposavg[{ii%2000}]*10")
if rts == ":":
val_axis4.append(rts)
val_axis2.append(rts)
@ -389,15 +379,11 @@ class GalilReadbackSignal(GalilSignalRO):
"""
if self.parent.axis_Id_numeric == 2:
current_pos = float(
self.controller.socket_put_and_receive(
f"MG _TP{self.parent.axis_Id}/mm"
)
self.controller.socket_put_and_receive(f"MG _TP{self.parent.axis_Id}/mm")
)
elif self.parent.axis_Id_numeric == 4:
# hardware controller readback from axis 4 is on axis 0, A instead of E
current_pos = float(
self.controller.socket_put_and_receive(f"MG _TP{'A'}/mm")
)
current_pos = float(self.controller.socket_put_and_receive(f"MG _TP{'A'}/mm"))
current_pos *= self.parent.sign
return current_pos
@ -443,17 +429,11 @@ class GalilSetpointSignal(GalilSignalBase):
time.sleep(0.1)
if self.parent.axis_Id_numeric == 2:
self.controller.socket_put_confirmed(
f"PA{self.parent.axis_Id}={target_val:.4f}*mm"
)
self.controller.socket_put_confirmed(f"PA{self.parent.axis_Id}={target_val:.4f}*mm")
self.controller.socket_put_and_receive(f"BG{self.parent.axis_Id}")
elif self.parent.axis_Id_numeric == 4:
self.controller.socket_put_confirmed(
f"targ{self.parent.axis_Id}={target_val:.4f}"
)
self.controller.socket_put_and_receive(
f"XQ#POSE,{self.parent.axis_Id_numeric}"
)
self.controller.socket_put_confirmed(f"targ{self.parent.axis_Id}={target_val:.4f}")
self.controller.socket_put_and_receive(f"XQ#POSE,{self.parent.axis_Id_numeric}")
while self.controller.is_thread_active(0):
time.sleep(0.005)
@ -462,9 +442,7 @@ class GalilMotorIsMoving(GalilSignalRO):
@threadlocked
def _socket_get(self):
if self.parent.axis_Id_numeric == 2:
ret = self.controller.is_axis_moving(
self.parent.axis_Id, self.parent.axis_Id_numeric
)
ret = self.controller.is_axis_moving(self.parent.axis_Id, self.parent.axis_Id_numeric)
return ret
if self.parent.axis_Id_numeric == 4:
# Motion signal from axis 4 is mapped to axis 5
@ -502,12 +480,8 @@ class SGalilMotor(Device, PositionerBase):
kind="hinted",
)
user_setpoint = Cpt(GalilSetpointSignal, signal_name="setpoint")
motor_is_moving = Cpt(
GalilMotorIsMoving, signal_name="motor_is_moving", kind="normal"
)
all_axes_referenced = Cpt(
GalilAxesReferenced, signal_name="all_axes_referenced", kind="config"
)
motor_is_moving = Cpt(GalilMotorIsMoving, signal_name="motor_is_moving", kind="normal")
all_axes_referenced = Cpt(GalilAxesReferenced, signal_name="all_axes_referenced", kind="config")
high_limit_travel = Cpt(Signal, value=0, kind="omitted")
low_limit_travel = Cpt(Signal, value=0, kind="omitted")
@ -688,9 +662,7 @@ class SGalilMotor(Device, PositionerBase):
def axis_Id_numeric(self, val):
if isinstance(val, int):
if val not in [2, 4]:
raise ValueError(
f"Numeric value {val} is not supported, it must be either 2 or 4."
)
raise ValueError(f"Numeric value {val} is not supported, it must be either 2 or 4.")
self._axis_Id_alpha = val
self._axis_Id_numeric = (chr(val + 97)).capitalize()
else:
@ -714,11 +686,7 @@ if __name__ == "__main__":
else:
from ophyd_devices.utils.socket import SocketMock
samx = SGalilMotor(
"E", name="samx", host="129.129.122.26", port=23, socket_cls=SocketMock
)
samy = SGalilMotor(
"C", name="samy", host="129.129.122.26", port=23, socket_cls=SocketMock
)
samx = SGalilMotor("E", name="samx", host="129.129.122.26", port=23, socket_cls=SocketMock)
samy = SGalilMotor("C", name="samy", host="129.129.122.26", port=23, socket_cls=SocketMock)
samx.controller.galil_show_all()