Changeset 7d6351e in sasview for sansdataloader/src/sans/dataloader/readers/hfir1d_reader.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/hfir1d_reader.py (modified) (5 diffs)

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

@@ -1 @@
-
+"""
+    HFIR 1D 4-column data 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. 
+#project funded by the US National Science Foundation.
 #See the license text in license.txt
 #copyright 2008, University of Tennessee
 ######################################################################
-
 import numpy
 import os
@@ -24 +25 @@
     """
     ## File type
-    type_name = "HFIR 1D"   
+    type_name = "HFIR 1D"
     ## Wildcards
     type = ["HFIR 1D files (*.d1d)|*.d1d"]
     ## List of allowed extensions
-    ext = ['.d1d']  
+    ext = ['.d1d']
     
     def read(self, path):
@@ -42 +43 @@
         """
         if os.path.isfile(path):
-            basename  = os.path.basename(path)
+            basename = os.path.basename(path)
             root, extension = os.path.splitext(basename)
             if extension.lower() in self.ext:
                 try:
-                    input_f =  open(path,'r')
-                except :
+                    input_f = open(path,'r')
+                except:
                     raise  RuntimeError, "hfir1d_reader: cannot open %s" % path
                 buff = input_f.read()
                 lines = buff.split('\n')
-                x  = numpy.zeros(0)
-                y  = numpy.zeros(0)
+                x = numpy.zeros(0)
+                y = numpy.zeros(0)
                 dx = numpy.zeros(0)
                 dy = numpy.zeros(0)
@@ -84 +85 @@
                             
                         if data_conv_i is not None:
-                            _y = data_conv_i(_y, units=output.y_unit)                        
-                            _dy = data_conv_i(_dy, units=output.y_unit)                        
+                            _y = data_conv_i(_y, units=output.y_unit)
+                            _dy = data_conv_i(_dy, units=output.y_unit)
                                                     
-                        x   = numpy.append(x, _x) 
-                        y   = numpy.append(y, _y)
-                        dx  = numpy.append(dx, _dx)
-                        dy  = numpy.append(dy, _dy)                        
+                        x = numpy.append(x, _x)
+                        y = numpy.append(y, _y)
+                        dx = numpy.append(dx, _dx)
+                        dy = numpy.append(dy, _dy)
                     except:
                         # Couldn't parse this line, skip it 
                         pass
                          
-                     
                 # Sanity check
                 if not len(y) == len(dy):
@@ -120 +120 @@
                     output.yaxis("\\rm{Intensity}", output.y_unit)
                 else:
-                    output.yaxis("\\rm{Intensity}","cm^{-1}")
+                    output.yaxis("\\rm{Intensity}", "cm^{-1}")
                 
                 # Store loading process information
-                output.meta_data['loader'] = self.type_name   
+                output.meta_data['loader'] = self.type_name
                 return output
         else:
             raise RuntimeError, "%s is not a file" % path
         return None
-    
-if __name__ == "__main__": 
-    reader = Reader()
-    print reader.read("../test/S2-30dq.d1d")
-    
-    
-