sf-mx/SwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
zamofing_t
2023-12-05 12:07:54 +01:00
parent fd3d36396d
commit 9e63ff0718
2 changed files with 69 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
swissmx.py
View File

@@ -2431,11 +2431,10 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
tw_fx = self.tweakers["fast_x"]
tw_fy = self.tweakers["fast_y"]
tw_cx = self.tweakers["base_x"]
tw_cy = self.tweakers["base_y"]
tw_cz = self.tweakers["base_z"]
tw_ry = self.tweakers["omega"]
try:
p_fx, p_fy, p_cx, p_cz,=pos_gonio['pos_'+pos]
p_ry=0.
except KeyError:
raise ValueError("Goniometer position *{}* is not known!!")
_log.info(f"moving goniometer {pos} to fx:{p_fx:.5g},fy:{p_fy:.5g},cx:{p_cx:.5g},cz_{p_cz:.5g},ry:{p_ry:.5g}")
@@ -2444,14 +2443,12 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
tw_fy.move_abs(p_fy)
tw_cx.move_abs(p_cx)
tw_cz.move_abs(p_cz)
tw_ry.move_abs(p_ry)
app_utils.assert_tweaker_positions([
(tw_fx, p_fx, 0.1),
(tw_fy, p_fy, 0.1),
(tw_cx, p_cx, 0.1),
(tw_cz, p_cz, 0.1),
(tw_ry, p_ry, 0.1), ], timeout=20.0,
(tw_cz, p_cz, 0.1), ], timeout=20.0,
)
def move_post_tube(self, pos):