--- a/pygpibtoolkit/HP3562A/coord_decoder.py	Sun Feb 17 22:59:59 2008 +0100
+++ b/pygpibtoolkit/HP3562A/coord_decoder.py	Mon Feb 25 18:38:27 2008 +0100
@@ -9,7 +9,8 @@
 This file can be exectued as a python script. Use '-h' for more informations. 
 """
 
-from pygpibtoolkit.HP3562A import format_header, decode_float, decode_string, decode_header, read_trace
+from pygpibtoolkit.gpi_utils import format_datablock_header, decode_datablock_header, read_datablock_trace
+from pygpibtoolkit.gpi_utils import decode_float, decode_string
 from pygpibtoolkit.HP3562A.trace_decoder import decode_trace, HEADER as TRACE_HEADER
 from pygpibtoolkit.HP3562A.enum_types import *
 
@@ -50,9 +51,9 @@
 
     header is the dictionnary of the header of the dumped data block,
     """
-    header, idx = decode_header(data, HEADER)
-    trace_header, idx = decode_header(data, TRACE_HEADER, idx)
-    trace = read_trace(data, idx, trace_header["Number of elements"])
+    header, idx = decode_datablock_header(data, HEADER)
+    trace_header, idx = decode_datablock_header(data, TRACE_HEADER, idx)
+    trace = read_datablock_trace(data, idx, trace_header["Number of elements"])
     return header, trace_header, trace