NF tests for EcatSubHeader

Author: cindeem

nibabel/ecat.py

@@ -510,7 +510,7 @@ def get_zooms(self,frame=0):
         return (x_zoom, y_zoom, z_zoom, 1)
 
 
-    def get_data_dtype(self, frame):
+    def _get_data_dtype(self, frame):
         dt = self.subheaders[frame]['data_type']
         if dt == 5:
             return np.dtype('float')
@@ -519,17 +519,17 @@ def get_data_dtype(self, frame):
         else:
             return None
 
-    def get_frame_offset(self, frame=0):
+    def _get_frame_offset(self, frame=0):
         mlist = self._mlist._mlist
         offset = mlist[frame][1] * 512
         return int(offset)
 
     def raw_data_from_fileobj(self, frame=0):
-        dtype = self.get_data_dtype(frame)
+        dtype = self._get_data_dtype(frame)
         if not self._header.endianness is native_code:
             dtype=dtype.newbyteorder(self._header.endianness)
         shape = self.get_shape(frame)
-        offset = self.get_frame_offset(frame)
+        offset = self._get_frame_offset(frame)
         fid_obj = self.fileobj
         raw_data = array_from_file(shape, dtype, fid_obj, offset=offset)
         ## put data into neurologic orientation
@@ -663,7 +663,7 @@ def get_frame(self,frame):
 
     def get_data_dtype(self,frame):
         subhdr = self._subheader
-        dt = subhdr.get_data_dtype(frame)
+        dt = subhdr._get_data_dtype(frame)
         return dt
 
     def get_shape(self):

nibabel/tests/test_ecat.py

@@ -94,7 +94,7 @@ class TestEcatSubHeader(ParametricTestCase):
     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)
@@ -105,5 +105,16 @@ def test_subheader(self):
         yield assert_equal(self.subhdr.get_nframes(),
                            len(self.subhdr.subheaders))
         yield assert_equal(self.subhdr._check_affines(), True)
-        yield assert_array_equal(np.diag(self.subhdr.get_frame_affine()),
-                                 np.array([ 2.20241979, 2.20241979, 3.125,  1.]))
+        yield assert_array_almost_equal(np.diag(self.subhdr.get_frame_affine()),
+                                        np.array([ 2.20241979, 2.20241979, 3.125,  1.]))
+        yield assert_equal(self.subhdr.get_zooms()[0], 2.20241978764534)
+        yield assert_equal(self.subhdr.get_zooms()[2], 3.125)
+        yield assert_equal(self.subhdr._get_data_dtype(0),np.dtype('ushort'))
+        yield assert_equal(self.subhdr._get_frame_offset(), 1536)
+        dat = self.subhdr.raw_data_from_fileobj()
+        yield assert_equal(dat.shape, self.subhdr.get_shape())
+        scale_factor = self.subhdr.subheaders[0]['scale_factor']
+        ecat_calib_factor = self.hdr['ecat_calibration_factor']
+        scaled_dat = self.subhdr.data_from_fileobj()
+        yield assert_array_equal(dat * scale_factor * ecat_calib_factor,
+                                 scaled_dat)