Changeset 94078a8 in sasview

Timestamp:

Oct 20, 2011 11:57:11 AM (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:

2d98490

Parents:

e947cd4

Message:

check npts for all 1d data in batch mode

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (2 diffs)
• fitpage.py (modified) (1 diff)

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

@@ -1441 +1441 @@
             else:
                 self.fitrange = False    
-            
             ## if any value is modify draw model with new value
             if not self.fitrange:
@@ -2225 +2224 @@
             
         return flag
+
+    def _validate_Npts_1D(self):  
+        """
+        Validate the number of points for fitting is more than 5 points.
+        If valid, setvalues Npts_fit otherwise post msg.
+        """
+        #default flag
+        flag = True
+        # Theory
+        if self.data == None:
+            return flag
+        for data in self.data_list:
+            # q value from qx and qy
+            radius= data.x
+            #get unmasked index
+            index_data = (float(self.qmin.GetValue()) <= radius) & \
+                            (radius <= float(self.qmax.GetValue()))
+            index_data = (index_data) & (numpy.isfinite(data.y))
+
+            if len(index_data[index_data]) < 5:
+                # 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
+
+
     
     def _check_value_enter(self, list, modified):

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

@@ -1110 +1110 @@
         
         flag = self._update_paramv_on_fit() 
+        
+        if self.batch_on and not self._is_2D():
+            if not self._validate_Npts_1D():
+                return
                 
         if not flag: