Skip to content
Snippets Groups Projects
Commit 6d151691 authored by jmcchesn's avatar jmcchesn
Browse files

Merge branch 'testing' into 'main'

Testing

See merge request 29id/IEXcode!6
parents 4eac53c4 19558671
No related branches found
No related tags found
1 merge request!6Testing
......@@ -136,3 +136,4 @@ dmypy.json
# Cython debug symbols
cython_debug/
.loglogin
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
......
......@@ -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])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment