Changeset 53c771e in sasview for src/sas/qtgui/Calculators/SlitSizeCalculator.py

Timestamp:

Nov 9, 2017 6:45:20 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

dd150ef

Parents:

d6b8a1d

git-author:

Piotr Rozyczko <rozyczko@…> (11/08/17 07:22:45)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:45:20)

Message:

Converted unit tests

File:

• src/sas/qtgui/Calculators/SlitSizeCalculator.py (modified) (2 diffs)

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -66 +66 @@
         loader = Loader()
         try:
-            data = loader.load(path_str)[0]
+            data = loader.load(path_str)
+            data = data[0]
         # Can return multiple exceptions - gather them all under one umbrella and complain
         except Exception as ex:
@@ -121 +122 @@
             xdata = data.x
             ydata = data.y
-            if xdata == [] or xdata is None or ydata == [] or ydata is None:
+            #if xdata == [] or xdata is None or ydata == [] or ydata is None:
+            if (not xdata or xdata is None) or (not ydata or ydata is None):
                 msg = "The current data is empty please check x and y"
                 logging.error(msg)