Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/fitproblem.py

    r7afcae8 r05325ec4  
    392392        self.fit_data = None 
    393393        self.theory_data = None 
     394        # original data: should not be modified 
     395        self.original_data = None 
    394396        ## the current model 
    395397        self.model = None 
     
    488490        :param data: list of data selected 
    489491        """ 
     492        # original data: should not be modified 
     493        self.original_data = copy.deepcopy(data) 
     494        # fit data: used for fit and can be modified for convenience 
    490495        self.fit_data = copy.deepcopy(data) 
    491496        self.smearer_computer_value = smear_selection(self.fit_data, 
     
    506511        """ 
    507512        from .utils import get_weight 
    508         self.weight = get_weight(data=self.fit_data, is2d=is2d, flag=flag) 
     513        # send original data for weighting 
     514        self.weight = get_weight(data=self.original_data, is2d=is2d, flag=flag) 
    509515        if is2d: 
    510516            self.fit_data.err_data = self.weight 
Note: See TracChangeset for help on using the changeset viewer.