projects
/
calibcant.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f1cb18a
)
Ts -> temperatures in calib_save() keyword call from calibrate.calib().
author
W. Trevor King
<wking@drexel.edu>
Fri, 17 Jun 2011 18:38:54 +0000
(14:38 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Fri, 17 Jun 2011 18:38:54 +0000
(14:38 -0400)
calibcant/calibrate.py
patch
|
blob
|
history
diff --git
a/calibcant/calibrate.py
b/calibcant/calibrate.py
index e8b7293c7760c9759916fea38f005b43f0cf5808..71382a06986f56e766d75136afe4a8c4dfdd0758 100644
(file)
--- a/
calibcant/calibrate.py
+++ b/
calibcant/calibrate.py
@@
-289,6
+289,6
@@
def calib(afm, calibration_config, bump_config, temperature_config,
vibration_config, filename=filename, group=group)
# TODO: convert vib units?
k,k_s = _calib_analyze(bumps, Ts, vibs)
- _calib_save(filename, group=group+'calibration/', bumps=bumps,
T
s=Ts,
+ _calib_save(filename, group=group+'calibration/', bumps=bumps,
temperature
s=Ts,
vibs=vibs, calibration_config=calibration_config, k=k, k_s=k_s)
return (k, k_s)