Changeset d112c30 in sasview for src/sas

Timestamp:

Jul 21, 2016 4:09:56 AM (8 years ago)

Author:

lewis

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

df332d8

Parents:

7c8ddb83

Message:

Write run_name to SASentry.name instead of Run.name to agree with Mantid output

Location:

src/sas

Files:

• sascalc/dataloader/readers/cansas_reader.py (modified) (4 diffs)
• sasgui/perspectives/file_converter/converter_panel.py (modified) (2 diffs)

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

@@ -1013 +1013 @@
         return doc, entry_node
 
-    def _to_xml_doc(self, datainfo):
+    def _to_xml_doc(self, datainfo, sasentry_attrs=None):
         """
         Create an XML document to contain the content of a Data1D
@@ -1031 +1031 @@
         doc = self.create_tree(base_element)
         # Create SASentry Element
-        entry_node = self.create_element("SASentry")
+        entry_node = self.create_element("SASentry", sasentry_attrs)
         root = doc.getroot()
         root.append(entry_node)
@@ -1080 +1080 @@
         return False
 
-    def write(self, filename, datainfo):
+    def write(self, filename, datainfo, sasentry_attrs=None):
         """
         Write the content of a Data1D as a CanSAS XML file
@@ -1088 +1088 @@
         """
         # Create XML document
-        doc, _ = self._to_xml_doc(datainfo)
+        doc, _ = self._to_xml_doc(datainfo, sasentry_attrs)
         # Write the file
         file_ref = open(filename, 'w')

src/sas/sasgui/perspectives/file_converter/converter_panel.py

@@ -74 +74 @@
     def convert_to_cansas(self, data, filename):
         reader = CansasReader()
-        reader.write(filename, data)
+        reader.write(filename, data,
+            sasentry_attrs={ 'name': self.run_name })
 
     def extract_data(self, filename):
@@ -127 +128 @@
         data.filename = output_path.split('\\')[-1]
 
-        if self.run is not None:
-            run = self.run
-            run_name = self.run_name
-
-            if not isinstance(run, list) and run is not None:
-                self.run = [run]
-            else:
-                run = run[0]
-
-            if not isinstance(run_name, dict):
-                if run_name is not None:
-                    self.run_name = { run: run_name }
-                else:
-                    self.run_name = {}
-            elif run_name != {}:
-                self.run_name[run] = run_name.values()[0]
-        else:
+        if self.run is None:
             self.run = []
-            self.run_name = {}
+        elif not isinstance(self.run, list):
+            self.run = [self.run]
 
         metadata = {
             'title': self.title,
             'run': self.run,
-            'run_name': self.run_name,
             'intrument': self.instrument,
             'detector': [self.detector],