Changeset 44999f3 in sasview

Timestamp:

Feb 3, 2009 3:27:10 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:

c4550b0

Parents:

bb1e07a

Message:

fixed chisr bug

File:

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

sansview/perspectives/fitting/fitpage1D.py

@@ -180 +180 @@
          ## Q range
         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)
         else:
-            radius1= math.sqrt(math.pow(self.data.xmin, 2)+ math.pow(self.data.ymin, 2))
-            radius2= math.sqrt(math.pow(self.data.xmax, 2)+ math.pow(self.data.ymin, 2))
-            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)
+            # Reversed to the codes; Need to think  carefully about consistency in q between 2D plot and fitting
+            #radius1= math.sqrt(math.pow(self.data.xmin, 2)+ math.pow(self.data.ymin, 2))
+            #radius2= math.sqrt(math.pow(self.data.xmax, 2)+ math.pow(self.data.ymin, 2))
+            #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 =numpy.min(self.data.x)#0
+            #self.qmax_x= numpy.max(self.data.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
          
@@ -309 +314 @@
                 #print "chisqr : sum 2D", xmin, xmax, ymin, ymax,sum
                 #print res
-                self.tcChi.SetValue(format_number(math.fabs(sum)))
+                self.tcChi.SetLabel(format_number(math.fabs(sum)))
             except:
                 wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
@@ -373 +378 @@
                     wx.PostEvent(self.event_owner, evt)
                     self.text1_1.Show()
+                    self.compute_chisqr()
                     self.tcChi.Show()
                 except: