Skip to content

Reorder move_sample_out to move Y before X #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
decarlof wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reorder move_sample_out to move Y before X #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tomoscan/tomoscan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,13 +462,14 @@ def move_sample_out(self):

axis = self.epics_pvs['FlatFieldAxis'].get(as_string=True)
log.info('move_sample_out axis: %s', axis)
if axis in ('Y', 'Both'):
position = self.epics_pvs['SampleOutY'].value
self.epics_pvs['SampleY'].put(position, wait=True, timeout=600)

if axis in ('X', 'Both'):
position = self.epics_pvs['SampleOutX'].value
self.epics_pvs['SampleX'].put(position, wait=True, timeout=600)

if axis in ('Y', 'Both'):
position = self.epics_pvs['SampleOutY'].value
self.epics_pvs['SampleY'].put(position, wait=True, timeout=600)

self.epics_pvs['MoveSampleOut'].put('Done')

Expand Down