Fix problems with the transition to the new nested-Config h5config package.

[calibcant.git] / calibcant / config.py

diff --git a/calibcant/config.py b/calibcant/config.py
index 0a20c8f4fd131f43ec95b699bc6bacea4424919b..c80e791c1cfe3307a66b67a703bbf39ffc9e518e 100644 (file)
--- a/calibcant/config.py
+++ b/calibcant/config.py
@@ -116,6 +116,7 @@ class BumpConfig (_config.Config):
                 ]),
         ]
 
+
 class _VibrationModel (object):
     pass
 class Variance (_VibrationModel):
@@ -174,14 +175,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.',