Changeset 7d6351e in sasview for sansdataloader/src/sans/dataloader/readers/IgorReader.py

Timestamp:

Apr 27, 2012 11:22:31 AM (12 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:

4a96b8b

Parents:

f60a8c2

Message:

Pep-8-ification

File:

• sansdataloader/src/sans/dataloader/readers/IgorReader.py (modified) (19 diffs)

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

@@ -1 @@
-
+"""
+    IGOR 2D reduced file reader
+"""
 ############################################################################
 #This software was developed by the University of Tennessee as part of the
@@ -10 +12 @@
 #copyright 2008, University of Tennessee
 #############################################################################
-
-"""
-    IGOR 2D reduced file reader
-"""
-
 import os
-#import sys
 import numpy
 import math
@@ -31 +27 @@
     has_converter = False
 
+
 class Reader:
     """ Simple data reader for Igor data files """
     ## File type
-    type_name = "IGOR 2D"   
+    type_name = "IGOR 2D"
     ## Wildcards
     type = ["IGOR 2D files (*.ASC)|*.ASC"]
@@ -40 +37 @@
     ext=['.ASC', '.asc']
 
-    def read(self,filename=None):
+    def read(self, filename=None):
         """ Read file """
         if not os.path.isfile(filename):
@@ -47 +44 @@
         
         # Read file
-        f = open(filename,'r')
+        f = open(filename, 'r')
         buf = f.read()
         
@@ -54 +51 @@
         output.filename = os.path.basename(filename)
         detector = Detector()
-        if len(output.detector)>0: print str(output.detector[0])
+        if len(output.detector) > 0:
+            print str(output.detector[0])
         output.detector.append(detector)
                 
         # Get content
         dataStarted = False
-        
         
         lines = buf.split('\n')
@@ -91 +88 @@
             data_conv_i = Converter('1/cm')
             # Test it
-            data_conv_i(1.0, output.I_unit)            
+            data_conv_i(1.0, output.I_unit)
          
         for line in lines:
@@ -117 +114 @@
                 
             i_tot_row += 1
-        i_tot_row=math.ceil(math.sqrt(i_tot_row))-1 
+        i_tot_row = math.ceil(math.sqrt(i_tot_row)) - 1
         #print "i_tot", i_tot_row
-        size_x = i_tot_row#192#128
-        size_y = i_tot_row#192#128
-        output.data = numpy.zeros([size_x,size_y])
-        output.err_data = numpy.zeros([size_x,size_y])
+        size_x = i_tot_row  # 192#128
+        size_y = i_tot_row  # 192#128
+        output.data = numpy.zeros([size_x, size_y])
+        output.err_data = numpy.zeros([size_x, size_y])
      
         #Read Header and 2D data
@@ -151 +148 @@
                     raise ValueError, msg
                                             
-            if line.count("LAMBDA")>0:
+            if line.count("LAMBDA") > 0:
                 isInfo = True
                 
             # Find center info line
             if isCenter:
-                isCenter = False                
+                isCenter = False
                 line_toks = line.split()
                 
-                # Center in bin number: Must substrate 1 because 
+                # Center in bin number: Must substrate 1 because
                 #the index starts from 1
-                center_x = float(line_toks[0])-1
-                center_y = float(line_toks[1])-1
-
-            if line.count("BCENT")>0:
+                center_x = float(line_toks[0]) - 1
+                center_y = float(line_toks[1]) - 1
+
+            if line.count("BCENT") > 0:
                 isCenter = True
                 
-        
             # Find data start
             if line.count("***")>0:
@@ -188 +184 @@
                 
                 # Get bin number
-                if math.fmod(itot, i_tot_row)==0:
+                if math.fmod(itot, i_tot_row) == 0:
                     i_x = 0
                     i_y += 1
@@ -195 +191 @@
                     
                 output.data[i_y][i_x] = value
-                ncounts += 1 
+                ncounts += 1
                 
                 # Det 640 x 640 mm
                 # Q = 4pi/lambda sin(theta/2)
                 # Bin size is 0.5 cm 
-                #REmoved +1 from theta = (i_x-center_x+1)*0.5 / distance 
+                #REmoved +1 from theta = (i_x-center_x+1)*0.5 / distance
                 # / 100.0 and 
                 #REmoved +1 from theta = (i_y-center_y+1)*0.5 /
@@ -206 +202 @@
                 #ToDo: Need  complete check if the following
                 # covert process is consistent with fitting.py.
-                theta = (i_x-center_x)*0.5 / distance / 100.0
-                qx = 4.0*math.pi/wavelength * math.sin(theta/2.0)
+                theta = (i_x - center_x) * 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:
+                if xmin == None or qx < xmin:
                     xmin = qx
-                if xmax==None or qx>xmax:
+                if xmax == None or qx > xmax:
                     xmax = qx
                 
-                theta = (i_y-center_y)*0.5 / distance / 100.0
-                qy = 4.0*math.pi/wavelength * math.sin(theta/2.0)
+                theta = (i_y - center_y) * 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:
+                if ymin == None or qy < ymin:
                     ymin = qy
-                if ymax==None or qy>ymax:
+                if ymax == None or qy > ymax:
                     ymax = qy
                 
@@ -237 +233 @@
                   
         theta = 0.25 / distance / 100.0
-        xstep = 4.0*math.pi/wavelength * math.sin(theta/2.0)
+        xstep = 4.0 * math.pi / wavelength * math.sin(theta / 2.0)
         
         theta = 0.25 / distance / 100.0
-        ystep = 4.0*math.pi/wavelength * math.sin(theta/2.0)
+        ystep = 4.0 * math.pi/ wavelength * math.sin(theta / 2.0)
         
         # Store all data ######################################
         # Store wavelength
-        if has_converter==True and output.source.wavelength_unit != 'A':
+        if has_converter == True and output.source.wavelength_unit != 'A':
             conv = Converter('A')
             wavelength = conv(wavelength, units=output.source.wavelength_unit)
@@ -250 +246 @@
 
         # Store distance
-        if has_converter==True and detector.distance_unit != 'm':
+        if has_converter == True and detector.distance_unit != 'm':
             conv = Converter('m')
             distance = conv(distance, units=detector.distance_unit)
@@ -260 +256 @@
         # Store pixel size
         pixel = 5.0
-        if has_converter==True and detector.pixel_size_unit != 'mm':
+        if has_converter == True and detector.pixel_size_unit != 'mm':
             conv = Converter('mm')
             pixel = conv(pixel, units=detector.pixel_size_unit)
@@ -267 +263 @@
   
         # Store beam center in distance units
-        detector.beam_center.x = center_x*pixel
-        detector.beam_center.y = center_y*pixel
-  
+        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
+        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)
@@ -287 +282 @@
         
         # Store x and y axis bin centers
-        output.x_bins     = x
-        output.y_bins     = y
+        output.x_bins = x
+        output.y_bins = y
         
         # Units
@@ -301 +296 @@
             output.zaxis("\\rm{Intensity}", output.I_unit)
         else:
-            output.zaxis("\\rm{Intensity}","cm^{-1}")
+            output.zaxis("\\rm{Intensity}", "cm^{-1}")
     
         # Store loading process information
@@ -308 +303 @@
 
         return output
-    
-if __name__ == "__main__": 
-    reader = Reader()
-    print reader.read("../test/MAR07232_rest.ASC") 
-