Changeset c8537b5a in sasview for fittingview/src/sans/perspectives/fitting

Timestamp:

Sep 15, 2011 7:08:57 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:

ea8de94

Parents:

dadf255

Message:

small bug fix in cal_chi2 when panel.weight is None.

File:

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

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

@@ -1597 +1597 @@
                 ## Set consitently w/AbstractFitengine: 
                 ## But this should be corrected later.
-                dy = self.weight#deepcopy(data_copy.dy)
+                if self.weight == None:
+                    dy = data_copy.dy
+                else:
+                    dy = self.weight#deepcopy(data_copy.dy)
                 dy[dy==0] = 1  
             fn = data_copy.y[index]