Changeset c22b621 in sasview for src/sas/sascalc

Timestamp:

Sep 28, 2017 6:40:02 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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

Children:

fca1f50

Parents:

df72475 (diff), 2b538cd (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 'py3' into ticket-947-sasmodels-docs

Location:

src/sas/sascalc

Files:

• dataloader/readers/cansas_reader.py (modified) (2 diffs)
• dataloader/readers/cansas_reader_HDF5.py (modified) (1 diff)
• corfunc/corfunc_calculator.py (modified) (1 diff)
• data_util/registry.py (modified) (1 diff)
• file_converter/c_ext/__init__.py (modified) (1 diff)

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

@@ -589 +589 @@
             try:
                 unit = attr['unit']
+                # Split the units to retain backwards compatibility with
+                # projects, analyses, and saved data from v4.1.0
                 unit_list = unit.split("|")
                 if len(unit_list) > 1:
-                    self.current_dataset.xaxis(unit_list[0].strip(),
-                                               unit_list[1].strip())
                     local_unit = unit_list[1]
                 else:
@@ -1237 +1237 @@
             if units is not None:
                 toks = variable.split('.')
-                # TODO: why split() when accessing unit, but not when setting value?
                 local_unit = getattr(storage, toks[0]+"_unit")
                 if local_unit is not None and units.lower() != local_unit.lower():

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

@@ -226 +226 @@
 
                 for data_point in data_set:
-                    if data_point.dtype.char == 'S':
-                        data_point = decode(bytes(data_point))
+                    if isinstance(data_point, np.ndarray):
+                        if data_point.dtype.char == 'S':
+                            data_point = decode(bytes(data_point))
+                    else:
+                        data_point = decode(data_point)
                     # Top Level Meta Data
                     if key == u'definition':

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -177 +177 @@
         """
         Extract the interesting measurements from a correlation function
-        :param transformed_data: Fourier transformation of the
-            extrapolated data
+
+        :param transformed_data: Fourier transformation of the extrapolated data
         """
         # Calculate indexes of maxima and minima

src/sas/sascalc/data_util/registry.py

@@ -121 +121 @@
         Call the loader for the file type of path.
 
-        :raise ValueError: if no loader is available.
-        :raise KeyError: if format is not available.
+        :raises ValueError: if no loader is available.
+        :raises KeyError: if format is not available.
+
         May raise a loader-defined exception if loader fails.
         """

src/sas/sascalc/file_converter/c_ext/__init__.py

@@ +1 @@
+"""
+    Data loader for the Diamond BSL beamline.
+"""