Skip to content
Snippets Groups Projects
Commit 0647ee91 authored by 29iduser's avatar 29iduser
Browse files

fixed mono_status for change grating

parent 57c1ea97
No related branches found
No related tags found
1 merge request!11Main merge jmcchesn-main-patch branch with main
......@@ -247,8 +247,9 @@ def mono_scan_pvs():
def mono_status_get():
"""
returns the status of the mirror (GRT * MIR)
1 = ready
2 = moving
1 = positioned/ready
0 = somebody moving
1 > somebody not happy
Previously Mono_Status
......@@ -256,8 +257,8 @@ def mono_status_get():
pvs = _mono_pvs()
mir_P_status = int(caget(pvs['mir_P_status']))
grt_P_status = int(caget(pvs['grt_P_status']))
mir_X_status = int(caget(pvs['mir_P_status']))
grt_X_status = int(caget(pvs['grt_P_status']))
mir_X_status = int(caget(pvs['mir_X_status']))
grt_X_status = int(caget(pvs['grt_X_status']))
mirror_status = mir_P_status * mir_X_status
grating_status = grt_P_status * grt_X_status
return mirror_status*grating_status
......@@ -317,7 +318,7 @@ def _mono_optic_change(optic,name, verbose=True):
caput(type_move,1,wait=True,timeout=18000)
while True:
if mono_status_get() > 1:
if mono_status_get() != 1:
time.sleep(5)
else:
break
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment