Changeset 83b81b8 in sasview

Timestamp:

Jun 28, 2012 3:49:52 PM (12 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:

3b2b031

Parents:

986da97

Message:

a little better data error control

Files:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (1 diff)
• sansdataloader/src/sans/dataloader/readers/ascii_reader.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (1 diff)

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

@@ -1712 +1712 @@
         if data is not None:
             if not hasattr(data, "data"):
-                qmin = min(data.x)
-                # Maximum value of data
-                qmax = max(data.x)
-                npts = len(data.x)
+                try:
+                    qmin = min(data.x)
+                    # Maximum value of data
+                    qmax = max(data.x)
+                    npts = len(data.x)
+                except:
+                    msg = "Unable to find min/max/length of \n data named %s"% \
+                                data.filename  
+                    wx.PostEvent(self._manager.parent, StatusEvent(status=msg,
+                                               info="error"))
+                    raise ValueError, msg
+                    
             else:
                 qmin = 0
-                x = max(math.fabs(data.xmin), math.fabs(data.xmax))
-                y = max(math.fabs(data.ymin), math.fabs(data.ymax))
+                try:
+                    x = max(math.fabs(data.xmin), math.fabs(data.xmax))
+                    y = max(math.fabs(data.ymin), math.fabs(data.ymax))
+                except:
+                    msg = "Unable to find min/max of \n data named %s"% \
+                                data.filename  
+                    wx.PostEvent(self._manager.parent, StatusEvent(status=msg,
+                                               info="error"))
+                    raise ValueError, msg
                 ## Maximum value of data
                 qmax = math.sqrt(x * x + y * y)

sansdataloader/src/sans/dataloader/readers/ascii_reader.py

@@ -353 +353 @@
                 # Store loading process information
                 output.meta_data['loader'] = self.type_name
-                    
+                if len(output.x) < 1:
+                    raise RuntimeError, "%s is empty" % path
                 return output
             

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -2641 +2641 @@
         Show data dialog
         """   
+        try:
+            xmin = min(data.x)
+            ymin = min(data.y)
+        except:
+            msg = "Unable to find min/max of \n data named %s"% \
+                        data.filename  
+            wx.PostEvent(self, StatusEvent(status=msg,
+                                       info="error"))
+            raise ValueError, msg
         text = data.__str__() 
         text += 'Data Min Max:\n'
-        text += 'X_min = %s:  X_max = %s\n'% (min(data.x), max(data.x))
-        text += 'Y_min = %s:  Y_max = %s\n'% (min(data.y), max(data.y))
+        text += 'X_min = %s:  X_max = %s\n'% (xmin, max(data.x))
+        text += 'Y_min = %s:  Y_max = %s\n'% (ymin, max(data.y))
         if data.dy != None:
             text += 'dY_min = %s:  dY_max = %s\n'% (min(data.dy), max(data.dy))