Changeset fdd3ba1 in sasview for src/sas

Timestamp:

Aug 19, 2016 7:21:28 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:

c476457

Parents:

d3e1870 (diff), 4abcc93a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into file-converter

Location:

src/sas

Files:

• sascalc/dataloader/readers/cansas_reader.py (modified) (8 diffs)
• sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (4 diffs)
• sascalc/file_converter/__init__.py (added)
• sascalc/file_converter/bsl_loader.py (added)
• sascalc/file_converter/c_ext/__init__.py (added)
• sascalc/file_converter/c_ext/bsl_loader.c (added)
• sascalc/file_converter/c_ext/bsl_loader.h (added)
• sascalc/file_converter/cansas_writer.py (added)
• sascalc/file_converter/nxcansas_writer.py (added)
• sascalc/file_converter/otoko_loader.py (added)
• sascalc/file_converter/red2d_writer.py (added)
• sasgui/perspectives/file_converter/__init__.py (added)
• sasgui/perspectives/file_converter/converter_panel.py (added)
• sasgui/perspectives/file_converter/converter_widgets.py (added)
• sasgui/perspectives/file_converter/file_converter.py (added)
• sasgui/perspectives/file_converter/frame_select_dialog.py (added)
• sasgui/perspectives/file_converter/media/file_converter_help.rst (added)
• sasgui/perspectives/file_converter/meta_panels.py (added)

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

@@ -206 +206 @@
         # Go through each child in the parent element
         for node in dom:
+            attr = node.attrib
+            name = attr.get("name", "")
+            type = attr.get("type", "")
             # Get the element name and set the current names level
             tagname = node.tag.replace(self.base_ns, "")
@@ -223 +226 @@
                 ## Recursion step to access data within the group
                 self._parse_entry(node)
+                if tagname == "SASsample":
+                    self.current_datainfo.sample.name = name
+                elif tagname == "beam_size":
+                    self.current_datainfo.source.beam_size_name = name
+                elif tagname == "SAScollimation":
+                    self.collimation.name = name
+                elif tagname == "aperture":
+                    self.aperture.name = name
+                    self.aperture.type = type
                 self.add_intermediate()
             else:
@@ -229 +241 @@
                 ## If this is a dataset, store the data appropriately
                 if tagname == 'Run':
+                    self.current_datainfo.run_name[data_point] = name
                     self.current_datainfo.run.append(data_point)
                 elif tagname == 'Title':
@@ -369 +382 @@
                     self.process.notes.append(data_point)
                 elif tagname == 'term' and self.parent_class == 'SASprocess':
-                    self.process.term.append(data_point)
+                    unit = attr.get("unit", "")
+                    dic = {}
+                    dic["name"] = name
+                    dic["value"] = data_point
+                    dic["unit"] = unit
+                    self.process.term.append(dic)
 
                 ## Transmission Spectrum
@@ -531 +549 @@
             self.current_datainfo.collimation.append(self.collimation)
             self.collimation = Collimation()
-        elif self.parent_class == 'SASaperture':
+        elif self.parent_class == 'aperture':
             self.collimation.aperture.append(self.aperture)
             self.aperture = Aperture()
@@ -646 +664 @@
         err_msg = None
         default_unit = None
-        if 'unit' in attr and attr.get('unit') is not None and not self.ns_list.ns_optional:
+        if not isinstance(node_value, float):
+            node_value = float(node_value)
+        if 'unit' in attr and attr.get('unit') is not None:
             try:
                 local_unit = attr['unit']
-                if not isinstance(node_value, float):
-                    node_value = float(node_value)
                 unitname = self.ns_list.current_level.get("unit", "")
                 if "SASdetector" in self.names:
@@ -907 +925 @@
                 self.write_node(point, "I", datainfo.y[i],
                                 {'unit': datainfo.y_unit})
-            if datainfo.dy != None and len(datainfo.dy) > i:
+            if datainfo.dy is not None and len(datainfo.dy) > i:
                 self.write_node(point, "Idev", datainfo.dy[i],
                                 {'unit': datainfo.y_unit})
-            if datainfo.dx != None and len(datainfo.dx) > i:
+            if datainfo.dx is not None and len(datainfo.dx) > i:
                 self.write_node(point, "Qdev", datainfo.dx[i],
                                 {'unit': datainfo.x_unit})
-            if datainfo.dxw != None and len(datainfo.dxw) > i:
+            if datainfo.dxw is not None and len(datainfo.dxw) > i:
                 self.write_node(point, "dQw", datainfo.dxw[i],
                                 {'unit': datainfo.x_unit})
-            if datainfo.dxl != None and len(datainfo.dxl) > i:
+            if datainfo.dxl is not None and len(datainfo.dxl) > i:
                 self.write_node(point, "dQl", datainfo.dxl[i],
                                 {'unit': datainfo.x_unit})
@@ -1184 +1202 @@
                 if isinstance(term, list):
                     value = term['value']
+                    del term['value']
+                elif isinstance(term, dict):
+                    value = term.get("value")
                     del term['value']
                 else:

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

@@ -76 +76 @@
                 ## Add the last data set to the list of outputs
                 self.add_data_set()
+                ## Close the data file
+                self.raw_data.close()
         ## Return data set(s)
         return self.output
@@ -189 +191 @@
 
                     ## Sample Information
-                    elif key == u'Title' and self.parent_class == u'SASsample':
+                    elif key == u'Title' and self.parent_class == u'SASsample': # CanSAS 2.0 format
+                        self.current_datainfo.sample.name = data_point
+                    elif key == u'name' and self.parent_class == u'SASsample': # NXcanSAS format
                         self.current_datainfo.sample.name = data_point
                     elif key == u'thickness' and self.parent_class == u'SASsample':
@@ -213 +217 @@
                     elif key == u'name' and self.parent_class == u'SASprocess':
                         self.process.name = data_point
-                    elif key == u'Title' and self.parent_class == u'SASprocess':
+                    elif key == u'Title' and self.parent_class == u'SASprocess': # CanSAS 2.0 format
+                        self.process.name = data_point
+                    elif key == u'name' and self.parent_class == u'SASprocess': # NXcanSAS format
                         self.process.name = data_point
                     elif key == u'description' and self.parent_class == u'SASprocess':
@@ -376 +382 @@
         self.current_datainfo = DataInfo()
 
+
     def _initialize_new_data_set(self, parent_list = None):
         """