DAQ: When moving at the end of raster scan nudge was calculated twice
This commit is contained in:
+2
-5
@@ -954,17 +954,14 @@ class AareDAQ:
|
||||
grid_centre_offset = self.sample_geometry.smargon_nudge(
|
||||
Coordinate(x=x, y=y))
|
||||
|
||||
logger.info(f"new delta mm {grid_centre_offset}")
|
||||
logger.info(f"moving Smargon to grid centre offset {grid_centre_offset}")
|
||||
|
||||
logger.debug(f'moving SMARGON to target new delta mm {request.smargon_top_left.sh_mm+ grid_centre_offset} mm')
|
||||
smargon_nudge_mm = self.sample_geometry.smargon_nudge(grid_centre_offset)
|
||||
grid_centre_smargon = SmargonCoordinate(
|
||||
sh_mm=request.smargon_top_left.sh_mm + smargon_nudge_mm,
|
||||
sh_mm=request.smargon_top_left.sh_mm + grid_centre_offset,
|
||||
phi_deg=request.smargon_top_left.phi_deg,
|
||||
chi_deg=request.smargon_top_left.chi_deg
|
||||
)
|
||||
self.__devs.smargon_pos = grid_centre_smargon
|
||||
# self.__devs.smargon_pos = previous_smargon_pos
|
||||
self.__devs.smargon_wait(timeout=180)
|
||||
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user