Changeset a30864b1 in sasview for sansdataloader/src/sans/dataloader

Timestamp:

Jan 21, 2013 10:48:59 AM (12 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:

c080e542

Parents:

fdb134b9

Message:

minor fix for pil import

File:

• sansdataloader/src/sans/dataloader/readers/tiff_reader.py (modified) (5 diffs)

sansdataloader/src/sans/dataloader/readers/tiff_reader.py

@@ -15 +15 @@
 import numpy
 from sans.dataloader.data_info import Data2D
-    
+from sans.dataloader.manipulations import reader2D_converter
     
 class Reader:
@@ -38 +38 @@
         try:
             import Image
+            import TiffImagePlugin
+            Image._initialized=2
         except:
             msg = "tiff_reader: could not load file. Missing Image module."
@@ -56 +58 @@
         output.data = numpy.zeros([im.size[0], im.size[1]])
         output.err_data = numpy.zeros([im.size[0], im.size[1]])
+        output.mask = numpy.ones([im.size[0], im.size[1]], dtype=bool)
         
         # Initialize
@@ -91 +94 @@
         output.x_bins = x_vals
         output.y_bins = y_vals
+        output.qx_data = numpy.array(x_vals)
+        output.qy_data = numpy.array(y_vals)
         output.xmin = 0
         output.xmax = im.size[0] - 1
@@ -98 +103 @@
         # Store loading process information
         output.meta_data['loader'] = self.type_name
+        output = reader2D_converter(output)
         return output