debugging slits

build/lib/iexcode/instruments/slits.py

@@ -21,14 +21,14 @@ def _slits_dictionary():
     d = {
         'slit1A' : ('Slit1H','Slit1V'),
         'slit2B' : ('Slit2H','Slit2V'),
-        'slit3C' : None,
+        'slit3C' : ('Slit3C')
         'slit3D' : ('Slit4V')
         
         }
     return d
 
 def slit_name_list():
-    d=_slits_dictionary()
+    d=_slits_dictionary
     for key in d.keys():
         print(key)
 
@@ -46,20 +46,20 @@ def _slits_wide_open_dictionary():
         }
     return d
 
-def slits_pvs(slit_name):
+def slits_pvs(slit_name_HV):
     """
     returns the rbv and drive for the size,center
     (rbv_size,val_size),(rvb_center,val_center)
     """
     d = _slits_dictionary()
     if slit_name in d.keys():
-        if slit_name == 'slit3C':
+        if slit_name == 'Slit3C':
             size_rbv = '29idb:Slit3CRBV'
             size_val = '29idb:Slit3CFit.A'
             center_rbv = None
             center_val = None   
         else:
-            slit_pv = slit_ioc + slit_name
+            slit_pv = slit_ioc + slit_name_HV
             size_rbv = slit_pv +'t2.D'
             size_val = slit_pv +'center.VAL'
             center_rbv = slit_pv +'t2.C'

iexcode/instruments/slits.py

@@ -21,7 +21,7 @@ def _slits_dictionary():
     d = {
         'slit1A' : ('Slit1H','Slit1V'),
         'slit2B' : ('Slit2H','Slit2V'),
-        'slit3C' : None,
+        'slit3C' : ('Slit3C')
         'slit3D' : ('Slit4V')
         
         }
@@ -46,20 +46,20 @@ def _slits_wide_open_dictionary():
         }
     return d
 
-def slits_pvs(slit_name):
+def slits_pvs(slit_name_HV):
     """
     returns the rbv and drive for the size,center
     (rbv_size,val_size),(rvb_center,val_center)
     """
     d = _slits_dictionary()
     if slit_name in d.keys():
-        if slit_name == 'slit3C':
+        if slit_name == 'Slit3C':
             size_rbv = '29idb:Slit3CRBV'
             size_val = '29idb:Slit3CFit.A'
             center_rbv = None
             center_val = None   
         else:
-            slit_pv = slit_ioc + slit_name
+            slit_pv = slit_ioc + slit_name_HV
             size_rbv = slit_pv +'t2.D'
             size_val = slit_pv +'center.VAL'
             center_rbv = slit_pv +'t2.C'