Changeset ed2276f in sasview for src/sas/sascalc/dataloader/manipulations.py

Timestamp:

Apr 4, 2017 12:00:18 PM (8 years ago)

Author:

GitHub <noreply@…>

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:

7b15990

Parents:

9a5097c (diff), 571bf4b (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.

git-author:

Andrew Jackson <andrew.jackson@…> (04/04/17 12:00:18)

git-committer:

GitHub <noreply@…> (04/04/17 12:00:18)

Message:

Merge branch 'master' into numpy_import

File:

• src/sas/sascalc/dataloader/manipulations.py (modified) (2 diffs)

src/sas/sascalc/dataloader/manipulations.py

@@ -80 +80 @@
 
     """
-    if data2d.data == None or data2d.x_bins == None or data2d.y_bins == None:
+    if data2d.data is None or data2d.x_bins is None or data2d.y_bins is None:
         raise ValueError, "Can't convert this data: data=None..."
     new_x = np.tile(data2d.x_bins, (len(data2d.y_bins), 1))
@@ -92 +92 @@
     if data2d.err_data == None or np.any(data2d.err_data <= 0):
         new_err_data = np.sqrt(np.abs(new_data))
+
     else:
         new_err_data = data2d.err_data.flatten()