Added optional ability to use naive vibration variance calculation.

[calibcant.git] / calibcant / analyze.py

diff --git a/calibcant/analyze.py b/calibcant/analyze.py
index a46eddb6a202a2c276346a7a0db77070677305cd..c4850095366319d370845b157cc1c35fe8e47e0a 100755 (executable)
--- a/calibcant/analyze.py
+++ b/calibcant/analyze.py
@@ -163,14 +163,11 @@ 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_Vphoto2_s)
+                         +'\n')
 
 @splittableKwargsFunction()
 def calib_plot(bumps, Ts, vibs, plotVerbose=False) :
@@ -272,19 +269,24 @@ if __name__ == '__main__' :
 
     options,args = parser.parse_args()
     parser.destroy()
-
+    
+    config.TEXT_VERBOSE = options.verbose
+    config.PYLAB_INTERACTIVE = False
+    config.PYLAB_VERBOSE = options.plot
+    
     bumps = get_array(options.bump_string, options.bump_file, "bump")
     temps = get_array(options.temp_string, options.temp_file, "temp")
     vibs = get_array(options.vib_string, options.vib_file, "vib")
 
-    if options.plot :
-        calib_plot(bumps, temps, vibs)
+    #if options.plot :
+    #    calib_plot(bumps, temps, vibs)
 
     if options.celsius :
         for i in range(len(temps)) :
             temps[i] = T_analyze.C_to_K(temps[i])
 
-    km,ks,ps2m,ps2s,Tm,Ts,ooVp2m,ooVp2s = calib_analyze(bumps, temps, vibs)
+    km,ks,ps2m,ps2s,Tm,Ts,ooVp2m,ooVp2s = \
+        calib_analyze(bumps, temps, vibs, plotVerbose=options.plot)
 
     if options.verbose :
         print >> sys.stderr, \