projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ef5c428
)
Don't join directory in WTKDriver.__find_previous_cantilever_calibration_file().
author
W. Trevor King
<wking@drexel.edu>
Thu, 3 Jun 2010 16:22:38 +0000
(12:22 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Thu, 3 Jun 2010 16:22:38 +0000
(12:22 -0400)
We already did that in ._list_cantilever_calibration_files().
hooke/driver/wtk.py
patch
|
blob
|
history
diff --git
a/hooke/driver/wtk.py
b/hooke/driver/wtk.py
index ec7670d3e896a8e97b43f3051a1a8e31799af531..ca3f2c99f713df3fb2f8a66ff3209b9b3e3fcb00 100644
(file)
--- a/
hooke/driver/wtk.py
+++ b/
hooke/driver/wtk.py
@@
-248,7
+248,7
@@
class WTKDriver (Driver):
if self._calibfile_timestamp(calibfiles[i]) > timestamp:
i -= 1
break
- return
os.path.join(dir, calibfiles[i])
+ return
calibfiles[i]
def _read_cantilever_calibration_file(self, filename):
ret = {'file': filename}