Changeset ef51b63 in sasview

Timestamp:

Sep 15, 2016 8:33:57 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

4141155

Parents:

132db16

git-author:

Jeff Krzywon <krzywon@…> (08/05/16 11:17:27)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)

Message:

Modified Cansas XML reader to attempt to load data that doesn't fully meet the cansas format.

Files:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (6 diffs)
• src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid.xsd (added)
• test/sasdataloader/test/cansas1d_notitle.xml (added)
• test/sasdataloader/test/utest_cansas.py (modified) (2 diffs)

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -34 +34 @@
 from xml.dom.minidom import parseString
 
+## TODO: Refactor to load multiple <SASData> as separate Data1D objects
+## TODO: Refactor to allow invalid XML, but give a useful warning when loaded
+
 _ZERO = 1e-16
 PREPROCESS = "xmlpreprocess"
@@ -133 +136 @@
         return False
 
-    def load_file_and_schema(self, xml_file):
+    def load_file_and_schema(self, xml_file, schema_path=""):
         """
         Loads the file and associates a schema, if a known schema exists
@@ -149 +152 @@
         # Generic values for the cansas file based on the version
         cansas_defaults = CANSAS_NS.get(self.cansas_version, "1.0")
-        schema_path = "{0}/sas/sascalc/dataloader/readers/schema/{1}".format\
+        if schema_path == "":
+            schema_path = "{0}/sas/sascalc/dataloader/readers/schema/{1}".format\
                 (base, cansas_defaults.get("schema")).replace("\\", "/")
 
@@ -156 +160 @@
         return cansas_defaults
 
-    def read(self, xml_file):
+    ## TODO: Test loading invalid CanSAS XML files and see if this works
+    ## TODO: Once works, try adding a warning that the data is invalid
+    def read(self, xml_file, schema_path=""):
         """
         Validate and read in an xml_file file in the canSAS format.
@@ -174 +180 @@
             if extension in self.ext or self.allow_all:
                 # Get the file location of
-                cansas_defaults = self.load_file_and_schema(xml_file)
+                cansas_defaults = self.load_file_and_schema(xml_file, schema_path)
 
                 # Try to load the file, but raise an error if unable to.
@@ -225 +231 @@
                 except:
                     # If the file does not match the schema, raise this error
-                    raise RuntimeError, "%s cannot be read" % xml_file
+                    schema_path = "{0}/sas/sascalc/dataloader/readers/schema/cansas1d_invalid.xsd"
+                    invalid_xml = self.find_invalid_xml()
+                    invalid_xml = "\n\nThe loaded xml file does not fully meet the CanSAS v1.x specification. SasView " + \
+                                  "loaded as much of the data as possible.\n\n" + invalid_xml
+                    self.errors.add(invalid_xml)
+                    self.set_schema(schema_path)
+                    if self.is_cansas():
+                        output = self.read(xml_file, schema_path)
+                    else:
+                        raise RuntimeError, "%s cannot be read" % xml_file
                 return output
         # Return a list of parsed entries that dataloader can manage

test/sasdataloader/test/utest_cansas.py

@@ -37 +37 @@
         self.cansas1d_slit = "cansas1d_slit.xml"
         self.cansas1d_units = "cansas1d_units.xml"
+        self.cansas1d_notitle = "cansas1d_notitle.xml"
         self.isis_1_0 = "ISIS_1_0.xml"
         self.isis_1_1 = "ISIS_1_1.xml"
@@ -171 +172 @@
 
 
+    def test_invalid_cansas(self):
+        list = self.loader.load(self.cansas1d_notitle)
+        data = list[0]
+        self.assertTrue(data.x.size == 2)
+        self.assertTrue(len(data.meta_data) == 3)
+        self.assertTrue(len(data.errors) == 1)
+        self.assertTrue(data.detector[0].distance_unit == "mm")
+        self.assertTrue(data.detector[0].name == "fictional hybrid")
+        self.assertTrue(data.detector[0].distance == 4150)
+
+
     def test_old_cansas_files(self):
         reader1 = XMLreader(self.cansas1d, self.schema_1_0)