Convert to load_from_config() handling

[unfold-protein.git] / unfold_protein / config.py

diff --git a/unfold_protein/config.py b/unfold_protein/config.py
index 66fc91b0a5e5dd36f620df49650e9b3e7f6c469f..d0b137b4a543e389015ac10ae70348319b9fe217 100644 (file)
--- a/unfold_protein/config.py
+++ b/unfold_protein/config.py
@@ -25,6 +25,7 @@ from FFT_tools import window_hann as _window_hann
 import h5config.config as _config
 import h5config.tools as _h5config_tools
 import numpy as _numpy
+import pyafm.config as _pyafm_config
 
 
 class PackageConfig (_h5config_tools.PackageConfig):
@@ -108,6 +109,10 @@ class UnfoldCycleConfig (_config.Config):
             name='save',
             help='Configure saving.',
             config_class=SaveConfig),
+        _config.ConfigSetting(
+            name='afm',
+            help='Configure the AFM used for the unfolding experiments.',
+            config_class=_pyafm_config.AFMConfig),
         ]
 
 class VelocityScanConfig (_config.Config):
@@ -143,7 +148,7 @@ class PositionScanConfig (_config.Config):
         ]
 
 class ScanConfig (_config.Config):
-    "Configure a full `unfold_protein` approach-bind-unfold cycle"
+    "Configure a series of `unfold_protein` unfolding cycles"
     settings = [
         _config.ConfigSetting(
             name='velocity',
@@ -153,4 +158,8 @@ class ScanConfig (_config.Config):
             name='position',
             help='Configure unfolding position scan pattern.',
             config_class=PositionScanConfig),
+        _config.ConfigSetting(
+            name='unfold',
+            help='Configure a single approach-bind-unfold cycle.',
+            config_class=UnfoldCycleConfig),
         ]