Changeset bb03739 in sasview for DataLoader/readers

Timestamp:

Jul 1, 2008 7:01:30 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

cbe6dbe

Parents:

2a92852

Message:

unit test added.still working on it

Location:

DataLoader/readers

Files:

• DataReader.py (modified) (1 diff)
• TXT3_Reader.py (modified) (1 diff)
• __init__.py (added)
• danse_reader.py (modified) (1 diff)
• tiff_reader.py (modified) (1 diff)

DataLoader/readers/DataReader.py

@@ -3 +3 @@
 from copy import deepcopy
 import math
-class DataReader:
+class Reader:
     """ Simple data reader for Igor data files """
     

DataLoader/readers/TXT3_Reader.py

@@ -15 +15 @@
         self.filename = filename
         
+        
     def read(self,path, format=None):
         """ Store the values loaded from file in local variables 
             can read 3 columns of data
         """
+        
         if not path == None:
-            input_f =  open(path,'r')
-            buff = input_f.read()
-            lines = buff.split('\n')
-            self.x=[]
-            self.y=[]
-            self.dx = [] 
-            self.dy=[]
-            value="can't read" 
-            for line in lines:
-                toks = line.split()
-                try:  
-                    x = float(toks[0])
-                    y = float(toks[1]) 
-                    dy = float(toks[2])
-                   
-                    self.x.append(x)
-                    self.y.append(y)
-                    self.dy.append(dy)
-               
-                except:
-                    print "READ ERROR", line
-        
-                self.dx = numpy.zeros(len(self.x))
-                # Sanity check
-                if not len(self.x) == len(self.dx):
-                    raise ValueError, "x and dx have different length"
-                if not len(self.y) == len(self.dy):
-                    raise ValueError, "y and dy have different length"
-           
-            if (self.x==[] or self.y==[])and (self.dy==[]):
+            read_it = False
+            ext=['.txt','.dat']  
+            for item in ext:
+                if path.lower().find(item)>=0:
+                    read_it = True
+            print "this is the flag",read_it, path.lower()
+            if read_it==False:
                 raise ValueError, "txtReader can't read"
             else:
-                #msg="txtReader  Reading:\n"+"this x :"+ str(self.x) +"\n"+"this y:"+str(self.y)+"\n"+"this dy :"+str(self.dy)+"\n"
-                #return msg
-                print "TXT3_Reader reading: \n"
-                return self.x,self.y,self.dy
+                input_f =  open(path,'r')
+                buff = input_f.read()
+                lines = buff.split('\n')
+                self.x=[]
+                self.y=[]
+                self.dx = [] 
+                self.dy=[]
+                value="can't read" 
+                for line in lines:
+                    toks = line.split()
+                    try:  
+                        x = float(toks[0])
+                        y = float(toks[1]) 
+                        dy = float(toks[2])
+                       
+                        self.x.append(x)
+                        self.y.append(y)
+                        self.dy.append(dy)
+                   
+                    except:
+                        print "READ ERROR", line
+            
+                    self.dx = numpy.zeros(len(self.x))
+                    # Sanity check
+                    if not len(self.x) == len(self.dx):
+                        raise ValueError, "x and dx have different length"
+                    if not len(self.y) == len(self.dy):
+                        raise ValueError, "y and dy have different length"
+               
+                if (self.x==[] or self.y==[])and (self.dy==[]):
+                    raise ValueError, "txtReader can't read"
+                else:
+                    #msg="txtReader  Reading:\n"+"this x :"+ str(self.x) +"\n"+"this y:"+str(self.y)+"\n"+"this dy :"+str(self.dy)+"\n"
+                    #return msg
+                    print "TXT3_Reader reading: \n"
+                    return self.x,self.y,self.dy
                 
   

DataLoader/readers/danse_reader.py

@@ -40 +40 @@
     ## Error on each pixel
     error = None
-class DataReader:
+class Reader:
     """
         Example data manipulation

DataLoader/readers/tiff_reader.py

@@ -36 +36 @@
     error = None
     
-class DataReader:
+class Reader:
     """
         Example data manipulation