bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

refactor: bugfix in camera data, model constant

Browse Source
This commit is contained in:
appel_c 2024-02-22 17:37:33 +01:00
parent 800c22e959
commit 00f1898a35
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ophyd_devices/sim/sim_data.py
View File

@ -424,6 +424,12 @@ class SimulatedDataMonitor(SimulatedDataBase):
self.update_sim_state(signal_name, value) self.update_sim_state(signal_name, value)
def _compute(self, *args, **kwargs) -> float: def _compute(self, *args, **kwargs) -> float:
"""
Compute the return value for given motor position and active model.
Returns:
float: Value computed by the active model.
"""
mot_name = self.sim_params["ref_motor"] mot_name = self.sim_params["ref_motor"]
if self.device_manager and mot_name in self.device_manager.devices: if self.device_manager and mot_name in self.device_manager.devices:
motor_pos = self.device_manager.devices[mot_name].obj.read()[mot_name]["value"] motor_pos = self.device_manager.devices[mot_name].obj.read()[mot_name]["value"]
@ -561,8 +567,14 @@ class SimulatedDataCamera(SimulatedDataBase):
"""Compute a return value for SimulationType2D constant.""" """Compute a return value for SimulationType2D constant."""
try: try:
shape = self.parent.image_shape.get() shape = self.parent.image_shape.get()
v = self._model_params.get("amplitude") * np.ones(shape, dtype=np.uint16) v = self.sim_params.get("amplitude") * np.ones(shape, dtype=np.float64)
return self._add_noise(v, self.sim_params["noise"], self.sim_params["noise_multiplier"]) v = self._add_noise(v, self.sim_params["noise"], self.sim_params["noise_multiplier"])
return self._add_hot_pixel(
v,
coords=self.sim_params["hot_pixel_coords"],
hot_pixel_types=self.sim_params["hot_pixel_types"],
values=self.sim_params["hot_pixel_values"],
)
except SimulatedDataException as exc: except SimulatedDataException as exc:
raise SimulatedDataException( raise SimulatedDataException(
f"Could not compute constant for {self.parent.name} with {exc} raised. Deactivate eiger to continue." f"Could not compute constant for {self.parent.name} with {exc} raised. Deactivate eiger to continue."