Changeset df9e0fc in sasview

Timestamp:

Sep 29, 2011 3:36:29 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

e9d9081

Parents:

63a2371

Message:

minor chisqr bug fixed

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1542 +1542 @@
         instead of calling expansive CalcChisqr in guithread
         """
-        data_copy = deepcopy(data)
-        
+        data_copy = deepcopy(data)  
         # default chisqr
         chisqr = None
         #to compute chisq make sure data has valid data
         # return None if data == None
-        if not check_data_validity(data_copy):
+        if not check_data_validity(data_copy) or data_copy == None:
             return chisqr
-        
+
         # Get data: data I, theory I, and data dI in order
         if data_copy.__class__.__name__ == "Data2D":
@@ -1562 +1561 @@
             fn = data_copy.data[index] 
             theory_data = self.page_finder[page_id].get_theory_data(fid=data_copy.id)
+            if theory_data== None:
+                return chisqr
             gn = theory_data.data[index]
             en = data_copy.err_data[index]
@@ -1579 +1580 @@
             fn = data_copy.y[index] 
             theory_data = self.page_finder[page_id].get_theory_data(fid=data_copy.id)
+            if theory_data== None:
+                return chisqr
             gn = theory_data.y
             en = dy[index]
+            
         # residual
         res = (fn - gn) / en