diff --git a/iexcode/instruments/encoders.py b/iexcode/instruments/encoders.py index a2dfcd58e8686c69e3a862cb5ceee96968efa6e8..308ea53b1ddb7596f5d29ded6f7e916f10494f12 100644 --- a/iexcode/instruments/encoders.py +++ b/iexcode/instruments/encoders.py @@ -27,14 +27,13 @@ def encoder_sync(name): pv = motor_ioc+"m"+str(encoder_num)+".SYNC" 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. Previously: Reset_Slit2B_Encoders """ - name='slit2B' encoder_sync(name) encoder_ioc, motor_ioc, encoder_list = _encoder_dictionary()[name] diff --git a/iexcode/instruments/slits.py b/iexcode/instruments/slits.py index a0be522699c34769932496f6dfb5db1e394b39c1..fa7102f8b7c234878f1126eb296ecdd5fccd23c6 100644 --- a/iexcode/instruments/slits.py +++ b/iexcode/instruments/slits.py @@ -294,8 +294,10 @@ def slit2B_encoders_reset(Hcenter,Vcenter): Previously: Reset_Slit2B_Encoders """ - encoders_reset_zero('slit2B',Hcenter,Vcenter) - slits_synch('slit2B') + slit_name = '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): @@ -354,15 +356,18 @@ def slit3D_get(verbose=True): 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). Slit size need to be set to 0. 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): """