Changeset f151ddf in sasview

Timestamp:

May 14, 2010 2:41:09 PM (15 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:

a378756

Parents:

4470b10

Message:

Found and fixed Nontype error on cal_chi2 w/ data.dy ==None

File:

• sansview/perspectives/fitting/fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitting.py

@@ -1317 +1317 @@
         # default chisqr
         chisqr = None
+        
         # return None if data == None
         if data == None: return chisqr
-
+        
         # Get data: data I, theory I, and data dI in order
         if data.__class__.__name__ =="Data2D":
@@ -1329 +1330 @@
             # 1 d theory from model_thread is only in the range of index
             if index == None: index = numpy.ones(len(data.y),ntype=bool)
-            
+            if data.dy== None or data.dy ==[]:
+                data.dy= numpy.ones(len(data.y))
+            else:
+                data.dy[data.dy==0]=1  ## Set consitently w/AbstractFitengine: But this should be corrected later.
             fn = data.y[index] 
             gn = self.theory_data.y