From f2d716b6c2c65475626296e730ab204e6e8252a9 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 28 Jan 2009 08:43:54 -0500 Subject: [PATCH] Removed old references to freq in calibrate.py after freq->push_speed change. Also turned plotting back on by default (the change doesn't affect command line usage). --- calibcant/calibrate.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/calibcant/calibrate.py b/calibcant/calibrate.py index 269dafa..379c2b7 100755 --- a/calibcant/calibrate.py +++ b/calibcant/calibrate.py @@ -334,13 +334,12 @@ def move_far_from_surface(stepper, um_back=50) : # and finally, the calib family @splittableKwargsFunction((move_just_onto_surface, 'stepper', 'zpiezo'), - (bump, 'zpiezo', 'freq', 'log_dir', 'Vphoto_in2V'), + (bump, 'zpiezo', 'log_dir', 'Vphoto_in2V'), (move_far_from_surface, 'stepper'), (T, 'log_dir'), (vib, 'zpiezo', 'log_dir', 'Vphoto_in2V'), (analyze.calib_save, 'bumps','Ts','vibs','log_dir')) def calib_aquire(stepper, zpiezo, num_bumps=10, num_Ts=10, num_vibs=20, - bump_freq=100e3, log_dir=config.LOG_DIR, Vphoto_in2V=config.Vphoto_in2V, **kwargs): """ @@ -367,7 +366,7 @@ def calib_aquire(stepper, zpiezo, num_bumps=10, num_Ts=10, num_vibs=20, move_just_onto_surface(stepper, zpiezo, **move_just_onto_surface_kwargs) bumps = numpy.zeros((num_bumps,), dtype=numpy.float) for i in range(num_bumps) : - bumps[i] = bump(zpiezo=zpiezo, freq=bump_freq, log_dir=log_dir, + bumps[i] = bump(zpiezo=zpiezo, log_dir=log_dir, Vphoto_in2V=Vphoto_in2V, **bump_kwargs) if config.TEXT_VERBOSE : print bumps -- 2.26.2