Changeset 76cd1ae in sasview for test

Timestamp:

Jan 14, 2014 3:53:36 PM (11 years ago)

Author:

Jeff Krzywon <jeffery.krzywon@…>

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:

16bd5ca

Parents:

083e993

Message:

Fix for the datainfo window not loading and bug fixes for the cansas data reader.

Fixes/changes:
(1) datainfo window is now loading for every data file I can test
(2) transmission spectrum information (but not data) is listed in datainfo window
(3) more than one transmission spectra can be loaded for each Data1D object
(4) fixed a bug in the cansas reader that allowed any file to be loaded as data if and only if another data file was already loaded
(5) fixed the cansas writer to include transmission spectrum data and output data in strict canSAS format
(6) increased the pylint score of cansas_constants.py to above 7
(7) increased the pylint score for all files I have modified

Location:

test/sansdataloader/test

Files:

• ISIS_1_1_doubletrans.xml (added)
• utest_cansas.py (modified) (3 diffs)

test/sansdataloader/test/utest_cansas.py

@@ -38 +38 @@
         self.isis_1_1 = "ISIS_1_1.xml"
         self.isis_1_1_notrans = "ISIS_1_1_notrans.xml"
+        self.isis_1_1_doubletrans = "ISIS_1_1_doubletrans.xml"
         self.schema_1_0 = "cansas1d_v1_0.xsd"
         self.schema_1_1 = "cansas1d_v1_1.xsd"
@@ -77 +78 @@
             self.assertFalse(valid)
             
+            
+    def _check_data(self, data):
+        self.assertTrue(data.title == "TK49 c10_SANS")
+        self.assertTrue(data.x.size == 138)
+        self.assertTrue(len(data.meta_data) == 2)
+        self.assertTrue(data.detector[0].distance_unit == "mm")
+        self.assertTrue(data.detector[1].distance_unit == "mm")
+        self.assertTrue(data.detector[0].name == "HAB")
+        self.assertTrue(data.detector[1].name == "main-detector-bank")
+        self.assertTrue(data.detector[0].distance == 575.0)
+        self.assertTrue(data.detector[1].distance == 4145.02)
+        spectrum = data.trans_spectrum[0]
+        self.assertTrue(len(spectrum.wavelength) == 138)
+        self.assertTrue(data.process[0].name == "Mantid generated CanSAS1D XML")
+        
         
     def test_cansas_xml(self):
@@ -83 +99 @@
         valid = xmlreader.validateXML()
         self.assertTrue(valid)
-        reader = Reader()
-        dataloader = reader.read(self.isis_1_1)
-        for data in dataloader:
-            self.assertTrue(data.title == "TK49 c10_SANS")
-            self.assertTrue(data.x.size == 138)
-            self.assertTrue(len(data.meta_data) == 2)
-            self.assertTrue(data.detector[0].distance_unit == "mm")
-            reader.write(filename, data)
+        reader_generic = Loader()
+        dataloader = reader_generic.load(self.isis_1_1)
+        reader_cansas = Reader()
+        cansasreader = reader_cansas.read(self.isis_1_1)
+        for i in range(len(dataloader)):
+            self._check_data(dataloader[i])
+            self._check_data(cansasreader[i])
+            reader_generic.save(filename, dataloader[i], None)
             reader2 = Reader()
             return_data = reader2.read(filename)
             data_new = return_data
-            self.data = return_data[0]
-            self.assertTrue(self.data.x.size == 138)
-            self.assertTrue(len(self.data.meta_data) == 2)
-            self.assertTrue(self.data.detector[0].distance_unit == "mm")
-            self.assertTrue(self.data.title == "TK49 c10_SANS")
+            written_data = return_data[0]
+            self._check_data(written_data)
+            
+    
+    def test_double_trans_spectra(self):
+        xmlreader = XMLreader(self.isis_1_1_doubletrans, self.schema_1_1)
+        self.assertTrue(xmlreader.validateXML())
+        reader = Loader()
+        data = reader.load(self.isis_1_1_doubletrans)
+        for item in data:
+            self._check_data(item)
+    
                     
     def test_entry_name_recurse(self):