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

diff --git a/calibcant/bump.py b/calibcant/bump.py
index 04734852770842c3c094ae180af29e474905c699..9c12a94af2eb6f01a772ddecd85e9f57a9756170 100644 (file)
--- a/calibcant/bump.py
+++ b/calibcant/bump.py
@@ -80,7 +80,7 @@ import linfit
 from calibcant_bump_analyze import bump_analyze
 
 LOG_DATA = True  # quietly grab all real-world data and log to LOG_DIR
 from calibcant_bump_analyze import bump_analyze
 
 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'

 
 TEXT_VERBOSE = True      # for debugging
 
 
 TEXT_VERBOSE = True      # for debugging
 

diff --git a/calibcant/config.py b/calibcant/config.py
index 8c0369683b639c63173328645f7b1ab83101a9b3..f86618ef318e66c2d581859b2fde8f020656ffd8 100644 (file)
--- a/calibcant/config.py
+++ b/calibcant/config.py
@@ -5,7 +5,7 @@ import z_piezo
 
 DEFAULT_TEMP = 22  # assume 22 deg C
 LOG_DATA = True  # quietly grab all real-world data and log to LOG_DIR
 
 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
 GNUFIT_DATA_BASE='./calibrate_cantilever_fitdata'
 TEXT_VERBOSE = True      # for debugging
 GNUPLOT_VERBOSE = True     # turn on fit check plotting