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

changes by the martin and John

Browse Source
This commit is contained in:
zamofing_t
2024-05-15 15:22:01 +02:00
parent 5e954dec77
commit 153333f336
4 changed files with 151 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
swissmx.py
View File

@@ -2418,6 +2418,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
sp.run() # start motion program
sp.wait_armed() # wait until motors are at first position
shutter.open()
time.sleep(1.1)
jf.acquire(num_pts)
sp.trigger(1.0) # send a start trigger (if needed) after given time
_log.info('start trigger sent')
@@ -2491,7 +2492,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
p_fx, p_fy, p_cx, p_cz,=pos_gonio['pos_'+pos]
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}")
_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}")
tw_fx.move_abs(p_fx)
tw_fy.move_abs(p_fy)