Changeset 3b70cc7 in sasview

Timestamp:

Oct 19, 2011 11:33:39 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:

08dc9e87

Parents:

0766d6d

Message:

fixed 2d batch plot

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (2 diffs)
• fitting.py (modified) (1 diff)

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

@@ -2697 +2697 @@
             self.qmin_x = data_min
             self.qmax_x = math.sqrt(x*x + y*y)
+            #self.data.mask = numpy.ones(len(self.data.data),dtype=bool)
             # check smearing
             if not self.disable_smearer.GetValue():

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

@@ -1130 +1130 @@
         self._manager.set_fit_range(uid=self.uid,qmin=self.qmin_x, 
                                    qmax=self.qmax_x)
+
         #single fit 
         self._manager.onFit(uid=self.uid)
@@ -1471 +1472 @@
                     return
                 else:
-                    self.data.mask = index_data
+                    #self.data.mask = index_data
                     #self.Npts_fit.SetValue(str(len(self.data.mask)))
                     self.set_npts2fit() 

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

@@ -1128 +1128 @@
                         new_theory = copy_data.data
                         new_theory[res.index] = res.theory
-                        new_theory[res.index[res.index == False]] = 0
-                        #if len(res.theory)== len(res.index[res.index]) and \
-                        #len(res.index) == len(data.data[res.index]):
+                        new_theory[res.index == False] = numpy.nan 
                         correct_result = True
                     #get all fittable parameters of the current model