Changeset fe78c7b in sasview for DataLoader/test

Timestamp:

Sep 5, 2009 11:45:29 AM (15 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:

7d8c41f

Parents:

4deaec6

Message:

DataLoader?: exception no longer raised when units are wrong for an entry; the entry is not loaded and an error is logged instead. Loader info is now stored.

Location:

DataLoader/test

Files:

• cansas1d_badunits.xml (added)
• utest_abs_reader.py (modified) (8 diffs)
• utest_ascii.py (modified) (1 diff)
• write_test.xml (added)

DataLoader/test/utest_abs_reader.py

@@ -13 +13 @@
     
     def setUp(self):
-        self.data = Loader().load("jan08002.ABS")
+        from DataLoader.readers.abs_reader import Reader
+        self.data = Reader().read("jan08002.ABS")
         
     def test_checkdata(self):
@@ -24 +25 @@
         """
         self.assertEqual(self.data.filename, "jan08002.ABS")
+        self.assertEqual(self.data.meta_data['loader'], "IGOR 1D")
         
         self.assertEqual(self.data.source.wavelength_unit, 'A')
@@ -69 +71 @@
         """
         self.assertEqual(self.data.filename, "S2-30dq.d1d")
+        # THIS FILE FORMAT IS CURRENTLY READ BY THE ASCII READER
+        self.assertEqual(self.data.meta_data['loader'], "ASCII")
         self.assertEqual(len(self.data.x), 134)
         self.assertEqual(len(self.data.y), 134)
@@ -93 +97 @@
         """
         self.assertEqual(self.data.filename, "MAR07232_rest.ASC")
+        self.assertEqual(self.data.meta_data['loader'], "IGOR 2D")
         
         self.assertEqual(self.data.source.wavelength_unit, 'A')
@@ -127 +132 @@
         """
         self.assertEqual(self.data.filename, "MP_New.sans")
+        self.assertEqual(self.data.meta_data['loader'], "DANSE")
         
         self.assertEqual(self.data.source.wavelength_unit, 'A')
@@ -169 +175 @@
         
         self.assertEqual(self.data.run[0], "1234")
+        self.assertEqual(self.data.meta_data['loader'], "CanSAS 1D")
+        self.assertEqual(len(self.data.errors), 0)
         
         # Data
@@ -325 +333 @@
         self._checkdata()
         
+    def test_badunits(self):
+        """
+            Check units.
+            Note that not all units are available.
+        """
+        filename = "cansas1d_badunits.xml"
+        self.data = Loader().load(filename)
+        self.assertEqual(self.data.filename, filename)
+        # The followed should not have been loaded
+        self.assertEqual(self.data.sample.thickness, None)
+        # This one should
+        self.assertEqual(self.data.sample.transmission, 0.327)
+        
+        self.assertEqual(self.data.meta_data['loader'], "CanSAS 1D")
+        self.assertEqual(len(self.data.errors), 1)
+        
         
     def test_slits(self):
@@ -356 +380 @@
 
 if __name__ == '__main__':
+    import logging
+    logging.basicConfig(level=logging.INFO,
+                        format='%(asctime)s %(levelname)s %(message)s',
+                        filename='utest_abs_reader.log',
+                        filemode='w')
     unittest.main()
    

DataLoader/test/utest_ascii.py

@@ -24 +24 @@
         self.assertEqual(f.x[0],0.002618)
         self.assertEqual(f.x[9],0.0497)
+        
+        self.assertEqual(f.meta_data['loader'],"ASCII")
         
     def test_truncated_1(self):