DAQ: Remove change of camera settings on zoom
This commit is contained in:
+4
-7
@@ -234,9 +234,6 @@ class AareDAQ:
|
||||
self.__cfg.zoom_mode = ZoomModeEnum.BeamLocation
|
||||
else:
|
||||
self.__cfg.zoom_mode = ZoomModeEnum.User
|
||||
zoom_settings = self.__cfg.zoom_settings.get_camera_settings(val)
|
||||
|
||||
self.samcam_settings = zoom_settings
|
||||
|
||||
@property
|
||||
def light(self) -> float:
|
||||
@@ -507,14 +504,14 @@ class AareDAQ:
|
||||
def sample_geometry(self) -> SampleGeometryModel:
|
||||
zoom = self.__devs.zoom
|
||||
aerotech_pos_ref = self.__cfg.abr_meas_pos
|
||||
aerotech_coord = self.__devs.aerotech_pos - aerotech_pos_ref
|
||||
# aerotech_coord = self.__devs.aerotech_pos - aerotech_pos_ref
|
||||
sample_geom = SampleGeometryModel(
|
||||
beam_location_pxl=self.__cfg.beam_mark_coeff.apply(zoom),
|
||||
pixel_in_mm=self.__cfg.pixel_to_mm(zoom),
|
||||
omega_deg=self.__devs.aerotech_omega,
|
||||
smargon=self.__devs.smargon_pos,
|
||||
beam_size_mm=self.__cfg.beam_size_mm,
|
||||
aerotech=aerotech_coord,
|
||||
aerotech=Coordinate(),
|
||||
aerotech_meas=self.__devs.aerotech_pos
|
||||
)
|
||||
return sample_geom
|
||||
@@ -1219,8 +1216,8 @@ class AareDAQ:
|
||||
transmission=self.__devs.transmission,
|
||||
zoom=self.__devs.zoom,
|
||||
commissioning_mode=self.__cfg.commissioning_mode,
|
||||
dtz_min=self.__devs.dtz_low,
|
||||
dtz_max=self.__devs.dtz_high,
|
||||
dtz_min=20,
|
||||
dtz_max=1000,
|
||||
)
|
||||
|
||||
@property
|
||||
|
||||
Reference in New Issue
Block a user