Changeset d902cf0 in sasview

Timestamp:

Apr 21, 2009 11:25:24 AM (16 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:

2501cf7

Parents:

70cf5d3

Message:

selecting data for fit allow for some data only

File:

• sansview/perspectives/fitting/fitting.py (modified) (12 diffs)

sansview/perspectives/fitting/fitting.py

@@ -167 +167 @@
         self.graph=graph
         for item in graph.plottables:
-            if hasattr(item,"is_data"):
-                if item.is_data== False:
-                    return []
-           
             if item.__class__.__name__ is "Data2D":
+                if hasattr(item,"is_data"):
+                    if item.is_data:
+                        return [["Select data  for Fitting", \
+                         "Dialog with fitting parameters ", self._onSelect]]
+                    else:
+                        return [] 
                 return [["Select data  for Fitting",\
                           "Dialog with fitting parameters ", self._onSelect]] 
             else:
-               
                 if item.name==graph.selected_plottable :
-                    if not hasattr(item, "group_id"):
-                        return []
-                    return [["Select data  for Fitting", \
-                             "Dialog with fitting parameters ", self._onSelect]] 
+                    if hasattr(item, "group_id"):
+                        if hasattr(item,"is_data"):
+                            if item.is_data:
+                                return [["Select data  for Fitting", \
+                                 "Dialog with fitting parameters ", self._onSelect]]
+                            else:
+                                return [] 
+                        else:
+                            return [["Select data  for Fitting", \
+                                 "Dialog with fitting parameters ", self._onSelect]] 
         return []   
 
@@ -234 +241 @@
 
 
-    def copy_data(self, item, dy):
+    def copy_data(self, item, dy=None):
         """
             receive a data 1D and the list of errors on dy
@@ -260 +267 @@
             
         from sans.guiframe import dataFitting 
-        
         data= dataFitting.Data1D(x=item.x, y=item.y, dy=dy, dxl=dxl, dxw=dxw)
         
@@ -273 +279 @@
         ## to save  data 1D as cansas xml file
         data.info= info
-        is_data=False
-        if hasattr(item, "is_data"):
-            is_data= item.is_data
-        data.is_data = is_data
         ## If the data file does not tell us what the axes are, just assume...
         data.xaxis(copy.deepcopy(item._xaxis),copy.deepcopy(item._xunit))
@@ -583 +585 @@
             
             if plottable.name == self.panel.graph.selected_plottable:
-                if not hasattr(plottable, "is_data")or \
-                    plottable.__class__.__name__=="Theory1D":
+                #if not hasattr(plottable, "is_data"):
+                    
+                if  plottable.__class__.__name__=="Theory1D":
                     dy=numpy.zeros(len(plottable.y))
                     if hasattr(plottable, "dy"):
                         dy= copy.deepcopy(plottable.dy)
+                        
                     item= self.copy_data(plottable, dy)
                     item.group_id += "data1D"
@@ -595 +599 @@
                     wx.PostEvent(self.parent, NewPlotEvent(plot=item, title=str(title)))
                 else:
-                    item= copy.deepcopy(plottable)  
+                    item= self.copy_data(plottable, plottable.dy)  
+                    item.is_data=True
+                    
                 ## put the errors values back to the model if the errors were hiden
                 ## before sending them to the fit engine
@@ -602 +608 @@
                         dy= self.err_dy[item.name]
                         data= self.copy_data(item, dy)
+                        data.is_data= item.is_data
                     else:
-                        data= copy.deepcopy(item)
+                        data= self.copy_data(item)
+                        data.is_data= item.is_data
+                        
+                       
                 else:
                     if item.dy==None:
                         dy= numpy.zeros(len(item.y))
                         data= self.copy_data(item, dy)
+                        data.is_data=item.is_data
                     else:
-                        data= copy.deepcopy(item)
+                        data= self.copy_data(item)
+                        data.is_data=item.is_data
+                       
             else:
                 ## Data2D case
@@ -624 +637 @@
                     item= copy.deepcopy(plottable )
                     data= copy.deepcopy(plottable )
+                    item.is_data=True
+                    data.is_data=True
             ## create anew page                   
             if item.name == self.panel.graph.selected_plottable or\
@@ -643 +658 @@
                         wx.PostEvent(self.parent, StatusEvent(status="Page was already Created"))
                 except:
-                    wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
-                    %sys.exc_value))
-                    return
+                    raise
+                    #wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
+                    #%sys.exc_value))
+                    #return
     def _updateFit(self):
         """
@@ -667 +683 @@
       
         try:
+            if numpy.any(result.pvec ==None )or not numpy.all(numpy.isfinite(result.pvec) ):
+                msg= "Fitting did not converge!!!"
+                wx.PostEvent(self.parent, StatusEvent(status=msg,type="stop"))
+                return
             for page, value in self.page_finder.iteritems():
                 if page==cpage :
@@ -972 +992 @@
                     new_plot.id += "Model"
                 new_plot.is_data =False 
-            # Pass the reset flag to let the plotting event handler
-            # know that we are replacing the whole plot
+           
             from DataLoader.data_info import Data1D
             info= Data1D(x= new_plot.x, y=new_plot.y)
@@ -981 +1000 @@
             info.yaxis( new_plot._yaxis, new_plot._yunit)
             new_plot.info = info
+            # Pass the reset flag to let the plotting event handler
+            # know that we are replacing the whole plot
             if title== None:
                 title = "Analytical model 1D "