Changeset 166f2f8 in sasview for fittingview/src/sans/perspectives

Timestamp:

Oct 19, 2011 6:46:12 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:

3912db5

Parents:

63f4b8e

Message:

warn user when one of data set has out of q range

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (1 diff)

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

@@ -2199 +2199 @@
         if self.data == None and self.enable2D:
             return flag
-
-        # 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 )
-        #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))
-
-        if len(index_data[index_data]) < 10:
-            # change the color pink.
-            self.qmin.SetBackgroundColour("pink")
-            self.qmin.Refresh()
-            self.qmax.SetBackgroundColour("pink")
-            self.qmax.Refresh()
-            msg= "Cannot Plot :No or too little npts in that data range!!!  "
-            wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
-            self.fitrange = False
-            flag = False
-        else:
-            self.Npts_fit.SetValue(str(len(self.data.mask[index_data==True])))
-            self.fitrange = True
+        for data in self.data_list:
+            # q value from qx and qy
+            radius= numpy.sqrt( data.qx_data * data.qx_data + 
+                                data.qy_data * data.qy_data )
+            #get unmasked index
+            index_data = (float(self.qmin.GetValue()) <= radius) & \
+                            (radius <= float(self.qmax.GetValue()))
+            index_data = (index_data) & (data.mask) 
+            index_data = (index_data) & (numpy.isfinite(data.data))
+
+            if len(index_data[index_data]) < 10:
+                # change the color pink.
+                self.qmin.SetBackgroundColour("pink")
+                self.qmin.Refresh()
+                self.qmax.SetBackgroundColour("pink")
+                self.qmax.Refresh()
+                msg= "Npts of Data Error :No or too little npts of %s."% data.name
+                wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+                self.fitrange = False
+                flag = False
+            else:
+                self.Npts_fit.SetValue(str(len(index_data[index_data==True])))
+                self.fitrange = True
             
         return flag