From 1cbbc893b268b8cbc49de6d6cd8f81c0752c714e Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 30 Sep 2011 14:36:22 -0400 Subject: [PATCH] Fix problems with the transition to the new nested-Config h5config package. Also restore BumpConfig's `initial-position` setting, since it's critical to running a bump. I removed it when I mistakenly thought it was storeing the output voltage used as the initial position (something that you'd measure during a bump). I guess I should have read the help string before I deleted it ;). There are also a number of numpy array -> float conversions when loading HDF5. This avoids excessive numpy-fication with h5py v2.0. --- calibcant/config.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/calibcant/config.py b/calibcant/config.py index cffb58f..c80e791 100644 --- a/calibcant/config.py +++ b/calibcant/config.py @@ -77,6 +77,12 @@ 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 ' @@ -110,9 +116,6 @@ class BumpConfig (_config.Config): ]), ] -class BumpResult (_config.Config): - "The result of a `calibcant` bump operation" - class _VibrationModel (object): pass -- 2.26.2