Changeset c125e0c in sasview for DataLoader/readers

Timestamp:

Jul 2, 2008 10:39:39 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:

9e85792

Parents:

70e9610

Message:

unit test added

Location:

DataLoader/readers

Files:

• IgorReader.py (moved) (moved from DataLoader/readers/DataReader.py) (3 diffs)
• TXT2_Reader.py (modified) (1 diff)
• TXT3_Reader.py (modified) (1 diff)
• danse_reader.py (modified) (1 diff)

DataLoader/readers/IgorReader.py

@@ -72 +72 @@
                     wavelength = float(line_toks[1])
                 except:
-                    raise ValueError,"DataReader: can't read this file, missing wavelength"
+                    raise ValueError,"IgorReader: can't read this file, missing wavelength"
                 # Distance in meters
                 try:
                     distance = float(line_toks[3])
                 except:
-                    raise ValueError,"DataReader: can't read this file, missing distance"
+                    raise ValueError,"IgorReader: can't read this file, missing distance"
                 
             if line.count("LAMBDA")>0:
@@ -103 +103 @@
                     or center_x == None \
                     or center_y == None:
-                    raise ValueError, "Missing information in data file"
+                    raise ValueError, "IgorReader:Missing information in data file"
                 
             if dataStarted == True:
@@ -165 +165 @@
         self.center_x = center_x
         self.center_y = center_y
-        
+        print "IgorReader reading %s"%self.file
         return Z, xmin-xstep/2.0, xmax+xstep/2.0, ymin-ystep/2.0, ymax+ystep/2.0
      

DataLoader/readers/TXT2_Reader.py

@@ -59 +59 @@
                     #print "went here"
                     #return value
-                    raise ValueError, "TXT2_Reader can't read"
+                    raise ValueError, "TXT2_Reader can't read %s"%path
                 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"
+                    print "TXT2_Reader reading  %s\n" %path
                     return self.x,self.y,self.dy
         return None

DataLoader/readers/TXT3_Reader.py

@@ -61 +61 @@
                
                 if (self.x==[] or self.y==[])and (self.dy==[]):
-                    raise ValueError, "TXT3_Reader can't read"
+                    raise ValueError, "TXT3_Reader can't read %s"%path
                 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"
+                    print "TXT3_Reader reading %s \n" %path
                     return self.x,self.y,self.dy
                 

DataLoader/readers/danse_reader.py

@@ -207 +207 @@
             if not fversion==1.1:
                 #output.error  = E
-                raise ValueError,"Danse_reader can't read this file"
+                raise ValueError,"Danse_reader can't read this file %s"%filename
             else:
-                print "Danse_reader Reading : \n"
+                print "Danse_reader Reading %s \n"%filename
                 return output