diff --git a/.gitignore b/.gitignore index a81c8ee121952cf06bfaf9ff9988edd8cded763c..6deb3d00b505810dbfb85d5c70264d174f341feb 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,4 @@ dmypy.json # Cython debug symbols cython_debug/ +.loglogin diff --git a/iexcode.egg-info/SOURCES.txt b/iexcode.egg-info/SOURCES.txt index ace7681e8e11ac0f52282495fdc477fe006f8091..19227124f1efc05c6bcdcc689e972adce5989605 100644 --- a/iexcode.egg-info/SOURCES.txt +++ b/iexcode.egg-info/SOURCES.txt @@ -1,9 +1,10 @@ README.md setup.py iexcode/__init__.py -iexcode/init_Kapp.py -iexcode/init_staff.py -iexcode/init_xrays.py +iexcode/launch_ARPES.py +iexcode/launch_Kappa.py +iexcode/launch_staff.py +iexcode/launch_xrays.py iexcode.egg-info/PKG-INFO iexcode.egg-info/SOURCES.txt iexcode.egg-info/dependency_links.txt @@ -18,7 +19,6 @@ iexcode/instruments/Kappa.py iexcode/instruments/Kappa_Euler.py iexcode/instruments/Kappa_det.py iexcode/instruments/Lakeshore_335.py -iexcode/instruments/MPA.py iexcode/instruments/Motors.py iexcode/instruments/Scienta.py iexcode/instruments/VLS_PGM.py diff --git a/iexcode/instruments/Motors.py b/iexcode/instruments/Motors.py index 6770439acda5735bace2ea84c251e103f66542bc..c9ddd937ea5fe70b15b11637286ad72a7eafb4a9 100644 --- a/iexcode/instruments/Motors.py +++ b/iexcode/instruments/Motors.py @@ -112,7 +112,7 @@ class Motors: prints current position of the physical motors """ position_list = [] - for motor in self.physical_motors.keys(): + for motor in self.physical_motors: position_list.append(self.get(motor,verbose=False)) return position_list @@ -129,7 +129,7 @@ class Motors: sample_name = position_list[0] position_list = position_list[1:] - motor_list = self.physical_motors() + motor_list = self.physical_motors for motor,i in enumerate(motor_list): self.move(motor,position_list[i])