projects
/
pyafm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f161829
)
Actually load the config from storage in load_afm().
author
W. Trevor King
<wking@drexel.edu>
Fri, 16 Mar 2012 02:38:26 +0000
(22:38 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Fri, 16 Mar 2012 02:38:26 +0000
(22:38 -0400)
pyafm/storage.py
patch
|
blob
|
history
diff --git
a/pyafm/storage.py
b/pyafm/storage.py
index 28a61b5c40eb4e5a5981a141321274a5949f92bc..b764730cc8ec6de4311c64e218752cb12e4a9f0f 100644
(file)
--- a/
pyafm/storage.py
+++ b/
pyafm/storage.py
@@
-32,6
+32,7
@@
def load_afm(filename=None, group=None, devices=None):
assert group.endswith('/'), group
_LOG.info('loading AFM config from {} {}'.format(filename, group))
config = _AFMConfig(storage=_HDF5_Storage(filename=filename, group=group))
+ config.load()
_LOG.debug(
'constructing AFM from configuration:\n{}'.format(config.dump()))
return AFM(config=config, devices=devices)