Convert calibcant to the new, nestable h5config.

diff --git a/calibcant/config.py b/calibcant/config.py
index 0a20c8f4fd131f43ec95b699bc6bacea4424919b..cffb58f86d369a404d86970ca6e31099ac01889a 100644 (file)
--- a/calibcant/config.py
+++ b/calibcant/config.py
@@ -77,12 +77,6 @@ class Quadratic (_BumpModel):
 class BumpConfig (_config.Config):
     "Configure `calibcant` bump operation"
     settings = [
-        _config.FloatSetting(
-            name='initial-position',
-            help=('Position relative to surface for start of bump in meters.  '
-                  'Should be less than zero to ensure non-contact region '
-                  'before you hit the surface.'),
-            default=-50e-9),
         _config.FloatSetting(
             name='setpoint',
             help=('Maximum deflection in volts in case of stepper positioning '
@@ -116,6 +110,10 @@ class BumpConfig (_config.Config):
                 ]),
         ]
 
+class BumpResult (_config.Config):
+    "The result of a `calibcant` bump operation"
+    
+
 class _VibrationModel (object):
     pass
 class Variance (_VibrationModel):
@@ -174,14 +172,26 @@ class VibrationConfig (_config.Config):
 class CalibrationConfig (_config.Config):
     "Configure a full `calibcant` calibration run"
     settings = [
+        _config.ConfigSetting(
+            name='bump',
+            help='Configure the surface bumps',
+            config_class=BumpConfig),
         _config.IntegerSetting(
             name='num-bumps',
             help='Number of surface bumps.',
             default=10),
+        _config.ConfigSetting(
+            name='temperature',
+            help='Configure the temperature measurements',
+            config_class=TemperatureConfig),
         _config.IntegerSetting(
             name='num-temperatures',
             help='Number of temperature measurements.',
             default=10),
+        _config.ConfigSetting(
+            name='vibration',
+            help='Configure the temperature measurements',
+            config_class=VibrationConfig),
         _config.IntegerSetting(
             name='num-vibrations',
             help='Number of thermal vibration measurements.',