Add min-slope-ratio option to BumpConfig.

[calibcant.git] / calibcant / bump.py

diff --git a/calibcant/bump.py b/calibcant/bump.py
index 90a4b9250459aba8f53d3a89c6c80a3a2ad2bb20..4d0db8439fe8bc01de3d0ee5b878d1c3d2275c7b 100644 (file)
--- a/calibcant/bump.py
+++ b/calibcant/bump.py
@@ -86,11 +86,13 @@ def bump_acquire(afm, bump_config):
     Returns the acquired ramp data dictionary, with data in DAC/ADC bits.
     """
     afm.move_just_onto_surface(
-        depth=bump_config['initial-position'], far=bump_config['far-steps'])
+        depth=bump_config['initial-position'], far=bump_config['far-steps'],
+        setpoint=bump_config['setpoint'],
+        min_slope_ratio=bump_config['min-slope-ratio'])
     #afm.piezo.jump('z', 32000)
 
-    _LOG.info('bump the surface to a depth of %g m'
-              % bump_config['push-depth'])
+    _LOG.info('bump the surface to a depth of %g m with a setpoint of %g V'
+              % (bump_config['push-depth'], bump_config['setpoint']))
 
     axis = afm.piezo.axis_by_name(afm.axis_name)