Changeset 13913ec in sasview for sansview

Timestamp:

Feb 3, 2011 12:53:08 PM (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:

45ffa5e

Parents:

ec489f5

Message:

bug fixes: Q range Npts_fit and chisqr

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• fitting.py (modified) (1 diff)

sansview/perspectives/fitting/fitpage.py

@@ -1063 +1063 @@
                     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.set_npts2fit() 
+                index_data = ((self.qmin_x <= self.data.x)& \
+                              (self.data.x <= self.qmax_x))
+                self.Npts_fit.SetValue(str(len(self.data.x[index_data])))
+
            
         else:

sansview/perspectives/fitting/fitting.py

@@ -1383 +1383 @@
                 return
             x = data.x
-            if qmin == DEFAULT_QMIN :
-                qmin = min(data.x)
-            if qmax == DEFAULT_QMAX:
-                qmax = max(data.x) 
+            
+            if qmin == None :
+                qmin == DEFAULT_QMIN
+
+            if qmax == None:
+                qmax == DEFAULT_QMAX 
+                
         if not enable1D:
             return