Changeset ea8de94 in sasview for fittingview/src/sans/perspectives

Timestamp:

Sep 15, 2011 7:10:48 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:

fafdfd3

Parents:

c8537b5a

Message:

fix cal_chi2 for 2D

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (1 diff)

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

@@ -1574 +1574 @@
             theory_data = self.page_finder[page_id].get_theory_data(fid=data_copy.id)
             gn = theory_data.data#[index]
-            en = self.weight#data_copy.err_data#[index]
+            if self.weight == None:
+                en = data_copy.err_data
+            else:
+                en = self.weight#data_copy.err_data#[index]
             residuals.data = (fn - gn) / en 
             residuals.qx_data = data_copy.qx_data#[index]