Changeset 05325ec4 in sasview

Timestamp:

Sep 13, 2011 6:23:59 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:

ca2bdae

Parents:

e16e5c3

Message:

fixed weighting problem for use dydata

File:

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

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

@@ -392 +392 @@
         self.fit_data = None
         self.theory_data = None
+        # original data: should not be modified
+        self.original_data = None
         ## the current model
         self.model = None
@@ -488 +490 @@
         :param data: list of data selected
         """
+        # original data: should not be modified
+        self.original_data = copy.deepcopy(data)
+        # fit data: used for fit and can be modified for convenience
         self.fit_data = copy.deepcopy(data)
         self.smearer_computer_value = smear_selection(self.fit_data,
@@ -506 +511 @@
         """
         from .utils import get_weight
-        self.weight = get_weight(data=self.fit_data, is2d=is2d, flag=flag)
+        # send original data for weighting
+        self.weight = get_weight(data=self.original_data, is2d=is2d, flag=flag)
         if is2d:
             self.fit_data.err_data = self.weight