Changeset d713729 in sasview

Timestamp:

Aug 25, 2017 4:16:14 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:

b54440d

Parents:

17e257b5

Message:

Fix the danse_reader and remove obsolete unit tests.

Files:

• src/sas/sascalc/dataloader/readers/danse_reader.py (modified) (1 diff)
• test/sasdataloader/test/testLoad.py (deleted)
• test/sasdataloader/test/testplugings.py (deleted)

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 self.current_dataset.err_data == np.all(np.array(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: