Added calibration file support to the JPK driver.

[hooke.git] / hooke / driver / picoforce.py

diff --git a/hooke/driver/picoforce.py b/hooke/driver/picoforce.py
index a465c2ef5ad1c359532e435f9fb6a2ff83aca80d..295480404e545c41f464c6d01180b06e8d94df4c 100644 (file)
--- a/hooke/driver/picoforce.py
+++ b/hooke/driver/picoforce.py
@@ -48,7 +48,7 @@ class PicoForceDriver (Driver):
 
         return header[2:17] == 'Force file list'
 
-    def read(self, path):
+    def read(self, path, info=None):
         info = self._read_header_path(path)
         self._check_version(info)
         data = self._read_data_path(path, info)
@@ -292,12 +292,13 @@ class PicoForceDriver (Driver):
         #    raise NotImplementedError(
         #        'Missmatched duplicate traces for %s: %s'
         #        % (trace_name, ', '.join(msg)))
-        import sys
+        import logging
+        log = logging.getLogger('hooke')
         for name,t in traces.items():
             if (t == trace).all():
-                print >> sys.stderr, 'replace %s with %s-2' % (name, trace_name)
+                log.debug('replace %s with %s-2' % (name, trace_name))
                 return name  # Replace this identical dataset.
-        print >> sys.stderr, 'store %s-2 as Other' % (trace_name)
+        log.debug('store %s-2 as Other' % (trace_name))
         return 'Other'
         # return None