Changeset c125e0c in sasview

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

Files:

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

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
         

DataLoader/test/testLoad.py

@@ -8 +8 @@
 from DataLoader.loader import  Loader
 from DataLoader.readers import TXT3_Reader,TXT2_Reader
-from DataLoader.readers import DataReader,danse_reader,tiff_reader
+from DataLoader.readers import IgorReader,danse_reader,tiff_reader
 
 class testLoader(unittest.TestCase):
     """ test fitting """
-    def testLoad(self):
-        """ 
-            test module Load
-        """
-        #Creating a loader
-        L=Loader()
-        
-        #creating readers
-        read1=TXT2_Reader.Reader()
-        read2=TXT3_Reader.Reader()
-        read3=DataReader.Reader()
-        read4=danse_reader.Reader()
-        read5=tiff_reader.Reader()
-        #for each readers set an extensions inside the loader
-        L.__setitem__('.txt',read1)
-        L.__setitem__('.dat',read1)
-        L.__setitem__('.txt',read2)
-        L.__setitem__('.dat',read2)
-        L.__setitem__('.ASC',read3)
-        L.__setitem__('.sans',read4)
-        L.__setitem__('.tif',read5)
-        L.__setitem__('.jpg',read5)
-        L.__setitem__('.png',read5)
-        L.__setitem__('.jpeg',read5)
-        L.__setitem__('.gif',read5)
-        L.__setitem__('.bmp',read5)
-        
-        #test reading empty file
-        self.assertEqual(L.load('empty.txt'),None)
+    #Creating a loader
+    L=Loader()
+    
+    #creating readers
+    read1=TXT2_Reader.Reader()
+    read2=TXT3_Reader.Reader()
+    read3=IgorReader.Reader()
+    read4=danse_reader.Reader()
+    read5=tiff_reader.Reader()
+    #for each readers set an extensions inside the loader
+    L.__setitem__('.txt',read2)
+    L.__setitem__('.txt',read1)
+    L.__setitem__('.dat',read1)
+    
+    L.__setitem__('.dat',read2)
+    L.__setitem__('.ASC',read3)
+    L.__setitem__('.sans',read4)
+    L.__setitem__('.tif',read5)
+    L.__setitem__('.jpg',read5)
+    L.__setitem__('.png',read5)
+    L.__setitem__('.jpeg',read5)
+    L.__setitem__('.gif',read5)
+    L.__setitem__('.bmp',read5)
+       
+    def testLoad1(self):
+        """test reading empty file, no file can read it"""
+        self.assertEqual(self.L.load('empty.txt'),None)
+        self.assertEqual( self.L.getAcTReader('empty.txt'),None)
          
-        #print L.loadData('test_2_columns.txt') 
-        xload,yload,dyload=L.load('test_2_columns.txt') 
-        x=[.83954,0.204082,0.408163,0.612245,0.816327,1.02041,1.22449,1.42857,1.63265]
+        #Testing loading a txt file of 2 columns, the only reader should be read1 
+        xload,yload,dyload=self.L.load('test_2_columns.txt') 
+        x=[2.83954,0.204082,0.408163,0.612245,0.816327,1.02041,1.22449,1.42857,1.63265]
         y=[0.6,3.44938, 5.82026,5.27591,5.2781,5.22531,7.47487,7.85852,10.2278]
         dx=[]
@@ -50 +49 @@
         self.assertEqual(len(xload),len(x))
         self.assertEqual(len(yload),len(y))
-        self.assertEqual( L.getAcTReader('test_2_columns.txt'),DataLoader.readers.TXT2_Reader.Reader)
+        self.assertEqual(len(dyload),0)
+        for i in range(len(x)):
+            self.assertEqual(xload[i],x[i])
+            self.assertEqual(yload[i],y[i])
+        self.assertEqual( self.L.getAcTReader('test_2_columns.txt'),self.read1.__class__)
+    
+    def testLoad2(self):
+        """Testing loading a txt file of 3 columns, the only reader should be read2"""
+        xload,yload,dyload= self.L.load('test_3_columns.txt') 
+        x=[0,0.204082,0.408163,0.612245,0.816327,1.02041,1.22449]    
+        y=[2.83954,3.44938,5.82026,5.27591,5.2781,5.22531,7.47487]
+        dx=[]
+        dy=[0.6,0.676531,0.753061,0.829592,0.906122,0.982653,1.05918]
+        self.assertEqual(len(xload),len(x))
+        self.assertEqual(len(yload),len(y))
+        self.assertEqual(len(dyload),len(dy))
+        for i in range(len(x)):
+            self.assertEqual(xload[i],x[i])
+            self.assertEqual(yload[i],y[i])
+            self.assertEqual(dyload[i],dy[i])
+        self.assertEqual(self.L.getAcTReader('test_3_columns.txt'),self.read2.__class__)
+    
+    def testload3(self):
+        """ Testing loading Igor data"""
+        #tested good file.asc
+        Z,xmin, xmax, ymin, ymax= self.L.load('MAR07232_rest.ASC') 
+        self.assertEqual(xmin,-0.018558945804750416)
+        self.assertEqual(xmax, 0.016234058202440633,)
+        self.assertEqual(ymin,-0.01684257151702391)
+        self.assertEqual(ymax,0.017950440578015116)
+        self.assertEqual(self.L.getAcTReader('MAR07232_rest.ASC'),self.read3.__class__)
+        #tested corrupted file.asc
+        self.assertEqual(self.L.load('AR07232_rest.ASC') ,None)
+    
+    def testload4(self):
+        """ Testing loading danse file"""
+        #tested good file.sans
+        data=self.L.load('MP_New.sans')
+        
+        self.assertEqual(data.__class__,danse_reader.ReaderInfo)
+        self.assertEqual(self.L.getAcTReader('MP_New.sans'),self.read4.__class__)
+        #tested corrupted file.sans
+        self.assertEqual(self.L.load('P_New.sans'),None)
+    
+    def testload5(self):
+        """ Testing loading image file"""
+        data=self.L.load('angles_flat.png')
+        self.assertEqual(data.__class__,tiff_reader.ReaderInfo)
+        self.assertEqual(self.L.getAcTReader('angles_flat.png'),self.read5.__class__)
         
         
-        
-        
-