mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 2 Actions Packages Projects Releases 77 Wiki Activity

DAQ: zoom in BL state, work in progress

Browse Source
This commit is contained in:
leonarski_f
2025-09-30 09:18:57 +02:00
parent a901745da4
commit 81404facde
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/aaredaqlib/models.py
+1 -1
View File
@@ -499,7 +499,7 @@ class ZoomModel(BaseModel):
if zoom_value >= sorted_zooms[-1]:
elem = self.z[sorted_zooms[-1]]
return SampleCameraSettings(gain=elem.gain, exposure=elem.exposure)
print('interpolating zoom')
for i in range(len(sorted_zooms) - 1):
if sorted_zooms[i] <= zoom_value <= sorted_zooms[i + 1]:
lower_zoom = sorted_zooms[i]
daq/src/aaredaq/daq.py
+5 -2
View File
@@ -103,10 +103,13 @@ class AareDAQ:
def zoom(self, val: float):
self.__saved_box = None
self.__devs.zoom = val
print(f"{self.__cfg.state}")
if self.__cfg.state == BeamlineStateEnum.BeamLocation:
print(f"Setting BL zoom {val} {self.__cfg.bl_zoom_settings.get_camera_settings(val)}")
self.samcam_settings = self.__cfg.bl_zoom_settings.get_camera_settings(val)
zoom_settings = self.__cfg.zoom_settings.get_camera_settings(val)
print("Setting zoom {val} {zoom_settings}")
else:
zoom_settings = self.__cfg.zoom_settings.get_camera_settings(val)
print(f"Setting zoom {val} {zoom_settings}")
self.samcam_settings = zoom_settings
#elf.__cfg.state_busy = False