Changeset b21d32b in sasview for sansguiframe/src/sans/guiframe

Timestamp:

Aug 22, 2011 1:33:58 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

28c9e5a

Parents:

eaa7162

Message:

edit check data

File:

• sansguiframe/src/sans/guiframe/dataFitting.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/dataFitting.py

@@ -260 +260 @@
         
 def check_data_validity(data):
-      """
-      Return True is data is valid enough to compute chisqr, else False
-      """
-      flag = True
-      if data is not None:
-          if issubclass(data.__class__, Data2D):
-              if (data.data is None) or (len(data.data) == 0) \
-               or (len(data.err_data) == 0):
-                  flag = False
-          else:
-              if (data.y is None) or (len(data.y) == 0): 
-                  flag = False
-      else:
-          flag = False
-      return flag
+    """
+    Return True is data is valid enough to compute chisqr, else False
+    """
+    flag = True
+    if data is not None:
+        if issubclass(data.__class__, Data2D):
+            if (data.data is None) or (len(data.data) == 0)\
+            or (len(data.err_data) == 0):
+                flag = False
+        else:
+            if (data.y is None) or (len(data.y) == 0): 
+                flag = False
+        if not data.is_data:
+            flag = False
+    else:
+        flag = False
+    return flag