Changeset b99ac227 in sasview for DataLoader/readers

Timestamp:

Aug 6, 2008 8:54:02 AM (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:

17a6843

Parents:

99d1af6

Message:

Updates and tests for readers

Location:

DataLoader/readers

Files:

• IgorReader.py (modified) (9 diffs)
• abs_reader.py (modified) (2 diffs)
• danse_reader.py (modified) (6 diffs)

DataLoader/readers/IgorReader.py

@@ +1 @@
+"""
+    IGOR 2D reduced file reader
+"""
+
+"""
+This software was developed by the University of Tennessee as part of the
+Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
+project funded by the US National Science Foundation. 
+
+If you use DANSE applications to do scientific research that leads to 
+publication, we ask that you acknowledge the use of the software with the 
+following sentence:
+
+"This work benefited from DANSE software developed under NSF award DMR-0520547." 
+
+copyright 2008, University of Tennessee
+"""
+
 import os, sys
-import pylab
-from copy import deepcopy
-import math,logging
+import numpy
+import math, logging
+from DataLoader.data_info import Data2D, Detector
+
+# Look for unit converter
+has_converter = True
+try:
+    from data_util.nxsunit import Converter
+except:
+    has_converter = False
+
 class Reader:
     """ Simple data reader for Igor data files """
-    ext=['.ASC']
-    def __init__(self, filename=None):
-        """ Init
-            @param filename: Name of Igor data file to read
-        """
-        self.file = filename
-        self.x = []
-        self.y = []
-        self.image = []
-        
-        # Detector info
-        self.wavelength = 0.0
-        self.distance   = 0.0
-        self.center_x   = 63.5
-        self.center_y   = 63.5
-        
+    ## File type
+    type = ["IGOR 2D files (*.ASC)|*.ASC"]
+    ## Extension
+    ext=['.ASC', '.asc']
+
     def read(self,filename=None):
         """ Read file """
-        # Check if the file is there
-        self.file=filename
-        if not os.path.isfile(self.file):
+        if not os.path.isfile(filename):
             raise ValueError, \
-            "Specified file %s is not a regular file" % self.file
+            "Specified file %s is not a regular file" % filename
         
         # Read file
-        f = open(self.file,'r')
+        f = open(filename,'r')
         buf = f.read()
+        
+        # Instantiate data object
+        output = Data2D()
+        output.filename = os.path.basename(filename)
+        detector = Detector()
+        if len(output.detector)>0: print str(output.detector[0])
+        output.detector.append(detector)
+        
+        size_x = 128
+        size_y = 128
+        output.data = numpy.zeros([size_x,size_y])
+        output.err_data = numpy.zeros([size_x,size_y])
+        
+        data_conv_q = None
+        data_conv_i = None
+        
+        if has_converter == True and output.Q_unit != '1/A':
+            data_conv_q = Converter('1/A')
+            # Test it
+            data_conv_q(1.0, output.Q_unit)
+            
+        if has_converter == True and output.I_unit != '1/cm':
+            data_conv_i = Converter('1/cm')
+            # Test it
+            data_conv_i(1.0, output.I_unit)            
+    
         
         # Get content
@@ -39 +78 @@
         lines = buf.split('\n')
         itot = 0
-        self.x = []
-        self.y = []
-        self.image = []
+        x = []
+        y = []
         
         ncounts = 0
-        
-        #x = pylab.arange(0, 128, 1)
-        #y = pylab.arange(0, 128, 1)
-        x = pylab.arange(-.5, .5, 1.0/128)
-        y = pylab.arange(-.5, .5, 1.0/128)
-        X, Y = pylab.meshgrid(x, y)
-        Z = deepcopy(X)
         
         xmin = None
@@ -79 +110 @@
                     raise ValueError,"IgorReader: can't read this file, missing distance"
                 
+                # Distance in meters
+                try:
+                    transmission = float(line_toks[4])
+                except:
+                    raise ValueError,"IgorReader: can't read this file, missing transmission"
+                
             if line.count("LAMBDA")>0:
                 isInfo = True
@@ -109 +146 @@
                     value = float(line)
                 except:
+                    # Found a non-float entry, skip it
                     continue
                 
@@ -118 +156 @@
                     i_x += 1
                     
-                Z[i_y][i_x] = value
+                output.data[i_y][i_x] = value
                 ncounts += 1 
                 
@@ -126 +164 @@
                 theta = (i_x-center_x+1)*0.5 / distance / 100.0
                 qx = 4.0*math.pi/wavelength * math.sin(theta/2.0)
+
+                if has_converter == True and output.Q_unit != '1/A':
+                    qx = data_conv_q(qx, units=output.Q_unit)
+
                 if xmin==None or qx<xmin:
                     xmin = qx
@@ -133 +175 @@
                 theta = (i_y-center_y+1)*0.5 / distance / 100.0
                 qy = 4.0*math.pi/wavelength * math.sin(theta/2.0)
+
+                if has_converter == True and output.Q_unit != '1/A':
+                    qy = data_conv_q(qy, units=output.Q_unit)
+                
                 if ymin==None or qy<ymin:
                     ymin = qy
@@ -138 +184 @@
                     ymax = qy
                 
-                
-                if not qx in self.x:
-                    self.x.append(qx)
-                if not qy in self.y:
-                    self.y.append(qy)
+                if not qx in x:
+                    x.append(qx)
+                if not qy in y:
+                    y.append(qy)
                 
                 itot += 1
@@ -153 +198 @@
         ystep = 4.0*math.pi/wavelength * math.sin(theta/2.0)
         
-        # Store q max 
-        if xmax>ymax:
-            self.qmax = xmax
+        # Store all data ######################################
+        # Store wavelength
+        if has_converter==True and output.source.wavelength_unit != 'A':
+            conv = Converter('A')
+            wavelength = conv(wavelength, units=output.source.wavelength_unit)
+        output.source.wavelength = wavelength
+
+        # Store distance
+        if has_converter==True and detector.distance_unit != 'm':
+            conv = Converter('m')
+            distance = conv(distance, units=detector.distance_unit)
+        detector.distance = distance
+  
+        # Store transmission
+        output.sample.transmission = transmission
+        
+        # Store pixel size
+        pixel = 5.0
+        if has_converter==True and detector.pixel_size_unit != 'mm':
+            conv = Converter('mm')
+            pixel = conv(pixel, units=detector.pixel_size_unit)
+        detector.pixel_size.x = pixel
+        detector.pixel_size.y = pixel
+  
+        # Store beam center in distance units
+        detector.beam_center.x = center_x*pixel
+        detector.beam_center.y = center_y*pixel
+  
+        
+        # Store limits of the image (2D array)
+        xmin    =xmin-xstep/2.0
+        xmax    =xmax+xstep/2.0
+        ymin    =ymin-ystep/2.0
+        ymax    =ymax+ystep/2.0
+        if has_converter == True and output.Q_unit != '1/A':
+            xmin = data_conv_q(xmin, units=output.Q_unit)
+            xmax = data_conv_q(xmax, units=output.Q_unit)
+            ymin = data_conv_q(ymin, units=output.Q_unit)
+            ymax = data_conv_q(ymax, units=output.Q_unit)
+        output.xmin = xmin
+        output.xmax = xmax
+        output.ymin = ymin
+        output.ymax = ymax
+        
+        # Store x and y axis bin centers
+        output.x_bins     = x
+        output.y_bins     = y
+        
+        # Units
+        if data_conv_q is not None:
+            output.xaxis("\\rm{Q}", output.Q_unit)
+            output.yaxis("\\rm{Q}", output.Q_unit)
         else:
-            self.qmax = ymax
-        
-        #config.printEVT("Read %g points from file %s" % (ncounts, self.file))
-  
-        self.wavelength = wavelength
-        self.distance   = distance*1000.0
-        self.center_x = center_x
-        self.center_y = center_y
-        
-        from readInfo import ReaderInfo   
-        output = ReaderInfo()
-        output.Z=Z
-        output.xmin    =xmin-xstep/2.0
-        output.xmax    = xmax+xstep/2.0
-        output.ymin    =ymin-ystep/2.0
-        output.ymax    =ymax+ystep/2.0
-        output.x          = x
-        output.y          = y
-        output.wavelength = wavelength
-        output.distance   = distance*1000.0
-        output.center_x = center_x
-        output.center_y = center_y
-        output.type    ="2D"
-        
-        logging.info("IgorReader reading %s"%self.file)
+            output.xaxis("\\rm{Q}", 'A^{-1}')
+            output.yaxis("\\rm{Q}", 'A^{-1}')
+            
+        if data_conv_i is not None:
+            output.zaxis("\\{I(Q)}", output.I_unit)
+        else:
+            output.zaxis("\\rm{I(Q)}","cm^{-1}")
+    
+        
         return output
-     
+    
+if __name__ == "__main__": 
+    reader = Reader()
+    print reader.read("../test/MAR07232_rest.ASC") 
+    

DataLoader/readers/abs_reader.py

@@ -53 +53 @@
                 detector = Detector()
                 output.detector.append(detector)
-                self.filename = output.filename = basename
+                output.filename = basename
                 
                 is_info = False
@@ -111 +111 @@
                         try:
                             value = float(line_toks[5])
-                            if has_converter==True and output.sample.thickness_unit != 'mm':
-                                conv = Converter('mm')
+                            if has_converter==True and output.sample.thickness_unit != 'cm':
+                                conv = Converter('cm')
                                 output.sample.thickness = conv(value, units=output.sample.thickness_unit)
                             else:

DataLoader/readers/danse_reader.py

@@ -1 +1 @@
 """
     DANSE/SANS file reader
+"""
+
+"""
+This software was developed by the University of Tennessee as part of the
+Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
+project funded by the US National Science Foundation. 
+
+If you use DANSE applications to do scientific research that leads to 
+publication, we ask that you acknowledge the use of the software with the 
+following sentence:
+
+"This work benefited from DANSE software developed under NSF award DMR-0520547." 
+
+copyright 2008, University of Tennessee
 """
 
@@ -24 +38 @@
     type = ["DANSE files (*.sans)|*.sans"]
     ## Extension
-    ext  = ['.sans']    
+    ext  = ['.sans', '.SANS']    
         
     def read(self, filename=None):
@@ -140 +154 @@
             xmax = None
             
-            #x = numpy.zeros(size_x)
-            #y = numpy.zeros(size_y)
-            #X, Y = pylab.meshgrid(x, y)
-            #Z = copy.deepcopy(X)
-            #E = copy.deepcopy(X)
-            itot = 0
-            i_x = 0
-            i_y = 0
-            
             # Qx and Qy vectors
             for i_x in range(size_x):
@@ -179 +184 @@
             
             # Store the data in the 2D array
+            itot = 0
+            i_x  = 0
+            i_y  = -1
+            
             for i_pt in range(len(data)):
                 try:
@@ -188 +197 @@
                 
                 # Get bin number
-                if math.fmod(itot, size_x)==0:
+                if math.fmod(i_pt, size_x)==0:
                     i_x = 0
                     i_y += 1
@@ -194 +203 @@
                     i_x += 1
                     
-                output.data[size_y-1-i_y][i_x] = value
+                output.data[i_y][i_x] = value       
+                #output.data[size_y-1-i_y][i_x] = value
                 if fversion>1.0:
-                    output.err_data[size_y-1-i_y][i_x] = error[i_pt]
-                
-                itot += 1
+                    output.err_data[i_y][i_x] = error[i_pt]
+                    #output.err_data[size_y-1-i_y][i_x] = error[i_pt]
+                
                 
             # Store all data ######################################