From 1a6a7f3f1597c6f4f70579c8b27d0634e3d56098 Mon Sep 17 00:00:00 2001 From: Keara Soloway Date: Fri, 23 Feb 2024 08:24:01 -0500 Subject: [PATCH] fix: wrong method name used if relative=True in ScanParser.get_spec_scan_motor_vals --- CHAP/utils/scanparsers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHAP/utils/scanparsers.py b/CHAP/utils/scanparsers.py index 38333ff..1ccefe5 100755 --- a/CHAP/utils/scanparsers.py +++ b/CHAP/utils/scanparsers.py @@ -598,9 +598,9 @@ def get_spec_scan_motor_vals(self, relative=False): fast_mot_vals = np.linspace(m1_start, m1_end, m1_npt) slow_mot_vals = np.linspace(m2_start, m2_end, m2_npt) if relative: - fast_mot_vals += self.get_positioner_value( + fast_mot_vals += self.get_spec_positioner_value( self.spec_scan_motor_mnes[0]) - slow_mot_vals += self.get_positioner_value( + slow_mot_vals += self.get_spec_positioner_value( self.spec_scan_motor_mnes[1]) return (fast_mot_vals, slow_mot_vals) if self.spec_macro in ('flyscan', 'ascan', 'flydscan', 'dscan'): @@ -608,7 +608,7 @@ def get_spec_scan_motor_vals(self, relative=False): float(self.spec_args[2]), int(self.spec_args[3])+1) if relative: - mot_vals += self.get_positioner_value( + mot_vals += self.get_spec_positioner_value( self.spec_scan_motor_mnes[0]) return (mot_vals,) if self.spec_macro in ('tseries', 'loopscan'): @@ -807,7 +807,7 @@ def get_spec_scan_motor_vals(self, relative=False): float(self.spec_args[2]), int(self.spec_args[3])+1) if relative: - mot_vals += self.get_positioner_value( + mot_vals += self.get_spec_positioner_value( self.spec_scan_motor_mnes[0]) return (mot_vals,) if self.spec_macro in ('tseries', 'loopscan'):