Changeset c7e8898 in sasview

Timestamp:

Oct 10, 2011 10:11:50 AM (13 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:

1fa4db39

Parents:

d67a66a

Message:

park chi2/N from the engine

Files:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (1 diff)
• park_integration/src/sans/fit/ParkFitting.py (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -2061 +2061 @@
             if self.engine_type == "park":  
                 npt_fit = float(self.get_npts2fit()) 
-                if npt_fit > 0:
-                    chisqr =chisqr/npt_fit    
+                # Taking care this in parkemgine
+                #if npt_fit > 0:
+                #    chisqr =chisqr/npt_fit    
             chi2 = format_number(chisqr, True)    
             self.tcChi.SetValue(chi2)    

park_integration/src/sans/fit/ParkFitting.py

@@ -9 +9 @@
 #import time
 import numpy
+import math
 #import park
 from park import fit
@@ -277 +278 @@
                 N = len(m.residuals)
                 m.degrees_of_freedom = N-k if N>k else 1
-                m.chisq = numpy.sum(m.residuals**2)
-                resid.append(m.weight*m.residuals)
+                m.chisq = numpy.sum(m.residuals**2/N) 
+                resid.append(m.weight*m.residuals/math.sqrt(N))
         self.residuals = numpy.hstack(resid)
         N = len(self.residuals)