Changeset 6ed82c7 in sasview

Timestamp:

Apr 17, 2009 2:44:58 PM (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:

41340860

Parents:

882a912

Message:

fitting model change

File:

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

sansview/perspectives/fitting/fitting.py

@@ -7 +7 @@
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
 from sans.guicomm.events import EVT_SLICER_PANEL,ERR_DATA
-
+from sans.guiframe import dataFitting
 from sans.fit.AbstractFitEngine import Model,FitData1D,FitData2D
+
 from fitproblem import FitProblem
 from fitpanel import FitPanel
@@ -14 +15 @@
 import models
 import fitpage
+
 
 DEFAULT_BEAM = 0.005
@@ -254 +256 @@
             
         from sans.guiframe import dataFitting 
-        if item.__class__.__name__=="Data1D":
-            data= dataFitting.Data1D(x=item.x, y=item.y, dy=dy, dxl=dxl, dxw=dxw)
-        else:
-            data= dataFitting.Theory1D(x=item.x, y=item.y, dxl=dxl, dxw=dxw)
+        
+        data= dataFitting.Data1D(x=item.x, y=item.y, dy=dy, dxl=dxl, dxw=dxw)
+        
         data.name = item.name
         data.detector = detector
@@ -268 +269 @@
         ## 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))
@@ -561 +566 @@
         """
         self.panel = event.GetEventObject()
-        for item in self.panel.graph.plottables:
-            
-            if item.name == self.panel.graph.selected_plottable:
+        for plottable in self.panel.graph.plottables:
+            
+            if plottable.name == self.panel.graph.selected_plottable:
+                if not hasattr(plottable, "is_data")or \
+                    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"
+                    item.id +="data1D"
+                    item.is_data= False
+                    title = item.name
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=item, title=str(title)))
+                else:
+                    item= copy.deepcopy(plottable)  
                 ## put the errors values back to the model if the errors were hiden
                 ## before sending them to the fit engine
@@ -579 +597 @@
                         data= copy.deepcopy(item)
             else:
-                data= copy.deepcopy(item)
+                ## Data2D case
+                if not hasattr(plottable, "is_data"):
+                    item= copy.deepcopy(plottable)
+                    item.group_id += "data2D"
+                    item.id +="data2D"
+                    item.is_data= False
+                    title = item.name
+                    title += " Fit"
+                    data = item
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=item, title=str(title)))
+                else:
+                    item= copy.deepcopy(plottable )
+                    data= copy.deepcopy(plottable )
             ## create anew page                   
             if item.name == self.panel.graph.selected_plottable or\
@@ -588 +618 @@
                     if page !=None:   
                         #create a fitproblem storing all link to data,model,page creation
-                        self.page_finder[page]= FitProblem()
+                        if not page in self.page_finder.keys():
+                            self.page_finder[page]= FitProblem()
                         ## item is almost the same as data but contains
                         ## axis info for plotting 
@@ -930 +961 @@
             title= my_info.title
             if title== None:
-                title="Analytical model 1D "
+                title = "Analytical model 1D "
                 wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
                              title= str(title), reset=True ))
@@ -984 +1015 @@
             theory.xmin= data.xmin
             theory.xmax= data.xmax
+        print "model comptele plot",theory.xmin,theory.xmax,theory.ymin,theory.ymin
        
         ## plot