From 1139d17967014ca0fe79773796dda182b3441f9f Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 23 Jan 2012 16:09:20 -0500 Subject: [PATCH] AFM._check_target_deflection doesn't have access to `setpoint` in volts. --- pyafm/afm.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyafm/afm.py b/pyafm/afm.py index 3bceed5..75df11d 100644 --- a/pyafm/afm.py +++ b/pyafm/afm.py @@ -154,14 +154,14 @@ class AFM (object): defc = self.piezo._deflection_channel() max_def = defc.get_maxdata() if deflection > max_def: - _LOG.error(('requested setpoint ({:g} V = {:d} bits) is larger ' - 'than the maximum deflection value of {:d} bits' - ).format(setpoint, deflection, max_def)) + _LOG.error(('requested setpoint ({:d} bits) is larger than the ' + 'maximum deflection value of {:d} bits' + ).format(deflection, max_def)) raise ValueError(setpoint) elif deflection < 0: - _LOG.error(('requested setpoint ({:g} V = {:d} bits) is less ' - 'than the minimum deflection value of 0 bits' - ).format(setpoint, deflection)) + _LOG.error(('requested setpoint ({:d} bits) is less than the ' + 'minimum deflection value of 0 bits' + ).format(deflection)) raise ValueError(setpoint) def _stepper_approach_again(self, target_deflection, min_slope_ratio, far): -- 2.26.2