Convert to load_from_config() handling

[unfold-protein.git] / unfold.py

diff --git a/unfold.py b/unfold.py
index 043cb3a202cc11ec485c68ed27262efc31a1fedb..128081eecb64f679d13fc5ed20a9258943de9dcb 100755 (executable)
--- a/unfold.py
+++ b/unfold.py
@@ -24,12 +24,8 @@ import os.path
 
 import numpy as _numpy
 
-from pyafm.storage import load_afm as _load_afm
-from pyafm.config import Kelvin as _Kelvin
 from unfold_protein import __version__
-from unfold_protein.unfolder import Unfolder
-from unfold_protein.scan import UnfoldScanner
-import unfold_protein.config as _config
+import unfold_protein.storage as _storage
 
 
 if __name__ == '__main__':
@@ -48,25 +44,15 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
 
-    unfold_config = _config.UnfoldCycleConfig()
-    unfold_config['approach'] = _config.ApproachConfig()
-    unfold_config['unfold'] = _config.UnfoldConfig()
-    unfold_config['save'] = _config.SaveConfig()
-    scan_config = _config.ScanConfig()
-    scan_config['velocity'] = _config.VelocityScanConfig()
-    scan_config['position'] = _config.PositionScanConfig()
-
     devices = []
     try:
-        afm = _load_afm()
-        afm.load_from_config(devices=devices)
-        afm.piezo.zero()
-        unfolder = Unfolder(config=unfold_config, afm=afm)
-        scanner = UnfoldScanner(config=scan_config, unfolder=unfolder)
+        scanner = _storage.load_scanner()
+        scanner.load_from_config(devices=devices)
+        scanner.unfolder.afm.piezo.zero()
         scanner.run(stepper_tweaks=args.stepper_tweaks)
     finally:
-        afm.move_away_from_surface()
-        afm.piezo.zero()
+        scanner.unfolder.afm.move_away_from_surface()
+        scanner.unfolder.afm.piezo.zero()
         for device in devices:
             device.close()
         if args.song: