Changeset 4699761 in sasview for src

Timestamp:

Aug 11, 2016 8:21:59 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:

348bc8b

Parents:

9d17c1d (diff), 713cc1c (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/calculator/BaseComponent.py (modified) (4 diffs)
• sascalc/dataloader/readers/associations.py (modified) (2 diffs)
• sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)
• 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/convert_bsl_thread.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/calculator/BaseComponent.py

@@ -7 +7 @@
 # imports
 import copy
+from collections import OrderedDict
+
 import numpy
 #TO DO: that about a way to make the parameter
@@ -254 +256 @@
         Return a list of all available parameters for the model
         """
-        list = self.params.keys()
+        list = _ordered_keys(self.params)
         # WARNING: Extending the list with the dispersion parameters
         list.extend(self.getDispParamList())
@@ -264 +266 @@
         """
         list = []
-
-        for item in self.dispersion.keys():
-            for p in self.dispersion[item].keys():
+        for item in _ordered_keys(self.dispersion):
+            for p in _ordered_keys(self.dispersion[item]):
                 if p not in ['type']:
                     list.append('%s.%s' % (item.lower(), p.lower()))
@@ -309 +310 @@
         """
         raise ValueError, "Model operation are no longer supported"
+
+
+def _ordered_keys(d):
+    keys = list(d.keys())
+    if not isinstance(d, OrderedDict):
+        keys.sort()
+    return keys

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

@@ -92 +92 @@
     import nexus_reader
     import sesans_reader
+    import cansas_reader_HDF5
+    import anton_paar_saxs_reader
     registry_function(sesans_reader)
     registry_function(abs_reader)
@@ -102 +104 @@
     #registry_function(tiff_reader)
     registry_function(nexus_reader)
-    
+    registry_function(cansas_reader_HDF5)
+    registry_function(anton_paar_saxs_reader)
     return True

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

@@ -957 +957 @@
             written = written | self.write_node(pix, "z", item.pixel_size.z,
                                                 {"unit": item.pixel_size_unit})
-            written = written | self.write_node(det, "slit_length",
-                                                item.slit_length,
-                                                {"unit": item.slit_length_unit})
             if written == True:
                 self.append(pix, det)
+            self.write_node(det, "slit_length", item.slit_length,
+                {"unit": item.slit_length_unit})
+
 
     def _write_process_notes(self, datainfo, entry_node):