Changeset caa1226 in sasview

Timestamp:

Oct 16, 2008 3:42:20 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:

e1a310f

Parents:

fdb0f8b

Message:

need to fix data2 d plot

Location:

sansview

Files:

• 2P_New.sans (added)
• perspectives/fitting/fitpage2D.py (modified) (2 diffs)
• perspectives/fitting/fitpanel.py (modified) (1 diff)
• perspectives/fitting/fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage2D.py

@@ -203 +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]  
-                self.data.setFitRange(qmin,qmax)
-                res=self.data.residuals(self.model.runXY)
+                res=[]
+                if qmin==None and qmax==None: 
+                    for i in range(len(self.data.x_bins)):
+                        res.append( (self.data.image[i][i]- fn([self.data.x_bins[i],self.data.y_bins[i]]))\
+                                    /self.data.err_image[i][i] )
+                    
+                else:
+                    #idx = (x>=self.qmin) & (x <= self.qmax)
+                    #fx = numpy.asarray([fn(item)for item in x[idx ]])
+                    #return (y[idx] - fx)/dy[idx]
+                    for i in range(len(self.data.x_bins)):
+                        res.append( (self.data.image[i][i]- fn([self.data.x_bins[i],self.data.y_bins[i]]))\
+                                    /self.data.err_image[i][i] )
+                
+                
                 sum=0
                 for item in res:
@@ -332 +337 @@
         """
         
-        if self.prev_group_id !=dataset.data.group_id:
+        if self.prev_group_id !=dataset.group_id:
             self._DataNameEnter()
         self.data = dataset
-        self.prev_group_id=dataset.data.group_id
+        self.prev_group_id=dataset.group_id
         #Displaying Data information
-        self.DataSource.SetValue(str(dataset.data.name))
-        self._xaxis,self._xunit=dataset.data.get_xaxis()
+        self.DataSource.SetValue(str(dataset.name))
+        self._xaxis,self._xunit=dataset.get_xaxis()
         self.text4_3.SetLabel(self._xaxis+"["+self._xunit+"]")
         self.text4_1.Show()
         self.text4_2.Show()
         self.text4_3.Show()
-        if not hasattr(dataset.data,'image'):
-            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()
+        
+        self.xmin.SetValue(format_number(numpy.min(dataset.image)))
+        self.xmin.Show()
+        self.xmax.SetValue(format_number(numpy.max(dataset.image)))
+        self.xmax.Show()
         if ((len(self.param_toFit ) >0) and self.DataSource.GetValue()and \
             self.modelbox.GetValue() and (self.model_hasChanged ==False)):

sansview/perspectives/fitting/fitpanel.py

@@ -86 +86 @@
             panel.set_manager(self.manager)
             panel.set_owner(self.event_owner)
+            panel.set_data_name(data)
             self.nb.AddPage(page=panel,text=name,select=True)
             panel.populate_box( self.model_list_box)

sansview/perspectives/fitting/fitting.py

@@ -146 +146 @@
             if item.name == self.panel.graph.selected_plottable or item.__class__.__name__ is "MetaData2D":
                 #find a name for the page created for notebook
-                
                 try:
                     page = self.fit_panel.add_fit_page(item)
@@ -152 +151 @@
                     
                     if page !=None:    
-                        page.set_data_name(item)
+                        
                         #create a fitproblem storing all link to data,model,page creation
                         self.page_finder[page]= FitProblem()
-                        #data_for_park= Data(sans_data=item)
-                        #datap = PlottableData(data=data_for_park,data1d=item)
-                        #self.page_finder[page].add_data(datap)
                         self.page_finder[page].add_data(item)
                 except: