NF adding ecat tests, fix endian typo

Author: cindeem

nibabel/ecat.py

@@ -164,20 +164,17 @@ class EcatHeader(object):
        subheaders specific to each frame 
            with possibly-variable sized data blocks
        
-    This just reads the main Ecat Header, and matrixlist
+    This just reads the main Ecat Header, 
     it does not load the data 
-    or read any sub headers
+    or read the mlist or any sub headers
 
     """
 
     _dtype = hdr_dtype
-    _subhdrdtype = subhdr_dtype
-
-
+    
     def __init__(self, 
                  fileobj=None,
-                 endianness=None,
-                 check=False):
+                 endianness=None):
         """Initialize Ecat header from file object
 
         Parameters
@@ -188,9 +185,7 @@ def __init__(self,
         endianness : {None, '<', '>', other endian code}, optional
             endian code of binary block, If None, guess endianness
             from the data
-        check : bool optional
-            Whether to check content of header in intialization.
-            Default is False """
+        """
         if fileobj is None:
             self._header_data = self._empty_headerdata(endianness)
             return
@@ -274,13 +269,23 @@ def _empty_headerdata(self,endianness=None):
 
     def get_data_dtype(self):
         """ Get numpy dtype for data from header"""
-        pass
+        raise NotImplementedError("dtype is only valid from subheaders")
+        
 
     def copy(self):
         return self.__class__(
             self.binaryblock,
             self.endianness,
             check=False)
+
+    def __eq__(self, other):
+        """ checks for equality between two headers"""
+        self_end = self.endianness
+        self_bb = self.binaryblock
+        if self_end == other.endianness:
+            return self_bb == other.binaryblock
+        other_bb = other._header_data.byteswap().tostring()
+        return self_bb == other_bb
 
     def __ne__(self, other):
         ''' equality between two headers defined by ``header_data``
@@ -294,8 +299,8 @@ def __getitem__(self, item):
 
         Examples
         --------
-        >>> hdr = AnalyzeHeader()
-        >>> hdr['sizeof_hdr'] == 348
+        >>> hdr = EcatHeader()
+        >>> hdr['magic_number'] == 'MATRIX72'
         True
         '''
         return self._header_data[item]
@@ -305,10 +310,10 @@ def __setitem__(self, item, value):
 
         Examples
         --------
-        >>> hdr = AnalyzeHeader()
-        >>> hdr['descrip'] = 'description'
-        >>> str(hdr['descrip'])
-        'description'
+        >>> hdr = EcatHeader()
+        >>> hdr['num_frames'] = 2
+        >>> hdr['num_frames']
+        2
         '''
         self._header_data[item] = value
 
@@ -364,7 +369,7 @@ def get_mlist(self, fileobj):
         done = False
         while not done: #mats['matlist'][0,1] == 2:
 
-            mats = np.recarray(shape=(32,4), dtype=dt.newbyteorder(),  buf=dat)
+            mats = np.recarray(shape=(32,4), dtype=dt,  buf=dat)
             if not (mats['matlist'][0,0] +  mats['matlist'][0,3]) == 31:
                 mlist = []
                 return mlist
@@ -422,7 +427,7 @@ def __init__(self, hdr, mlist, fileobj):
         self.subheaders = self.get_subheaders()
 
     def get_subheaders(self):
-        """retreive all subheaders and return list of subheader dictionaries
+        """retreive all subheaders and return list of subheader recarrays
         """
         subheaders = []
         header = self._header

nibabel/tests/data/tinypet.v

@@ -0,0 +1,66 @@
+# emacs: -*- mode: python-mode; py-indent-offset: 4; indent-tabs-mode: nil -*-
+# vi: set ft=python sts=4 ts=4 sw=4 et:
+### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
+#
+#   See COPYING file distributed along with the NiBabel package for the
+#   copyright and license terms.
+#
+### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
+import os
+from StringIO import StringIO
+import numpy as np
+
+from ..testing import assert_equal, assert_not_equal, \
+    assert_true, assert_false, assert_raises
+
+from numpy.testing import (assert_array_equal,
+                           assert_array_almost_equal)
+
+
+from ..ecat import EcatHeader, EcatMlist, EcatSubHeader, EcatImage
+import test_binary as tb
+from ..testing import parametric, data_path, ParametricTestCase
+
+ecat_file = os.path.join(data_path, 'tinypet.v')
+
+class TestEcatHeader(ParametricTestCase):
+    header_class = EcatHeader
+    example_file = ecat_file
+
+    def test_header_size(self):
+        yield assert_equal(self.header_class._dtype.itemsize, 502)
+
+    def test_empty(self):
+        hdr = self.header_class()
+        yield assert_true(len(hdr.binaryblock) == 502)
+        yield assert_true(hdr['magic_number'] == 'MATRIX72')
+        yield assert_true(hdr['sw_version'] == 74)
+        yield assert_true(hdr['num_frames'] == 0)
+        yield assert_true(hdr['file_type'] == 0)
+        yield assert_true(hdr['ecat_calibration_factor'] == 1.0)
+
+    def test_dtype(self):
+        hdr = self.header_class()
+        yield assert_raises(NotImplementedError,
+                            hdr.get_data_dtype)
+
+    def test_copy(self):
+        hdr = self.header_class()
+        hdr2 = hdr.copy()
+        yield assert_true(hdr == hdr2)
+        yield assert_true(not hdr.binaryblock == hdr2._header_data.byteswap().tostring())
+        yield assert_true(hdr.keys() == hdr2.keys())
+
+    def test_update(self):
+        hdr = self.header_class()
+        yield assert_true(hdr['num_frames'] == 0)
+        hdr['num_frames'] = 2
+        yield assert_true(hdr['num_frames'] == 2)
+    
+    def test_endianness(self):
+        fid = open(ecat_file)
+        hdr = self.header_class()
+        newhdr = hdr.from_fileobj(fid)
+        fid.close()
+        yield assert_true(hdr.endianness == '<')
+        yield assert_true(newhdr.endianness == '>')