Changeset cd54205 in sasview

Timestamp:

May 11, 2016 11:38:48 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

e04f87b, 26d6e045

Parents:

a9946e9

Message:

don't fail even when transformed data is empty

File:

• src/sas/sasgui/plottools/plottables.py (modified) (3 diffs)

src/sas/sasgui/plottools/plottables.py

@@ -704 +704 @@
             else:
                 self.dy = None
-            tempx = []
-            tempy = []
             if not has_err_x:
                 dx = numpy.zeros(len(x))
@@ -724 +722 @@
                     if has_err_y:
                         self.dy.append(tempdy)
-                except:
-                    tempx = x[i]
-                    tempy = y[i]
-                    tempdy = dy[i]
+                except Exception:
+                    pass
             # Sanity check
             if not len(self.x) == len(self.y):
@@ -733 +729 @@
                 msg += "and y are not of the same length"
                 raise ValueError, msg
-            if has_err_x and not (len(self.x) and len(self.dx)):
+            if has_err_x and not (len(self.x) == len(self.dx)):
                 msg = "Plottable.View: transformed x and dx"
                 msg += " are not of the same length"
                 raise ValueError, msg
-            if has_err_y and not (len(self.y) and len(self.dy)):
+            if has_err_y and not (len(self.y) == len(self.dy)):
                 msg = "Plottable.View: transformed y"
                 msg += " and dy are not of the same length"