Changeset b3de3a45 in sasview

Timestamp:

May 30, 2009 1:21:36 PM (16 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:

91128648

Parents:

09a87ae

Message:

DataLoader?: modified CanSAS reader to separate the writing of the XML from the file writing.

File:

• DataLoader/readers/cansas_reader.py (modified) (2 diffs)

DataLoader/readers/cansas_reader.py

@@ -596 +596 @@
         return data_info
 
-    def write(self, filename, datainfo):
+    def _to_xml_doc(self, datainfo):
         """
-            Write the content of a Data1D as a CanSAS XML file
-            
-            @param filename: name of the file to write
+            Create an XML document to contain the content of a Data1D
+            
             @param datainfo: Data1D object
         """
@@ -778 +777 @@
             for note in item.notes:
                 write_node(doc, node, "SASprocessnote", note)
-            
-        
+        
+        # Return the document, and the SASentry node associated with
+        # the data we just wrote
+        return doc, entry_node
+            
+    def write(self, filename, datainfo):
+        """
+            Write the content of a Data1D as a CanSAS XML file
+            
+            @param filename: name of the file to write
+            @param datainfo: Data1D object
+        """
+        # Create XML document
+        doc, sasentry = self._to_xml_doc(datainfo)
         # Write the file
         fd = open(filename, 'w')