From: W. Trevor King Date: Mon, 23 Jan 2012 21:03:22 +0000 (-0500) Subject: Oops, ._deflection_channel is an AFMPiezo method. X-Git-Tag: v0.4~41 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d5b21e3ae7e9d0e09b0be028882cc7c179a7392f;p=pyafm.git Oops, ._deflection_channel is an AFMPiezo method. --- diff --git a/pyafm/afm.py b/pyafm/afm.py index 12543e4..69d22c9 100644 --- a/pyafm/afm.py +++ b/pyafm/afm.py @@ -83,7 +83,7 @@ class AFM (object): stepper_tolerance = 2*self.stepper.step_size axis = self.piezo.axis_by_name(self.axis_name) - defc = self._deflection_channel() + defc = self.piezo._deflection_channel() zero = _convert_volts_to_bits(axis.config['channel'], 0) target_def = _convert_volts_to_bits(defc.config, setpoint) @@ -151,7 +151,7 @@ class AFM (object): % (depth, self.stepper.position, target, target_m)) def _check_target_deflection(self, deflection): - defc = self._deflection_channel() + defc = self.piezo._deflection_channel() max_def = defc.get_maxdata() if target_deflection > max_def: _LOG.error(('requested setpoint ({:g} V = {:d} bits) is larger '