NF more tests fix issue in endian in tinypet.v

Author: cindeem

nibabel/ecat.py

@@ -229,7 +229,7 @@ def _guess_endian(self, hdr):
             return native_code
 
     @classmethod
-    def from_fileobj(klass, fileobj, endianness=None,check=False):
+    def from_fileobj(klass, fileobj, endianness=None):
         """Return /read header with given or guessed endian code
 
         Parameters
@@ -250,7 +250,7 @@ def from_fileobj(klass, fileobj, endianness=None,check=False):
 
         """
         raw_str = fileobj.read(klass._dtype.itemsize)
-        return klass(raw_str, endianness, check)
+        return klass(raw_str, endianness)
 
     def _empty_headerdata(self,endianness=None):
         """Return header data for empty header with given endianness"""
@@ -275,8 +275,8 @@ def get_data_dtype(self):
     def copy(self):
         return self.__class__(
             self.binaryblock,
-            self.endianness,
-            check=False)
+            self.endianness)
+
 
     def __eq__(self, other):
         """ checks for equality between two headers"""
@@ -424,9 +424,9 @@ def __init__(self, hdr, mlist, fileobj):
         self.endianness = hdr.endianness
         self._mlist = mlist
         self.fileobj = fileobj
-        self.subheaders = self.get_subheaders()
+        self.subheaders = self._get_subheaders()
 
-    def get_subheaders(self):
+    def _get_subheaders(self):
         """retreive all subheaders and return list of subheader recarrays
         """
         subheaders = []
@@ -522,7 +522,7 @@ def get_data_dtype(self, frame):
     def get_frame_offset(self, frame=0):
         mlist = self._mlist._mlist
         offset = mlist[frame][1] * 512
-        return offset
+        return int(offset)
 
     def raw_data_from_fileobj(self, frame=0):
         dtype = self.get_data_dtype(frame)

nibabel/tests/data/tinypet.v

@@ -64,3 +64,45 @@ def test_endianness(self):
         fid.close()
         yield assert_true(hdr.endianness == '<')
         yield assert_true(newhdr.endianness == '>')
+
+class TestEcatMlist(ParametricTestCase):
+    header_class = EcatHeader
+    mlist_class = EcatMlist
+    example_file = ecat_file
+
+    def test_mlist(self):
+        fid = open(self.example_file, 'rb')
+        hdr = self.header_class.from_fileobj(fid)
+        mlist =  self.mlist_class(fid, hdr)
+        fid.seek(0)
+        fid.seek(512)
+        dat=fid.read(128*32)
+        dt = np.dtype([('matlist',np.int32)])
+        dt = dt.newbyteorder('>')
+        mats = np.recarray(shape=(32,4), dtype=dt,  buf=dat)
+        fid.close()
+        yield assert_true(mats['matlist'][0,0] +  mats['matlist'][0,3] == 31)
+        yield assert_true(mlist.get_frame_order()[0][0] == 0)
+        yield assert_true(mlist.get_frame_order()[0][1] == 16842758.0)
+
+class TestEcatSubHeader(ParametricTestCase):
+    header_class = EcatHeader
+    mlist_class = EcatMlist
+    subhdr_class = EcatSubHeader
+    example_file = ecat_file    
+    fid = open(example_file, 'rb')
+    hdr = header_class.from_fileobj(fid)
+    mlist =  mlist_class(fid, hdr)        
+    subhdr = subhdr_class(hdr, mlist, fid)
+    fid.close()
+
+    def test_subheader_size(self):
+        yield assert_equal(self.subhdr_class._subhdrdtype.itemsize, 242)
+
+    def test_subheader(self):
+        yield assert_equal(self.subhdr.get_shape() , (10,10,3))
+        yield assert_equal(self.subhdr.get_nframes() , 1)
+        yield assert_equal(self.subhdr.get_nframes(),
+                           len(self.subhdr.subheaders))
+        yield assert_equal(self.subhdr._check_affines(), True)
+