Changeset 8f274b11 in sasview

Timestamp:

Feb 16, 2009 3:35:52 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:

dd66fbd

Parents:

01798e3

Message:

This time chisqr works better in 1d cal

File:

• sansview/perspectives/fitting/fitpage1D.py (modified) (1 diff)

sansview/perspectives/fitting/fitpage1D.py

@@ -344 +344 @@
                     if self.qmin_x==None and self.qmax_x==None: 
                         fx =numpy.asarray([self.model.run(v) for v in x])
-                        res=(y - fx)/dy
+                        temp=(y - fx)/dy
+                        res= temp*temp
                     else:
                         idx = (x>= self.qmin_x) & (x <=self.qmax_x)
                         fx = numpy.asarray([self.model.run(item)for item in x[idx ]])
-                        res= (y[idx] - fx)/dy[idx] 
+                        temp=(y[idx] - fx)/dy[idx]
+                        res= temp*temp
                    
                     sum=0
                     for item in res:
                         if numpy.isfinite(item):
-                            sum +=math.pow(item,2)
+                            sum +=item
                     self.tcChi.SetLabel(format_number(math.fabs(sum/ len(res))))
             except: