Changeset 3e8e627 in sasview

Timestamp:

Feb 4, 2009 3:51:37 PM (16 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:

17fc6f8

Parents:

a320904

Message:

Malfunctioning of 2D fit partly fixed

File:

• sansview/perspectives/fitting/fitpage1D.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -179 +179 @@
         self.btFit.SetToolTipString("Perform fit.")
          ## Q range
-        print "self.data fitpage1D" , self.data,hasattr(self.data,"data")
+        #print "self.data fitpage1D" , self.data,hasattr(self.data,"data")
         # Reversed to the codes; Need to think  carefully about consistency in q between 2D plot and fitting
         if not hasattr(self.data,"data"):
             self.qmin_x= numpy.min(self.data.x)
             self.qmax_x= numpy.max(self.data.x)
+            self.num_points= len(self.data.x)
         else:
             # Reversed to the codes; Need to think  carefully about consistency in q between 2D plot and fitting
@@ -190 +191 @@
             radius3= math.sqrt(math.pow(self.data.xmin, 2)+ math.pow(self.data.ymax, 2))
             radius4= math.sqrt(math.pow(self.data.xmax, 2)+ math.pow(self.data.ymax, 2))
-            self.qmin_x =0
-            self.qmax_x= max(radius1, radius2, radius3, radius4)
-            #self.qmin_x= self.data.xmin
-            #self.qmax_x= self.data.xmax           
-            print "data2D range",self.qmax_x
-        
-        self.num_points= 100
+            #self.qmin_x = 0
+            #self.qmax_x = max(radius1, radius2, radius3, radius4)
+            self.qmin_x= self.data.xmin
+            self.qmax_x= self.data.xmax           
+            #print "data2D range",self.qmax_x
+        
+            self.num_points= 100
          
         
@@ -305 +306 @@
                             if self.data.y_bins[j]>= self.qmin_x and self.data.y_bins[j]<= self.qmax_x:
                                 res.append( (self.data.data[j][i]- self.model.runXY(\
-                                 [self.data.x_bins[i],self.data.y_bins[j]]))\
+                                 [self.data.y_bins[j],self.data.x_bins[i]]))\
                                     /self.data.err_data[j][i] )
                 sum=0
@@ -335 +336 @@
                     self.qmin_x = float(self.qmin.GetValue())
                     self.qmax_x = float(self.qmax.GetValue())
-                    print "self.qmin_x, self.qmax_x",self.qmin_x,self.qmax_x
+                    #print "self.qmin_x, self.qmax_x",self.qmin_x,self.qmax_x
                     x,y,dy = [numpy.asarray(v) for v in (self.data.x,self.data.y,self.data.dy)]
                     if self.qmin_x==None and self.qmax_x==None: 
@@ -393 +394 @@
         if len(self.param_toFit) >0 and flag==True:
             self.manager.schedule_for_fit( value=1,fitproblem =None) 
-            self.manager._on_single_fit(qmin=self.qmin_x,qmax=self.qmax_x)
+            if hasattr(self.data, "data"):
+                self.manager._on_single_fit(qmin=self.qmin_x,qmax=self.qmax_x,
+                                            ymin=self.data.ymin, ymax=self.data.ymax)
+            else:
+                 self.manager._on_single_fit(qmin=self.qmin_x,qmax=self.qmax_x)
         else:
               wx.PostEvent(self.parent.parent, StatusEvent(status=\