Changeset ba64348 in sasview for sansview/perspectives/fitting

Timestamp:

Apr 6, 2011 11:02:58 AM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

64e44c1

Parents:

2ca51f44

Message:

check if data is none before setting range value

File:

• sansview/perspectives/fitting/fitpage.py (modified) (1 diff)

sansview/perspectives/fitting/fitpage.py

@@ -1201 +1201 @@
             #Check if # of points for theory model are valid(>0).
             # check for 2d
-            if self.data.__class__.__name__ =="Data2D":
-                # set mask   
-                radius= numpy.sqrt( self.data.qx_data*self.data.qx_data + 
-                                    self.data.qy_data*self.data.qy_data )
-                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"
-                    msg += " that data range!!!  "
-                    wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
-                    return
+            if self.data is not None:
+                if self.data.__class__.__name__ =="Data2D":
+                    # set mask   
+                    radius= numpy.sqrt( self.data.qx_data*self.data.qx_data + 
+                                        self.data.qy_data*self.data.qy_data )
+                    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"
+                        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.set_npts2fit() 
                 else:
-                    self.data.mask = index_data
-                    #self.Npts_fit.SetValue(str(len(self.data.mask)))
-                    self.set_npts2fit() 
-            else:
-                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])))
-           
+                    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:
            tcrtl.SetBackgroundColour("pink")