From: W. Trevor King <wking@drexel.edu>
Date: Thu, 20 Nov 2008 01:27:58 +0000 (-0500)
Subject: Fixed non-interactive pylab plotting setup in common.py
X-Git-Tag: v0.4~30^2~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2ce788fd0c3ce85155baa79c9e1ca8732b9f495;p=pyafm.git

Fixed non-interactive pylab plotting setup in common.py

Also fixed spacing in analyze.py from last change and removed some
.pyc files from versioning.
---

diff --git a/calibcant/config.py b/calibcant/config.py
index 2374ba6..14af67b 100644
--- a/calibcant/config.py
+++ b/calibcant/config.py
@@ -1,7 +1,7 @@
 """Define some variables to configure the package for a particular lab
 and workflow."""
 
-import z_piezo_utils
+import z_piezo
 
 DEFAULT_TEMP = 22  # assume 22 deg C
 LOG_DATA = True  # quietly grab all real-world data and log to LOG_DIR
@@ -14,12 +14,12 @@ PYLAB_INTERACTIVE = True # select between draw() and show() for flushing plots
 BASE_FIGNUM = 20 # to avoid writing to already existing figures
 
 # zpGain      zpiezo applied voltage per output Volt
-zpGain = z_piezo_utils._usual_zpGain
+zpGain = z_piezo.DEFAULT_GAIN
 # zpSensitivity  nm zpiezo response per applied Volt
-zpSensitivity = z_piezo_utils._usual_zpSensitivity
+zpSensitivity = z_piezo.DEFAULT_SENSITIVITY
 # Vzp_out2V   function that converts output DAC bits to Volts
-Vzp_out2V = z_piezo_utils._usual_Vzp_out2V
+Vzp_out2V = z_piezo.DEFAULT_VZP_OUT_2_VOLTS
 # Vphoto_in2V function that converts input ADC bits to Volts
-Vphoto_in2V = z_piezo_utils._usual_Vphoto_in2V
+Vphoto_in2V = z_piezo.DEFAULT_VPHOTO_IN_2_VOLTS
 # zeroVphoto_bits  ADC bit output for a 0V input
-zeroVphoto_bits = z_piezo_utils._usual_zeroVphoto_bits
+zeroVphoto_bits = z_piezo.DEFAULT_ZERO_PHOTODIODE_BITS
diff --git a/calibcant/config.pyc b/calibcant/config.pyc
deleted file mode 100644
index f8711bb..0000000
Binary files a/calibcant/config.pyc and /dev/null differ