From 009bf50c35a88e7393378c6ccb853c74edff8746 Mon Sep 17 00:00:00 2001 From: Francesco De Carlo Date: Wed, 4 Feb 2026 16:43:30 -0600 Subject: [PATCH] Reorder move_sample_out to move Y before X (when axis is Both) to avoid mechanical interference (e.g., furnace clearance). --- tomoscan/tomoscan.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tomoscan/tomoscan.py b/tomoscan/tomoscan.py index be95d05a..5c3d458c 100644 --- a/tomoscan/tomoscan.py +++ b/tomoscan/tomoscan.py @@ -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')