calibrate.py should now work.

A bunch of changes in one commit, sorry.

Moved to fledgling splittable_kwargs system to make default argument
maintenance easier.  I expect the splittable_kwargs system still has
some growing to do, but it's already better than the old system.

Merged BE database from the calibcant subdir into the main BE database.
It was a mistake to create the database there in the first place.

diff --git a/calibcant/config.py b/calibcant/config.py
index 14af67b5fa340b188b06e32fc4c683e90ca66047..8c0369683b639c63173328645f7b1ab83101a9b3 100644 (file)
--- a/calibcant/config.py
+++ b/calibcant/config.py
@@ -13,6 +13,12 @@ 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
 
+
+# HACK
+# make sure you make a system note (add_system_note) if you change
+# these in case you don't have access to a z_piezo for conversion
+# functions
+
 # zpGain      zpiezo applied voltage per output Volt
 zpGain = z_piezo.DEFAULT_GAIN
 # zpSensitivity  nm zpiezo response per applied Volt