Changeset fc51d06 in sasview

Timestamp:

Jul 9, 2018 2:51:03 PM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

b799f09

Parents:

b011ecb

Message:

Fix broken unit tests and general cleanup.

Files:

• src/sas/sascalc/dataloader/readers/danse_reader.py (modified) (1 diff)
• src/sas/sascalc/file_converter/nxcansas_writer.py (modified) (2 diffs)
• test/sasdataloader/test/utest_abs_reader.py (modified) (1 diff)
• test/sasdataloader/test/utest_red2d_reader.py (modified) (1 diff)

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

@@ -180 +180 @@
         detector.beam_center.y = center_y * pixel
 
-
-        self.current_dataset.xaxis("\\rm{Q_{x}}", '1/A')
-        self.current_dataset.yaxis("\\rm{Q_{y}}", '1/A')
-        self.current_dataset.zaxis("\\rm{Intensity}", "1/cm")
-
+        self.current_dataset = self.set_default_2d_units(self.current_dataset)
         self.current_dataset.x_bins = x_vals
         self.current_dataset.y_bins = y_vals

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -297 +297 @@
 
         intensity = np.reshape(data.data, (n_rows, n_cols))
-        d_i = None
-        if not all(data.err_data == [None]):
-            d_i = np.reshape(data.err_data, (n_rows, n_cols))
         qx = np.reshape(data.qx_data, (n_rows, n_cols))
         qy = np.reshape(data.qy_data, (n_rows, n_cols))
@@ -309 +306 @@
         qy_entry = data_entry.create_dataset('Qy', data=qy)
         qy_entry.attrs['units'] = data.Q_unit
-        if d_i:
+        if data.err_data is not None and not all(data.err_data == [None]):
+            d_i = np.reshape(data.err_data, (n_rows, n_cols))
             i_entry.attrs['uncertainties'] = 'Idev'
             i_dev_entry = data_entry.create_dataset('Idev', data=d_i)
             i_dev_entry.attrs['units'] = data.I_unit
-        if not all(data.dqx_data == [None]):
+        if data.dqx_data is not None and not all(data.dqx_data == [None]):
             qx_entry.attrs['resolutions'] = 'dQx'
             dqx_entry = data_entry.create_dataset('dQx', data=data.dqx_data)
             dqx_entry.attrs['units'] = data.Q_unit
-        if not all(data.dqy_data == [None]):
+        if data.dqy_data is not None and not all(data.dqy_data == [None]):
             qy_entry.attrs['resolutions'] = 'dQy'
             dqy_entry = data_entry.create_dataset('dQy', data=data.dqy_data)

test/sasdataloader/test/utest_abs_reader.py

@@ -118 +118 @@
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
 
-        self.assertEqual(self.data.I_unit, '1/cm')
+        self.assertEqual(self.data.I_unit, 'cm^{-1}')
         self.assertEqual(self.data.data[0], 1.57831)
         self.assertEqual(self.data.data[1], 2.70983)

test/sasdataloader/test/utest_red2d_reader.py

@@ -31 +31 @@
         self.assertEqual(f.qx_data[0],-0.03573497)
         self.assertEqual(f.qx_data[36863],0.2908819)
-        self.assertEqual(f.Q_unit, '1/A')
-        self.assertEqual(f.I_unit, '1/cm')
+        self.assertEqual(f.Q_unit, 'A^{-1}')
+        self.assertEqual(f.I_unit, 'cm^{-1}')
 
         self.assertEqual(f.meta_data['loader'],"IGOR/DAT 2D Q_map")