Changeset b8080e1 in sasview for src/sas/sascalc/dataloader/readers/danse_reader.py

Timestamp:

Aug 29, 2018 8:01:23 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9463ca2

Parents:

ce30949

git-author:

Piotr Rozyczko <rozyczko@…> (08/29/18 07:59:56)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/29/18 08:01:23)

Message:

cherry picking sascalc changes from master SASVIEW-996
minor unit test fixes

File:

• src/sas/sascalc/dataloader/readers/danse_reader.py (modified) (4 diffs)

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

@@ -157 +157 @@
         # Store all data
         # Store wavelength
-        if has_converter == True and self.current_datainfo.source.wavelength_unit != 'A':
+        if has_converter and self.current_datainfo.source.wavelength_unit != 'A':
             conv = Converter('A')
             wavelength = conv(wavelength,
@@ -164 +164 @@
 
         # Store distance
-        if has_converter == True and detector.distance_unit != 'm':
+        if has_converter and detector.distance_unit != 'm':
             conv = Converter('m')
             distance = conv(distance, units=detector.distance_unit)
@@ -170 +170 @@
 
         # Store pixel size
-        if has_converter == True and detector.pixel_size_unit != 'mm':
+        if has_converter and detector.pixel_size_unit != 'mm':
             conv = Converter('mm')
             pixel = conv(pixel, units=detector.pixel_size_unit)
@@ -191 +191 @@
         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 is None)
+        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))