Changeset 28caa03 in sasview

Timestamp:

Apr 4, 2009 3:17:43 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

07f8d9a

Parents:

0f5fe6b

Message:

Improved hierarchical reader structure, put back reader plugin, minor fixes.

Location:

DataLoader/readers

Files:

• IgorReader.py (modified) (1 diff)
• __init__.py (modified) (1 diff)
• abs_reader.py (modified) (1 diff)
• ascii_reader.py (modified) (1 diff)
• associations.py (added)
• cansas_reader.py (modified) (1 diff)
• danse_reader.py (modified) (1 diff)
• defaults.xml (added)
• hfir1d_reader.py (modified) (1 diff)
• old_tiff_reader.py (deleted)
• tiff_reader.py (modified) (3 diffs)

DataLoader/readers/IgorReader.py

@@ -32 +32 @@
     """ Simple data reader for Igor data files """
     ## File type
+    type_name = "IGOR 2D"   
+    ## Wildcards
     type = ["IGOR 2D files (*.ASC)|*.ASC"]
     ## Extension

DataLoader/readers/__init__.py

@@ -1 @@
-import abs_reader
-import cansas_reader
-import ascii_reader
-import cansas_reader
-import danse_reader
-import hfir1d_reader
-import IgorReader
-import tiff_reader
+# Backward compatibility with the previous implementation of the default readers
+from associations import register_readers
 
-def register_readers(registry_function):
-    """
-        Function called by the registry/loader object to register
-        all default readers using a call back function.
-    
-        @param registry_function: function to be called to register each reader
-    """
-    registry_function(abs_reader)
-    registry_function(cansas_reader)
-    registry_function(ascii_reader)
-    registry_function(cansas_reader)
-    registry_function(danse_reader)
-    registry_function(hfir1d_reader)
-    registry_function(IgorReader)
-    registry_function(tiff_reader)
-    
+# Method to associate extensions to default readers 
+from associations import read_associations

DataLoader/readers/abs_reader.py

@@ -24 +24 @@
     """
     ## File type
+    type_name = "IGOR 1D"   
+    ## Wildcards
     type = ["IGOR 1D files (*.abs)|*.abs"]
     ## List of allowed extensions

DataLoader/readers/ascii_reader.py

@@ -25 +25 @@
     """
     ## File type
+    type_name = "ASCII"
+    
+    ## Wildcards
     type = ["ASCII files (*.txt)|*.txt",
             "ASCII files (*.dat)|*.dat",

DataLoader/readers/cansas_reader.py

@@ -196 +196 @@
     version = '1.0'
     ## File type
+    type_name = "CanSAS 1D"
+    ## Wildcards
     type = ["CanSAS 1D files (*.xml)|*.xml"]
     ## List of allowed extensions

DataLoader/readers/danse_reader.py

@@ -36 +36 @@
     """
     ## File type
+    type_name = "DANSE"   
+    ## Wildcards
     type = ["DANSE files (*.sans)|*.sans"]
     ## Extension

DataLoader/readers/hfir1d_reader.py

@@ -25 +25 @@
     """
     ## File type
+    type_name = "HFIR 1D"   
+    ## Wildcards
     type = ["HFIR 1D files (*.d1d)|*.d1d"]
     ## List of allowed extensions

DataLoader/readers/tiff_reader.py

@@ -23 +23 @@
     """
     ## File type
+    type_name = "TIF"   
+    ## Wildcards
     type = ["TIF files (*.tif)|*.tif",
-            "JPG files (*.jpg)|*.jpg",
-            "JPEG files (*.jpeg)|*.jpeg",
-            "PNG files (*.png)|*.png",
             "TIFF files (*.tiff)|*.tiff",
-            "BMP files (*.bmp)|*.bmp",
-            "GIF files (*.gif)|*.gif",
             ]
     ## Extension
-    ext  = ['.tif','.TIF',
-             '.jpg','.JPG',
-              '.png','.PNG',
-               '.jpeg','.JPEG',
-                '.tiff','.TIFF',
-                 '.gif','.GIF',
-                  '.bmp', '.BMP']    
+    ext  = ['.tif', '.tiff']    
         
     def read(self, filename=None):
@@ -59 +50 @@
         except :
             raise  RuntimeError,"cannot open %s"%(filename)
-        predata = im.load()
+        data = im.getdata()
 
-        x_range = im.size[0]
-        y_range = im.size[1]
+        # Initiazed the output data object
+        output.data = numpy.zeros([im.size[0],im.size[1]])
+        output.err_data = numpy.zeros([im.size[0],im.size[1]])
         
-        # Initiazed the output data object
-        output.data = numpy.zeros([y_range,x_range])
-        output.err_data = numpy.zeros([y_range,x_range])
         # Initialize 
         x_vals = []
@@ -72 +61 @@
 
         # x and y vectors
-        for i_x in range(x_range):
+        for i_x in range(im.size[0]):
             x_vals.append(i_x)
             
-        
-        for i_y in range(y_range):
+        itot = 0
+        for i_y in range(im.size[1]):
             y_vals.append(i_y)
-        
-        for i_x in range(x_range):
-            for i_y in range(y_range):
+
+        for val in data:
+            try:
+                value = float(val)
+            except:
+                logging.error("tiff_reader: had to skip a non-float point")
+                continue
             
-                try:
-                    if predata[i_x,i_y].__class__.__name__=="tuple":                     
-                        
-                        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) 
-                         
-                    else:
-                        #Take it as Intensity
-                        value = float(predata[i_x,i_y])
-                except:
-                    logging.error("tiff_reader: had to skip a non-float point")
-                    continue
+            # Get bin number
+            if math.fmod(itot, im.size[0])==0:
+                i_x = 0
+                i_y += 1
+            else:
+                i_x += 1
                 
-                  
-                output.data[y_range-i_y-1,i_x] = value
-        
-        output.xbins      = x_range
-        output.ybins      = y_range
+            output.data[im.size[1]-1-i_y][i_x] = value
+            
+            itot += 1
+                
+        output.xbins      = im.size[0]
+        output.ybins      = im.size[1]
         output.x_bins     = x_vals
         output.y_bins     = y_vals
         output.xmin       = 0
-        output.xmax       = x_range-1
+        output.xmax       = im.size[0]-1
         output.ymin       = 0
-        output.ymax       = y_range-1
+        output.ymax       = im.size[0]-1
         
         return output
         
+
+if __name__ == "__main__": 
+    reader = Reader()
+    print reader.read("../test/MP_New.sans")
+    
+