Skip to content
Snippets Groups Projects
Commit 02b82533 authored by jmcchesn's avatar jmcchesn
Browse files

Update iexcode/instruments/slits.py, iexcode/instruments/encoders.py

parent 73cc75d0
No related branches found
No related tags found
No related merge requests found
...@@ -27,14 +27,13 @@ def encoder_sync(name): ...@@ -27,14 +27,13 @@ def encoder_sync(name):
pv = motor_ioc+"m"+str(encoder_num)+".SYNC" pv = motor_ioc+"m"+str(encoder_num)+".SYNC"
caput(pv,1) caput(pv,1)
def encoders_slit2B_reset_zero(): def encoders_reset_zero(name):
""" """
Resetting Slit 2B encoders to 0 for the current. Resetting Slit 2B encoders to 0 for the current position.
Slit size need to be set to 0. Slit size need to be set to 0.
Previously: Reset_Slit2B_Encoders Previously: Reset_Slit2B_Encoders
""" """
name='slit2B'
encoder_sync(name) encoder_sync(name)
encoder_ioc, motor_ioc, encoder_list = _encoder_dictionary()[name] encoder_ioc, motor_ioc, encoder_list = _encoder_dictionary()[name]
......
...@@ -294,8 +294,10 @@ def slit2B_encoders_reset(Hcenter,Vcenter): ...@@ -294,8 +294,10 @@ def slit2B_encoders_reset(Hcenter,Vcenter):
Previously: Reset_Slit2B_Encoders Previously: Reset_Slit2B_Encoders
""" """
encoders_reset_zero('slit2B',Hcenter,Vcenter) slit_name = 'slit2B'
slits_synch('slit2B') slits_set(slit_name,(0,0),(Hcenter,Vcenter), verbose=verbose)
encoders_reset_zero(slit_name)
slits_synch(slit_name)
def slit3C_set(size,verbose=True): def slit3C_set(size,verbose=True):
...@@ -354,15 +356,18 @@ def slit3D_get(verbose=True): ...@@ -354,15 +356,18 @@ def slit3D_get(verbose=True):
return V_size,V_center return V_size,V_center
def slit3D_encoders_reset(Hcenter,Vcenter): def slit3D_encoders_reset(Vcenter):
""" """
Resetting Slit 2B encoders to 0 for a given position (Hcenter,Vcenter). Resetting Slit 2B encoders to 0 for a given position (Hcenter,Vcenter).
Slit size need to be set to 0. Slit size need to be set to 0.
Previously: Reset_Slit2B_Encoders Previously: Reset_Slit2B_Encoders
""" """
encoders_reset_zero('slit3D',Hcenter,Vcenter)
slits_synch('slit3D') slit_name = 'slit3D'
slits_set(slit_name,(0),(Vcenter), verbose=verbose)
encoders_reset_zero(slit_name)
slits_synch(slit_name)
def exit_slit(branch, size, verbose=True): def exit_slit(branch, size, verbose=True):
""" """
......
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