Changeset aa749ac in sasview for DataLoader/readers

Timestamp:

Jul 2, 2008 9:30:33 AM (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:

70e9610

Parents:

cbe6dbe

Message:

 

Location:

DataLoader/readers

Files:

• TXT2_Reader.py (modified) (1 diff)
• TXT3_Reader.py (modified) (5 diffs)

DataLoader/readers/TXT2_Reader.py

@@ -18 +18 @@
         """ Store the values loaded from file in local variables """
         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])
-                    self.x.append(x)
-                except:
-                    print "READ ERROR", line
-                try:
-                    y = float(toks[1])
-                    self.y.append(y)
-                except:
-                    print "READ ERROR", line
-                try:
-                    dy=float(toks[2])
-                    self.dy.append(dy)
-
-                except:
-                    print "READ ERROR", line
-
-            if(( self.x==[])or (self.y==[])) or (self.dy !=[]):
-                print "went here"
-                #return value
-                raise ValueError, "Reader1 can't read"
+            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:
+                return None
             else:
-                #msg="R1 reading: \n"+"this x :"+ str(self.x) +"\n"+"this y:"+str(self.y)+"\n"+"this dy :"+str(self.dy)+"\n"
-                #return msg
-                print "TXT2_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=[]
+                for line in lines:
+                    toks = line.split()
+                    try:
+                        x = float(toks[0])
+                        self.x.append(x)
+                    except:
+                        pass
+                        #print "READ ERROR", line
+                    try:
+                        y = float(toks[1])
+                        self.y.append(y)
+                    except:
+                        pass
+                        #print "READ ERROR", line
+                    try:
+                        dy=float(toks[2])
+                        self.dy.append(dy)
+    
+                    except:
+                        pass
+                        #print "READ ERROR", line
+    
+                if(( self.x==[])or (self.y==[])) or (self.dy !=[]):
+                    #print "went here"
+                    #return value
+                    raise ValueError, "TXT2_Reader can't read"
+                else:
+                    #msg="R1 reading: \n"+"this x :"+ str(self.x) +"\n"+"this y:"+str(self.y)+"\n"+"this dy :"+str(self.dy)+"\n"
+                    #return msg
+                    print "TXT2_Reader reading \n"
+                    return self.x,self.y,self.dy
+        return None
    
        

DataLoader/readers/TXT3_Reader.py

@@ -27 +27 @@
                 if path.lower().find(item)>=0:
                     read_it = True
-            print "this is the flag",read_it, path.lower()
+            #print "this is the flag",read_it, path.lower()
             if read_it==False:
-                raise ValueError, "txtReader can't read"
+                return None
             else:
                 input_f =  open(path,'r')
@@ -38 +38 @@
                 self.dx = [] 
                 self.dy=[]
-                value="can't read" 
                 for line in lines:
                     toks = line.split()
@@ -51 +50 @@
                    
                     except:
-                        print "READ ERROR", line
+                        pass
+                        #print "READ ERROR", line
             
                     self.dx = numpy.zeros(len(self.x))
@@ -61 +61 @@
                
                 if (self.x==[] or self.y==[])and (self.dy==[]):
-                    raise ValueError, "txtReader can't read"
+                    raise ValueError, "TXT3_Reader 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"
@@ -68 +68 @@
                     return self.x,self.y,self.dy
                 
-  
+        return None
 if __name__ == "__main__": 
     read= Reader()