Changeset 6f73a08 in sasview for sansview/perspectives/fitting/fitpage.py

Timestamp:

Oct 9, 2008 2:41:05 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:

126a761

Parents:

385d464

Message:

working on fitting data 2 D

File:

• sansview/perspectives/fitting/fitpage.py (modified) (7 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -140 +140 @@
         # flag to check if the user has selected a new model in the combox box
         self.model_hasChanged=False
-        #flag to check if the user has selected a new data
-        self.data_hasChanged=False
+        
         #dictionary of model name and model class
         self.model_list_box={}
-        # Data1D to make a deep comparison between 2 Data1D for checking data
-        #change
-        from sans.guitools.plottables import Data1D
-        self.prevData = Data1D(x=[], y=[],dx=None, dy=None)
-        self.prevData.name= None
+        #  comparison between 2 group_id for checking data changes
+        self.prev_group_id= None
         
         self.data=None
@@ -191 +187 @@
                 self.GrandParent.GetSizer().Layout()
                 
-                
-    def copy_data(self,dataset):
-        """
-             copy a select data in the panel to compared with the previous selected data
-             @param dataset: the data selected
-             @note : everything a data is selected, the panel check is it is different 
-             from the previous selected data
-        """
-        try:
-            if dataset !=None:
-                self.prevData.x= copy.deepcopy(dataset.x)
-                self.prevData.y= copy.deepcopy(dataset.y)
-                self.prevData.name=dataset.name
-                if dataset.dy==None:
-                    self.prevData.dy= copy.deepcopy(dataset.dy)
-        except:
-            raise ValueError, " copy_data: cannot copy data" 
-        
+  
         
     def onClose(self,event):
@@ -224 +203 @@
                 qmin = float(self.xmin.GetValue())
                 qmax = float(self.xmax.GetValue())
-                x,y,dy = [numpy.asarray(v) for v in (self.data.x,self.data.y,self.data.dy)]
-                if qmin==None and qmax==None: 
-                    fx =numpy.asarray([self.model.run(v) for v in x])
-                    res=(y - fx)/dy
-                else:
-                    idx = (x>= qmin) & (x <=qmax)
-                    fx = numpy.asarray([self.model.run(item)for item in x[idx ]])
-                    res= (y[idx] - fx)/dy[idx]  
+                #x,y,dy = [numpy.asarray(v) for v in (self.data.x,self.data.y,self.data.dy)]
+                #if qmin==None and qmax==None: 
+                #    fx =numpy.asarray([self.model.run(v) for v in x])
+                #    res=(y - fx)/dy
+                #else:
+                #    idx = (x>= qmin) & (x <=qmax)
+                #    fx = numpy.asarray([self.model.run(item)for item in x[idx ]])
+                #    res= (y[idx] - fx)/dy[idx]  
+                self.data.setFitRange(qmin,qmax)
+                res=self.data.residuals(self.model.runXY)
                 sum=0
                 for item in res:
@@ -304 +285 @@
             flag=self.checkFitRange()
             if flag==True and self.model!=None:
-                 self.manager.redraw_model(float(self.xmin.GetValue())\
+                print"fit page",self.xmin.GetValue(),self.xmax.GetValue()
+                self.manager.redraw_model(float(self.xmin.GetValue())\
                                                ,float(self.xmax.GetValue()))
-           
         except:
+
             wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Drawing  Error:wrong value entered %s"% sys.exc_value))
@@ -322 +304 @@
         valueMax = self.xmax.GetValue()
         # Check for possible values entered
-        
+        print "fitpage: checkfitrange:",valueMin,valueMax
         try:
             if (float(valueMax)> float(valueMin)):
@@ -340 +322 @@
         return flag
     
-    def check_data_change(self,dataset):
-        """
-             check if data selected has changed and set flag self.data_hasChanged
-             has true is changed or false is unchanged
-             @param dataset: data selected
-        """
-        self.data_hasChanged=False
-        if self.prevData.__class__ !=dataset.__class__:
-            self.data_hasChanged=True
-            
-        elif self.prevData.name != dataset.name:
-            self.data_hasChanged=True
-            
-        elif len(self.prevData.x) != len(self.prevData.y):
-            self.data_hasChanged=True
-            
-        else:
-            for i in range(len(dataset.x)):
-                if self.prevData.x[i] !=dataset.x[i]:
-                    self.data_hasChanged=True
-                    break
-                
-                if self.prevData.y[i] !=dataset.y[i]:
-                    self.data_hasChanged=True
-                    break
-                
-                if dataset.dy !=None:
-                    if self.prevData.dy[i] !=dataset.dy[i]:
-                        self.data_hasChanged=True
-                        break
-                    
+   
                     
     def set_data_name(self,dataset):
@@ -379 +331 @@
             for xmin and xmax range sizer
         """
-        self.check_data_change(dataset)
-        if self.data_hasChanged==True:
+        
+        if self.prev_group_id !=dataset.data.group_id:
             self._DataNameEnter()
-        self.data=dataset
-        self.copy_data(dataset)
+        self.data = dataset
+        self.prev_group_id=dataset.data.group_id
         #Displaying Data information
-        self.DataSource.SetValue(str(dataset.name))
-        self._xaxis,self._xunit=dataset.get_xaxis()
+        self.DataSource.SetValue(str(dataset.data.name))
+        self._xaxis,self._xunit=dataset.data.get_xaxis()
         self.text4_3.SetLabel(self._xaxis+"["+self._xunit+"]")
         self.text4_1.Show()
         self.text4_2.Show()
         self.text4_3.Show()
-        
-        self.xmin.SetValue(format_number(min(dataset.x)))
-        self.xmin.Show()
-
-        self.xmax.SetValue(format_number(max(dataset.x)))
-        self.xmax.Show()
-        
+        if not dataset.data.__class__.__name__=='Data2D':
+            self.xmin.SetValue(format_number(min(dataset.data.x)))
+            self.xmin.Show()
+            self.xmax.SetValue(format_number(max(dataset.data.x)))
+            self.xmax.Show()
+        else:
+            self.xmin.SetValue(format_number(numpy.min(dataset.data.image)))
+            self.xmin.Show()
+            self.xmax.SetValue(format_number(numpy.max(dataset.data.image)))
+            self.xmax.Show()
         if ((len(self.param_toFit ) >0) and self.DataSource.GetValue()and \
             self.modelbox.GetValue() and (self.model_hasChanged ==False)):