From a2ce788fd0c3ce85155baa79c9e1ca8732b9f495 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@drexel.edu>
Date: Wed, 19 Nov 2008 20:27:58 -0500
Subject: [PATCH] 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.
---
 calibcant/config.py  |  12 ++++++------
 calibcant/config.pyc | Bin 866 -> 0 bytes
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 calibcant/config.pyc

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 f8711bbc7523b982f8afe9f0d8fec10f83b76032..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 866
zcmZuw-EP`26gDZPh0^tB-7cqGB26OFuB&Qc1cpR`L5eotSSB%Gk;akjfZ%2J5PP$}
zz;<jHu&J@~<(%()Ip;XX`So&H`8j*}8lm0g!1FWQY7G!0gaHdEcF>}LFc>EYJBR@m
zQCvj$6vd|qmn?H;@!VqBVg<z|gf9>)AYMiI(i(3NzOu$O!Z+5qMfj~X?ht-wYK>}V
zriE_+O*Z8zbCq~z?vhGQCka!o7H%ZcDWBz%xq8mrj7AGOWA0Q)mx3oXkMe{{H=&aX
zO=EW@<YJnLRh|EatH<A)0v`dqIi&Vh3!ctAsbn<wVydYZ(S%PV)r>?m)jVNKCe;Vf
z*Ix~hDc9ybeg~48Nv_Qn2#G~Rh`t1SLo&`bg5;1*=_)YIpyfYxLlOp$16>3nlsVJq
zV08O!()2^$Cb3RusIMW=?me|Sp^cG-KMHJ~F!&ylaWHK3fw<bL2HpOFGvx<Ax_)D?
zy4f?GUKkAhFJWgK=nG&?R?_M~p-0;`$yH7hvdP+%r@91+ooRNu4~|%>xaLc)*W1lz
z$BgNGCmnAxB69s{tjj<iyxSv5HWykDo`T49G(Pgpm;GCmNwEt}xK?)Kn}4|)sL=t`
yJ-Em7hH-mvKwh2bmNdinwnwd=t(BS0{j-Skggux)#h!?gQ*}y(|JF&_*{(lV;^p`N

-- 
2.26.2