rebasing

build/lib/iexcode/instruments/Motors.py

@@ -30,7 +30,7 @@ class Motors:
         """   
 
         try:
-            rbv = caget(self._motor_dictionary(name)[0])
+            rbv = caget(self._motor_dictionary[name][0])
             if verbose:
                 print('current position: '+name+" = "+str(rbv))
             return rbv
@@ -41,7 +41,7 @@ class Motors:
         """
         Reset motor if stuck in 'moving'
         """
-        pv=self._motor_dictionary(name)[2]
+        pv=self._motor_dictionary[name][2]
         caput(pv,'Stop')
         time.sleep(1)
         caput(pv,'Go')
@@ -112,7 +112,7 @@ class Motors:
         prints current position of the physical motors
         """
         position_list = []
-        for motor in self.physical_motors():
+        for motor in self.physical_motors:
             position_list.append(self.get(motor,verbose=False))
         return position_list
 
@@ -129,8 +129,11 @@ class Motors:
             sample_name = position_list[0]
             position_list = position_list[1:]
 
-        motor_list = self.physical_motors()
-        for motor,i in enumerate(motor_list):
+        motor_list = self.physical_motors
+        #debug
+        print('motor_list=',motor_list)
+        print('position_list=',position_list)
+        for i,motor in enumerate(motor_list):
             self.move(motor,position_list[i])
 
         if verbose:

build/lib/iexcode/instruments/encoders.py

@@ -7,9 +7,9 @@ def encoder_dictionary_entry(name):
 
     """
     d={
-        'slit2B':("29idMini1:",[13,14,15,16]),
-        'slit3D':("29idMini2:",[26,27]),
-        'ARPES':("ARPES:",[1,2,3,4]),
+        'slit2B':("29idMini1:","29idb:",[13,14,15,16]),
+        'slit3D':("29idMini2:","29idb:",[26,27]),
+        'ARPES':("29idARPES:","29idARPES:",[1,2,3,4]),
     }
     return d[name]
 
@@ -19,7 +19,7 @@ def encoder_sync(name):
     """
     encoder_ioc, motor_ioc, encoder_list = encoder_dictionary_entry(name)
     for encoder_num in encoder_list:
-        pv = motor_ioc+":m"+str(encoder_num)+".SYNC"
+        pv = motor_ioc+"m"+str(encoder_num)+".SYNC"
         caput(pv,1)
 
 def encoders_reset(name,Hcenter,Vcenter):

iexcode.egg-info/requires.txt

@@ -3,3 +3,4 @@ numpy
 scipy
 h5py
 netCDF4
+pyepics

iexcode/instruments/Motors.py

@@ -130,7 +130,10 @@ class Motors:
             position_list = position_list[1:]
 
         motor_list = self.physical_motors
-        for motor,i in enumerate(motor_list):
+        #debug
+        print('motor_list=',motor_list)
+        print('position_list=',position_list)
+        for i,motor in enumerate(motor_list):
             self.move(motor,position_list[i])
 
         if verbose:

iexcode/instruments/encoders.py

@@ -7,9 +7,9 @@ def encoder_dictionary_entry(name):
 
     """
     d={
-        'slit2B':("29idMini1:",[13,14,15,16]),
-        'slit3D':("29idMini2:",[26,27]),
-        'ARPES':("ARPES:",[1,2,3,4]),
+        'slit2B':("29idMini1:","29idb:",[13,14,15,16]),
+        'slit3D':("29idMini2:","29idb:",[26,27]),
+        'ARPES':("29idARPES:","29idARPES:",[1,2,3,4]),
     }
     return d[name]
 
@@ -19,7 +19,7 @@ def encoder_sync(name):
     """
     encoder_ioc, motor_ioc, encoder_list = encoder_dictionary_entry(name)
     for encoder_num in encoder_list:
-        pv = motor_ioc+":m"+str(encoder_num)+".SYNC"
+        pv = motor_ioc+"m"+str(encoder_num)+".SYNC"
         caput(pv,1)
 
 def encoders_reset(name,Hcenter,Vcenter):