Updated to new data_logger log_dir $DEFAULT$ syntax for easier log_dir defs.

[calibcant.git] / calibcant / config.py

diff --git a/calibcant/config.py b/calibcant/config.py
index 2374ba659a55a0de8ceff707c2b5d9994f50086f..f86618ef318e66c2d581859b2fde8f020656ffd8 100644 (file)
--- a/calibcant/config.py
+++ b/calibcant/config.py
@@ -1,11 +1,11 @@
 """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
-LOG_DIR = '/home/wking/rsrch/data/calibrate_cantilever'
+LOG_DIR = '$DEFAULT$/calibrate_cantilever'
 GNUFIT_DATA_BASE='./calibrate_cantilever_fitdata'
 TEXT_VERBOSE = True      # for debugging
 GNUPLOT_VERBOSE = True     # turn on fit check plotting
@@ -13,13 +13,19 @@ 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_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