Changeset 3f6508f in sasview for sansview/perspectives

Timestamp:

Jan 31, 2011 8:03:56 AM (14 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:

213892bc

Parents:

d603001

Message:

Fixed the Npts_fit bug in 1D calculation

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -2039 +2039 @@
 
         # q value from qx and qy
-        radius= numpy.sqrt( self.data.qx_data*self.data.qx_data + self.data.qy_data*self.data.qy_data )
+        radius= numpy.sqrt( self.data.qx_data * self.data.qx_data + 
+                            self.data.qy_data * self.data.qy_data )
         #get unmasked index
-        index_data = (float(self.qmin.GetValue()) <= radius)&(radius<= float(self.qmax.GetValue()))
-        index_data = (index_data)&(self.data.mask) 
-        index_data = (index_data)&(numpy.isfinite(self.data.data))
+        index_data = (float(self.qmin.GetValue()) <= radius) & \
+                        (radius <= float(self.qmax.GetValue()))
+        index_data = (index_data) & (self.data.mask) 
+        index_data = (index_data) & (numpy.isfinite(self.data.data))
 
         if len(index_data[index_data]) < 10:
@@ -2405 +2407 @@
 
         self.qmin    = self.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),style=wx.TE_PROCESS_ENTER,
-                                            text_enter_callback = self._onparamEnter)
+                                            text_enter_callback = self._onQrangeEnter)
         self.qmin.SetValue(str(self.qmin_x))
         self.qmin.SetToolTipString("Minimun value of Q in linear scale.")
      
         self.qmax    = self.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),style=wx.TE_PROCESS_ENTER,
-                                            text_enter_callback = self._onparamEnter)
+                                            text_enter_callback = self._onQrangeEnter)
         self.qmax.SetValue(str(self.qmax_x))
         self.qmax.SetToolTipString("Maximum value of Q in linear scale.")

sansview/perspectives/fitting/fitpage.py

@@ -1049 +1049 @@
                 radius= numpy.sqrt( self.data.qx_data*self.data.qx_data + 
                                     self.data.qy_data*self.data.qy_data )
-                index_data = ((self.qmin <= radius)&(radius<= self.qmax))
+                index_data = ((self.qmin_x <= radius)& \
+                                (radius<= self.qmax_x))
                 index_data = (index_data)&(self.data.mask)
                 index_data = (index_data)&(numpy.isfinite(self.data.data))
                 if len(index_data[index_data]) < 10:
-                    msg= "Cannot Plot :No or too little npts in \
-                                        that data range!!!  "
+                    msg = "Cannot Plot :No or too little npts in"
+                    msg += " that data range!!!  "
                     wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
                     return
                 else:
                     self.data.mask = index_data
-                    self.Npts_fit.Setvalue(str(len(self.data.mask)))
+                    #self.Npts_fit.SetValue(str(len(self.data.mask)))
+                    self.set_npts2fit() 
             else:
                 index_data = ((self.qmin <= self.data.x)& \
                               (self.data.x <= self.qmax))
-                self.Npts_fit.SetValue(str(len(self.data.x[index_data])))
+                #self.Npts_fit.SetValue(str(len(self.data.x[index_data])))
+                self.set_npts2fit() 
            
         else:
@@ -2516 +2519 @@
         self.Layout()
         self.Refresh()
-        #self.SetScrollbars(20,20,25,65)
         self.SetupScrolling()