From b05f7f09ce832443b758817ac0299a68ca524eca 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 ++--- calibcant/config.py | 2 +- 2 files changed, 3 insertions(+), 4 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 diff --git a/calibcant/config.py b/calibcant/config.py index 4dbd1a2..c6648dc 100644 --- a/calibcant/config.py +++ b/calibcant/config.py @@ -32,7 +32,7 @@ LOG_DIR = '$DEFAULT$/calibrate_cantilever' GNUFIT_DATA_BASE='./calibrate_cantilever_fitdata' TEXT_VERBOSE = True # for debugging GNUPLOT_VERBOSE = True # turn on fit check plotting -PYLAB_VERBOSE = False # turn on plotting +PYLAB_VERBOSE = True # turn on plotting PYLAB_INTERACTIVE = True # select between draw() and show() for flushing plots BASE_FIGNUM = 20 # to avoid writing to already existing figures -- 2.26.2