Changeset a78a02f in sasview

Timestamp:

Sep 7, 2017 12:04:43 PM (7 years ago)

Author:

krzywon

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

Children:

7582df3

Parents:

b54440d

Message:

Make suggested changes for unit test fixes.

Files:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (4 diffs)
• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)
• src/sas/sascalc/dataloader/readers/danse_reader.py (modified) (1 diff)
• test/sasdataloader/test/utest_abs_reader.py (modified) (3 diffs)
• test/sasdataloader/test/utest_ascii.py (modified) (1 diff)
• test/sasdataloader/test/utest_sesans.py (modified) (1 diff)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -6 +6 @@
 
 import os
+import re
 import logging
 import numpy as np
@@ -106 +107 @@
         for data in self.output:
             if isinstance(data, Data1D):
+                # Normalize the units for
+                data.x_unit = self.format_unit(data.x_unit)
+                data.y_unit = self.format_unit(data.y_unit)
                 # Sort data by increasing x and remove 1st point
                 ind = np.lexsort((data.y, data.x))
@@ -131 +135 @@
         for dataset in self.output:
             if isinstance(dataset, Data2D):
+                # Normalize the units for
+                dataset.x_unit = self.format_unit(dataset.Q_unit)
+                dataset.y_unit = self.format_unit(dataset.I_unit)
                 dataset.data = dataset.data.astype(np.float64)
                 dataset.qx_data = dataset.qx_data.astype(np.float64)
@@ -155 +162 @@
                 dataset.data = dataset.data.flatten()
 
+    def format_unit(self, unit=None):
+        """
+        Format units a common way
+        :param unit:
+        :return:
+        """
+        if unit:
+            split = unit.split("/")
+            if len(split) == 1:
+                return unit
+            elif split[0] == '1':
+                return "{0}^".format(split[1]) + "{-1}"
+            else:
+                return "{0}*{1}^".format(split[0], split[1]) + "{-1}"
+
     def set_all_to_none(self):
         """

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

@@ -299 +299 @@
                     self.current_dataset.dx = np.append(self.current_dataset.dx, data_point)
                 elif tagname == 'dQw':
-                    if self.current_dataset.dxw is None: self.current_dataset.dxw = np.empty(0)
+                    if self.current_dataset.dxw is None:
+                        self.current_dataset.dxw = np.empty(0)
                     self.current_dataset.dxw = np.append(self.current_dataset.dxw, data_point)
                 elif tagname == 'dQl':
-                    if self.current_dataset.dxl is None: self.current_dataset.dxl = np.empty(0)
+                    if self.current_dataset.dxl is None:
+                        self.current_dataset.dxl = np.empty(0)
                     self.current_dataset.dxl = np.append(self.current_dataset.dxl, data_point)
                 elif tagname == 'Qmean':

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

@@ -189 +189 @@
         x_vals = np.tile(x_vals, (size_y, 1)).flatten()
         y_vals = np.tile(y_vals, (size_x, 1)).T.flatten()
-        if np.all(self.current_dataset.err_data == None) \
-                or np.any(self.current_dataset.err_data <= 0):
+        if (np.all(self.current_dataset.err_data == None)
+                or np.any(self.current_dataset.err_data <= 0)):
             new_err_data = np.sqrt(np.abs(self.current_dataset.data))
         else:

test/sasdataloader/test/utest_abs_reader.py

@@ -48 +48 @@
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
 
-        self.assertEqual(self.data.y_unit, '1/cm')
+        self.assertEqual(self.data.y_unit, 'cm^{-1}')
         self.assertEqual(self.data.x[0], 0.002618)
         self.assertEqual(self.data.x[1], 0.007854)
@@ -146 +146 @@
         # Data
         self.assertEqual(len(self.data.x), 2)
-        self.assertEqual(self.data.x_unit, '1/A')
-        self.assertEqual(self.data.y_unit, '1/cm')
+        self.assertEqual(self.data.x_unit, 'A^{-1}')
+        self.assertEqual(self.data.y_unit, 'cm^{-1}')
         self.assertAlmostEqual(self.data.x[0], 0.02, 6)
         self.assertAlmostEqual(self.data.y[0], 1000, 6)
@@ -324 +324 @@
         # Data
         self.assertEqual(len(self.data.x), 2)
-        self.assertEqual(self.data.x_unit, '1/A')
-        self.assertEqual(self.data.y_unit, '1/cm')
+        self.assertEqual(self.data.x_unit, 'A^{-1}')
+        self.assertEqual(self.data.y_unit, 'cm^{-1}')
         self.assertEqual(self.data.x[0], 0.02)
         self.assertEqual(self.data.y[0], 1000)

test/sasdataloader/test/utest_ascii.py

@@ -32 +32 @@
         self.assertEqual(self.f1.x[0],0.002618)
         self.assertEqual(self.f1.x[9],0.0497)
-        self.assertTrue(self.f1.x_unit == '1/A' or self.f1.x_unit == 'A^{-1}')
-        self.assertTrue(self.f1.y_unit == '1/cm' or self.f1.y_unit == 'cm^{-1}')
+        self.assertTrue(self.f1.x_unit == 'A^{-1}')
+        self.assertTrue(self.f1.y_unit == 'cm^{-1}')
         
         self.assertEqual(self.f1.meta_data['loader'],"ASCII")

test/sasdataloader/test/utest_sesans.py

@@ -65 +65 @@
             "sesans_examples/no_spin_echo_unit.ses")
 
-    def test_sesans_no_version(self):
-        """
-            Confirm that sesans files with no file format version raise an appropriate error
-        """
-        # Warning message sent to logger for files not found.
-        pass
-
     def test_sesans_future_version(self):
         """