Changeset e0e22f2c in sasview

Timestamp:

May 22, 2011 11:30:30 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:

026041c

Parents:

247873a

Message:

got param_range error correctly

Files:

• park_integration/AbstractFitEngine.py (modified) (1 diff)
• park_integration/ScipyFitting.py (modified) (1 diff)
• sansview/perspectives/fitting/basepage.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -61 +61 @@
             #if lo is None: lo = -numpy.inf
             #if hi is None: hi = numpy.inf
-        if lo >= hi:
+        if lo > hi:
             raise ValueError,"wrong fit range for parameters"
         

park_integration/ScipyFitting.py

@@ -159 +159 @@
                 raise 
             """
+        except:
+            raise
+        
         chisqr = functor.chisq()
         if cov_x is not None and numpy.isfinite(cov_x).all():

sansview/perspectives/fitting/basepage.py

@@ -1941 +1941 @@
             qmin = float(qmin_ctrl.GetValue())
             qmax = float(qmax_ctrl.GetValue())
-            if qmin <= qmax:
+            if qmin < qmax:
                 #Make sure to set both colours white.  
                 qmin_ctrl.SetBackgroundColour(wx.WHITE)