Changeset 3b70cc7 in sasview for fittingview/src


Ignore:
Timestamp:
Oct 19, 2011 1:33:39 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:
08dc9e87
Parents:
0766d6d
Message:

fixed 2d batch plot

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

Legend:

Unmodified
Added
Removed

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

    rfc1761b r3b70cc7  
    26972697            self.qmin_x = data_min 
    26982698            self.qmax_x = math.sqrt(x*x + y*y) 
     2699            #self.data.mask = numpy.ones(len(self.data.data),dtype=bool) 
    26992700            # check smearing 
    27002701            if not self.disable_smearer.GetValue(): 

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

    r934cfc03 r3b70cc7  
    11301130        self._manager.set_fit_range(uid=self.uid,qmin=self.qmin_x,  
    11311131                                   qmax=self.qmax_x) 
     1132 
    11321133        #single fit  
    11331134        self._manager.onFit(uid=self.uid) 
    … …  
    14711472                    return 
    14721473                else: 
    1473                     self.data.mask = index_data 
     1474                    #self.data.mask = index_data 
    14741475                    #self.Npts_fit.SetValue(str(len(self.data.mask))) 
    14751476                    self.set_npts2fit()  

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

    rf6933b8 r3b70cc7  
    11281128                        new_theory = copy_data.data 
    11291129                        new_theory[res.index] = res.theory 
    1130                         new_theory[res.index[res.index == False]] = 0 
    1131                         #if len(res.theory)== len(res.index[res.index]) and \ 
    1132                         #len(res.index) == len(data.data[res.index]): 
     1130                        new_theory[res.index == False] = numpy.nan  
    11331131                        correct_result = True 
    11341132                    #get all fittable parameters of the current model 
Note: See TracChangeset for help on using the changeset viewer.