Changeset 7ee79cb in sasview for fittingview/src/sans


Ignore:
Timestamp:
Sep 15, 2011 10:50:54 AM (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:
b2aef1c
Parents:
989767c
Message:

now dy option working with simul fit too

Location:
fittingview/src/sans/perspectives/fitting
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    rf7ef313 r7ee79cb  
    11081108        self._manager._reset_schedule_problem(value=0, uid=self.uid) 
    11091109        self._manager.schedule_for_fit(uid=self.uid,value=1)  
    1110         self._manager.set_fit_weight(uid=self.uid,  
    1111                                      flag=self.get_weight_flag(), 
    1112                                      is2d = self._is_2D()) 
    11131110        self._manager.set_fit_range(uid=self.uid,qmin=self.qmin_x,  
    11141111                                   qmax=self.qmax_x) 

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

    r55d2f7e r7ee79cb  
    696696                    templist = [] 
    697697                    page = self.fit_panel.get_page_by_id(page_id) 
     698                    self.set_fit_weight(uid=page.uid,  
     699                                     flag=page.get_weight_flag(), 
     700                                     is2d = page._is_2D()) 
    698701                    templist = page.get_param_list() 
    699702                    for element in templist: 

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

    rf7f6886 r7ee79cb  
    1818        data = data.y 
    1919    if flag == 0: 
    20         weight = numpy.ones_like(dy_data) 
     20        weight = numpy.ones_like(data) 
    2121    elif flag == 1: 
    2222        weight = dy_data 
Note: See TracChangeset for help on using the changeset viewer.