Get calibcant working with the new load_from_config-based pyafm.

[calibcant.git] / bin / calibcant-plot.py

diff --git a/bin/calibcant-plot.py b/bin/calibcant-plot.py
index f8bd58dbcf3409496ba4606e92510febe80c9fb4..ba959f4b41bda4cadfa9c688f408cae55321b00d 100755 (executable)
--- a/bin/calibcant-plot.py
+++ b/bin/calibcant-plot.py
@@ -23,7 +23,8 @@
 from optparse import OptionParser
 
 from matplotlib.pyplot import close, get_fignums, figure, show
-from calibcant.analyze import calib_load_all, calib_plot_all
+from calibcant.calibrate import load_all
+from calibcant.analyze import analyze_all
 
 
 def main(args):
@@ -44,12 +45,13 @@ def main(args):
     options,args = p.parse_args(args)
     filename = args[0]
 
-    stuff = calib_load_all(filename=filename, group=options.group)
+    calibrator,data,raw_data = load_all(filename=filename, group=options.group)
     if not options.bumps:
-        stuff['bump_details'] = []
+        raw_data['bump'] = []
     if not options.vibrations:
-        stuff['vibration_details'] = []
-    calib_plot_all(**stuff)
+        raw_data['vibration'] = []
+    analyze_all(config=calibrator.config, data=data, raw_data=raw_data,
+                plot=True, dry_run=True)
     if options.save:
         for i in get_fignums():
             fig = figure(i)