calib_save_analysis() now uses string_errors() to format output.

[calibcant.git] / calibcant / analyze.py

diff --git a/calibcant/analyze.py b/calibcant/analyze.py
index 2e535efac835df4974fcdcee406cfd4a7c414e1f..d41dced7170c7b413f928a5ba110001f34660a27 100755 (executable)
--- a/calibcant/analyze.py
+++ b/calibcant/analyze.py
@@ -49,6 +49,8 @@ Which are related by the parameters :
 import numpy
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
+import data_logger
+
 import common # common module for the calibcant package
 import config # config module for the calibcant package
 import T_analyze # T_analyze module for the calibcant package
@@ -161,28 +163,24 @@ def calib_save_analysis(k, k_s,
     if log_dir != None :
         log = data_logger.data_log(log_dir, noclobber_logsubdir=False,
                                    log_name="calib_analysis_text")
-        log.write_binary((
-            "k (N/m) : %g +/- %g\n" % (k, k_s)
-            + "photoSensitivity**2 (V/nm)**2 : %g +/- %g\n" % \
-                (photoSensitivity2_m, photoSensitivity2_s)
-            + "T (K) : %g +/- %g\n" % (T_m, T_s)
-            + "1/Vp**2 (1/V)**2 : %g +/- %g\n" % \
-                (one_o_Vphoto2_m, one_o_Vphoto2_s)
-                         ))
+        log.write_binary(string_errors(k, k_s,
+                                       photoSensitivity2_m, photoSensitivity2_s,
+                                       T_m, T_s,
+                                       one_o_Vphoto2_m, one_o_Vphoto_2_s))
 
 @splittableKwargsFunction()
 def calib_plot(bumps, Ts, vibs, plotVerbose=False) :
     if plotVerbose or config.PYLAB_VERBOSE :
-        common.import_pylab()
+        common._import_pylab()
         common._pylab.figure(config.BASE_FIGNUM+4)
         common._pylab.subplot(311)
-        common._pylab.plot(bumps, 'g.')
+        common._pylab.plot(bumps, 'g.-')
         common._pylab.title('Photodiode sensitivity (V/nm)')
         common._pylab.subplot(312)
-        common._pylab.plot(Ts, 'r.')
+        common._pylab.plot(Ts, 'r.-')
         common._pylab.title('Temperature (K)')
         common._pylab.subplot(313)
-        common._pylab.plot(vibs, 'b.')
+        common._pylab.plot(vibs, 'b.-')
         common._pylab.title('Thermal deflection variance (Volts**2)')
         common._flush_plot()