Changeset c6ca23d in sasview

Timestamp:

Feb 18, 2014 1:47:42 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:

8599f56

Parents:

7eb3aa2

Message:

Fixed the file header writing issue for cansas data files outlined in ticket #204.

Files:

• src/sans/dataloader/readers/cansas_reader.py (modified) (1 diff)
• test/sansdataloader/test/isis_1_0_write_test.xml (added)
• test/sansdataloader/test/isis_1_1_write_test.xml (modified) (1 diff)
• test/sansdataloader/test/utest_cansas.py (modified) (3 diffs)

src/sans/dataloader/readers/cansas_reader.py

@@ -500 +500 @@
         ns = CANSAS_NS.get(self.cansas_version).get("ns")
         doc = xml.dom.minidom.Document()
+        
         main_node = doc.createElement("SASroot")
+        if self.cansas_version == "1.1":
+            pi = doc.createProcessingInstruction('xml-stylesheet', \
+                                    'type="text/xsl" href="cansasxml-html.xsl"')
+            root = doc.firstChild
+            doc.insertBefore(pi, root)
         main_node.setAttribute("version", self.cansas_version)
         main_node.setAttribute("xmlns", ns)
         main_node.setAttribute("xmlns:xsi",
                                "http://www.w3.org/2001/XMLSchema-instance")
-        main_node.setAttribute("xsi:schemaLocation", "{0} http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd".format(ns))
+        if self.cansas_version == "1.0":
+            main_node.setAttribute("xsi:schemaLocation", "cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd")
+        elif self.cansas_version == "1.1":
+            main_node.setAttribute("xsi:schemaLocation", "urn:cansas1d:1.1 http://www.cansas.org/formats/1.1/cansas1d.xsd")
         
         doc.appendChild(main_node)

test/sansdataloader/test/isis_1_1_write_test.xml

@@ -1 +1 @@
 <?xml version="1.0" ?>
-<SASroot version="1.1" xmlns="urn:cansas1d:1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:cansas1d:1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd">
+<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl"?>
+<SASroot version="1.1" xmlns="urn:cansas1d:1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/formats/1.1/cansas1d.xsd">
         <SASentry>
                 <Title>

test/sansdataloader/test/utest_cansas.py

@@ -89 +89 @@
         self.assertTrue(data.detector[0].distance == 575.0)
         self.assertTrue(data.detector[1].distance == 4145.02)
+        self.assertTrue(data.process[0].name == "Mantid generated CanSAS1D XML")
+        
+    
+    def _check_data_1_1(self, data):
         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):
         filename = "isis_1_1_write_test.xml"
@@ -105 +108 @@
         for i in range(len(dataloader)):
             self._check_data(dataloader[i])
+            self._check_data_1_1(dataloader[i])
             self._check_data(cansasreader[i])
+            self._check_data_1_1(cansasreader[i])
             reader_generic.save(filename, dataloader[i], None)
             reader2 = Reader()
@@ -161 +166 @@
         self.assertTrue(reader4.validateXML())
         
+    
+    def test_save_cansas_v1_0(self):
+        filename = "isis_1_0_write_test.xml"
+        xmlreader = XMLreader(self.isis_1_0, self.schema_1_0)
+        valid = xmlreader.validateXML()
+        self.assertTrue(valid)
+        reader_generic = Loader()
+        dataloader = reader_generic.load(self.isis_1_0)
+        reader_cansas = Reader()
+        cansasreader = reader_cansas.read(self.isis_1_0)
+        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
+            written_data = return_data[0]
+            self._check_data(written_data)
+        
 
 if __name__ == '__main__':