diff --git a/build/lib/iexcode/instruments/Motors.py b/build/lib/iexcode/instruments/Motors.py index 8b8f7adda9a34b73e43e1d71b4ea68c42002714f..eb66288053995a59f3fcd2e5c67cc3c8f1d66831 100644 --- a/build/lib/iexcode/instruments/Motors.py +++ b/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: diff --git a/build/lib/iexcode/instruments/encoders.py b/build/lib/iexcode/instruments/encoders.py index ef7cb08aceb1e1e7a0ec92ecf5915498cdf357bf..e3eb8c75061323d44edc985e0eeb0df5c3ef1aac 100644 --- a/build/lib/iexcode/instruments/encoders.py +++ b/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): diff --git a/iexcode.egg-info/requires.txt b/iexcode.egg-info/requires.txt index 52556943b71432c57250dc0ac297d318372c7967..d085ec32a16b7618473a4be6496a8ea5cd476dad 100644 --- a/iexcode.egg-info/requires.txt +++ b/iexcode.egg-info/requires.txt @@ -3,3 +3,4 @@ numpy scipy h5py netCDF4 +pyepics diff --git a/iexcode/instruments/Motors.py b/iexcode/instruments/Motors.py index c9ddd937ea5fe70b15b11637286ad72a7eafb4a9..eb66288053995a59f3fcd2e5c67cc3c8f1d66831 100644 --- a/iexcode/instruments/Motors.py +++ b/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: diff --git a/iexcode/instruments/encoders.py b/iexcode/instruments/encoders.py index ef7cb08aceb1e1e7a0ec92ecf5915498cdf357bf..e3eb8c75061323d44edc985e0eeb0df5c3ef1aac 100644 --- a/iexcode/instruments/encoders.py +++ b/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):