From 02b8253318a19fa568351f036c29097f9050b787 Mon Sep 17 00:00:00 2001
From: jmcchesn <jmcchesn@anl.gov>
Date: Wed, 31 Aug 2022 16:00:06 +0000
Subject: [PATCH] Update iexcode/instruments/slits.py,
iexcode/instruments/encoders.py
---
iexcode/instruments/encoders.py | 5 ++---
iexcode/instruments/slits.py | 15 ++++++++++-----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/iexcode/instruments/encoders.py b/iexcode/instruments/encoders.py
index a2dfcd5..308ea53 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 a0be522..fa7102f 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):
"""
--
GitLab