Changeset 872785f in sasview for DataLoader

Timestamp:

Mar 27, 2009 3:34:25 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:

00c3aac

Parents:

31f3f661

Message:

working on tiff reader and plotter

File:

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

DataLoader/readers/tiff_reader.py

@@ -16 +16 @@
 import math, logging, os
 import numpy
-from DataLoader.data_info import Image2D#Data2D
+from DataLoader.data_info import Image2D
     
 class Reader:
@@ -54 +54 @@
             raise  RuntimeError,"cannot open %s"%(filename)
         data = im.load()
-        print im.mode
-        im.show()
+
         x_range = im.size[0]
         y_range = im.size[1]
@@ -65 +64 @@
         x_vals = []
         y_vals = [] 
-        if im.mode == "P":
-            data=im.split()
 
         # x and y vectors
@@ -85 +82 @@
                             R,G,B= data[i_x,i_y]
                             #Converting to L Mode: uses the ITU-R 601-2 luma transform.
-                            value = 255-float(R * 299/1000 + G * 587/1000 + B * 114/1000) 
+                            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 = 255-float(R * 299/1000 + G * 587/1000 + B * 114/1000)-float(I)
+                            value = float(R * 299/1000 + G * 587/1000 + B * 114/1000)+float(I)
                     else:
                         #Take it as Intensity
-                        #value = 255-float(data[i_x,i_y])
+                        value = float(data[i_x,i_y])
                 except:
                     logging.error("tiff_reader: had to skip a non-float point")