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).

diff --git a/calibcant/calibrate.py b/calibcant/calibrate.py
index 269dafa18cbe50420a03e42871cc89b0964ed5da..379c2b7220489e96f04624a9090120e09b8dfc7d 100755 (executable)
--- 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'),
 # 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,
                           (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):
     """
                  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) :
     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
                         Vphoto_in2V=Vphoto_in2V, **bump_kwargs)
     if config.TEXT_VERBOSE :
         print bumps

diff --git a/calibcant/config.py b/calibcant/config.py
index 4dbd1a20b924ff4ca81a63bd2937d0441544cdb7..c6648dc4a09f8606c8be1e6edb6283c3cd1dc547 100644 (file)
--- 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
 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
 
 PYLAB_INTERACTIVE = True # select between draw() and show() for flushing plots
 BASE_FIGNUM = 20 # to avoid writing to already existing figures