DAQ: updated grid_request parameters in __auto_center
This commit is contained in:
1 parent
75cc75b10e
commit
344190831b
1 file changed
+4
-3
@@ -343,19 +343,20 @@ class AareDAQ:
|
|||||||
old_prefix = grid.file_prefix
|
old_prefix = grid.file_prefix
|
||||||
r = self.__ml_bounding_box(sample.db_id, grid.file_prefix)
|
r = self.__ml_bounding_box(sample.db_id, grid.file_prefix)
|
||||||
if r is not None:
|
if r is not None:
|
||||||
|
geom = self.sample_geometry
|
||||||
grid.smargon = r.smargon
|
grid.smargon = r.smargon
|
||||||
grid.grid_size_mm = r.grid_size_mm
|
grid.grid_size_mm = r.grid_size_mm
|
||||||
grid.n_x = r.n_x
|
grid.n_x = r.n_x
|
||||||
grid.n_y = r.n_y
|
grid.n_y = r.n_y
|
||||||
grid.file_prefix = f"{old_prefix}_{grid.omega_deg}deg"
|
grid.file_prefix = f"{old_prefix}_{grid.omega_deg}deg"
|
||||||
|
grid.omega_deg = geom.omega_deg
|
||||||
res1 = self.__raster(grid)
|
res1 = self.__raster(grid)
|
||||||
|
|
||||||
grid.omega_deg += 90
|
grid.omega_deg += 90
|
||||||
self.__devs.aerotech.move(grid.omega_deg, wait=True)
|
self.__devs.aerotech.move(grid.omega_deg, wait=True)
|
||||||
|
|
||||||
grid.n_x = 7
|
grid.n_x = 20
|
||||||
grid.n_y = 20
|
grid.n_y = 40
|
||||||
grid.file_prefix = f"{old_prefix}_{grid.omega_deg}deg"
|
grid.file_prefix = f"{old_prefix}_{grid.omega_deg}deg"
|
||||||
offset = Coordinate(x=-grid.n_x * grid.grid_size_mm.x / 2.0, y=-grid.n_y * grid.grid_size_mm.y / 2.0)
|
offset = Coordinate(x=-grid.n_x * grid.grid_size_mm.x / 2.0, y=-grid.n_y * grid.grid_size_mm.y / 2.0)
|
||||||
geom = self.sample_geometry
|
geom = self.sample_geometry
|
||||||
|
|||||||
Reference in new issue
Block a user