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

diff --git a/z_piezo.py b/z_piezo.py
index 3c2166e614c0aaa1b7329d0a5bd752292c779acd..62ef00d3c09857c5ba11f3e3fb90419141330170 100644 (file)
--- a/z_piezo.py
+++ b/z_piezo.py
@@ -17,7 +17,7 @@ There are a few globals controlling the behavior of the entire module.
     the figure number for z_piezo pylab figures will be this number + {0,1,..}
   LOG_RAMPS (default False)
     save the input and output of any ramps to the LOG_DIR directory
-  LOG_DIR = '/home/wking/rsrch/data/z_piezo'
+  LOG_DIR = '$DEFAULT$/z_piezo'
     where the ramp logs are saved to
   DEFAULT_ZP_CHAN (default 0)
     output channel controlling the z piezo
@@ -32,7 +32,7 @@ TEXT_VERBOSE = False
 PYLAB_INTERACTIVE_VERBOSE = False
 BASE_FIG_NUM = 50
 LOG_RAMPS = False
-LOG_DIR = '/home/wking/rsrch/data/z_piezo'
+LOG_DIR = '$DEFAULT$/z_piezo'
 
 # Hackish defaults for the calibcant.config module
 DEFAULT_GAIN = 20 # Vpiezo / Voutput

diff --git a/z_piezo_utils.py b/z_piezo_utils.py
index 8fa74e3c232b101ec85bee98df4e730ce2ea5045..122098bc2395c5de24972bea5111cb8e0d99a9c3 100644 (file)
--- a/z_piezo_utils.py
+++ b/z_piezo_utils.py
@@ -2,7 +2,7 @@ TEXT_VERBOSE = False
 PYLAB_INTERACTIVE_VERBOSE = False
 BASE_FIG_NUM = 60
 LOG_DATA = True
-LOG_DIR = '/home/wking/rsrch/data/z_piezo_utils'
+LOG_DIR = '$DEFAULT$/z_piezo_utils'
 
 NULL_STEPS_BEFORE_SINGLE_PT_SWEEP = False
 SLEEP_DURING_SURF_POS_AQUISITION = False # doesn't help