Changeset 9d4e502 in sasview

Timestamp:

Apr 1, 2009 1:55:03 PM (16 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

de5c813

Parents:

1328e03

Message:

removed Imag2D class

File:

• DataLoader/readers/tiff_reader.py (modified) (7 diffs)

DataLoader/readers/tiff_reader.py

@@ -16 +16 @@
 import math, logging, os
 import numpy
-from DataLoader.data_info import Image2D
+from DataLoader.data_info import Data2D
     
 class Reader:
@@ -51 +51 @@
         
         # Instantiate data object
-        output = Image2D()
+        output = Data2D()
         output.filename = os.path.basename(filename)
             
@@ -59 +59 @@
         except :
             raise  RuntimeError,"cannot open %s"%(filename)
-        data = im.load()
+        predata = im.load()
 
         x_range = im.size[0]
@@ -65 +65 @@
         
         # Initiazed the output data object
-        output.image = numpy.zeros([y_range,x_range])
-
+        output.data = numpy.zeros([y_range,x_range])
+        output.err_data = numpy.zeros([y_range,x_range])
         # Initialize 
         x_vals = []
@@ -83 +83 @@
             
                 try:
-                    if data[i_x,i_y].__class__.__name__=="tuple":                     
+                    if predata[i_x,i_y].__class__.__name__=="tuple":                     
                         
-                        if len(data[i_x,i_y]) == 3:   
-                            R,G,B= data[i_x,i_y]
-                            #Converting to L Mode: uses the ITU-R 601-2 luma transform.
-                            value = float(R * 299/1000 + G * 587/1000 + B * 114/1000) 
+                        if len(predata[i_x,i_y]) == 3:   
+                            R,G,B= predata[i_x,i_y]
+                        elif len(predata[i_x,i_y]) == 4:   
+                            R,G,B,I = predata[i_x,i_y]
+                        #Converting to L Mode: uses the ITU-R 601-2 luma transform.
+                        value = float(R * 299/1000 + G * 587/1000 + B * 114/1000) 
                          
-                        elif len(data[i_x,i_y]) == 4:   
-                            R,G,B,I = data[i_x,i_y]
-                            #Take only I 
-                            value = float(R * 299/1000 + G * 587/1000 + B * 114/1000)+float(I)
                     else:
                         #Take it as Intensity
-                        value = float(data[i_x,i_y])
+                        value = float(predata[i_x,i_y])
                 except:
                     logging.error("tiff_reader: had to skip a non-float point")
@@ -102 +100 @@
                 
                   
-                output.image[y_range-i_y-1,i_x] = value
+                output.data[y_range-i_y-1,i_x] = value
         
         output.xbins      = x_range
@@ -109 +107 @@
         output.y_bins     = y_vals
         output.xmin       = 0
-        output.xmax       = x_range
+        output.xmax       = x_range-1
         output.ymin       = 0
-        output.ymax       = y_range
+        output.ymax       = y_range-1
         
         return output
         
-
-