projects
/
pyafm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d5b21e3
)
Finish target_deflection -> deflection conversion started a few commits ago.
author
W. Trevor King
<wking@drexel.edu>
Mon, 23 Jan 2012 21:05:45 +0000
(16:05 -0500)
committer
W. Trevor King
<wking@drexel.edu>
Mon, 23 Jan 2012 21:06:17 +0000
(16:06 -0500)
Original commit was
e5d2a98f662eafacbb26598884f44ba4d3dc341f
pyafm/afm.py
patch
|
blob
|
history
diff --git
a/pyafm/afm.py
b/pyafm/afm.py
index 69d22c93e73bbb0b91901b61ebc0d97eadc625d2..3bceed5868671da19c0769eb9275e14306506bd0 100644
(file)
--- a/
pyafm/afm.py
+++ b/
pyafm/afm.py
@@
-153,15
+153,15
@@
class AFM (object):
def _check_target_deflection(self, deflection):
defc = self.piezo._deflection_channel()
max_def = defc.get_maxdata()
def _check_target_deflection(self, deflection):
defc = self.piezo._deflection_channel()
max_def = defc.get_maxdata()
- if
target_
deflection > max_def:
+ if deflection > max_def:
_LOG.error(('requested setpoint ({:g} V = {:d} bits) is larger '
'than the maximum deflection value of {:d} bits'
_LOG.error(('requested setpoint ({:g} V = {:d} bits) is larger '
'than the maximum deflection value of {:d} bits'
- ).format(setpoint,
target_
deflection, max_def))
+ ).format(setpoint, deflection, max_def))
raise ValueError(setpoint)
raise ValueError(setpoint)
- elif
target_
deflection < 0:
+ elif deflection < 0:
_LOG.error(('requested setpoint ({:g} V = {:d} bits) is less '
'than the minimum deflection value of 0 bits'
_LOG.error(('requested setpoint ({:g} V = {:d} bits) is less '
'than the minimum deflection value of 0 bits'
- ).format(setpoint,
target_
deflection))
+ ).format(setpoint, deflection))
raise ValueError(setpoint)
def _stepper_approach_again(self, target_deflection, min_slope_ratio, far):
raise ValueError(setpoint)
def _stepper_approach_again(self, target_deflection, min_slope_ratio, far):