Changeset 43c0a8e in sasview for pr_inversion/invertor.py

Timestamp:

May 23, 2008 10:55:39 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

dfb58f8

Parents:

eb06cbe

Message:

Add a couple of figures of merit

File:

• pr_inversion/invertor.py (modified) (3 diffs)

pr_inversion/invertor.py

@@ -6 +6 @@
     """
         Provide general online help text
+        Future work: extend this function to allow topic selection
     """
     info_txt  = "The inversion approach is based on Moore, J. Appl. Cryst. (1980) 13, 168-175.\n\n"
@@ -31 +32 @@
         
         TODO: explain the maths
+        
+        
+        Methods inherited from Cinvertor:
+        - get_peaks: returns the number of P(r) peaks
     """
     ## Chisqr of the last computation
@@ -189 +194 @@
     
     def pr_err(self, c, c_cov, r):
-        import math
-        c_err = numpy.zeros(len(c))
-        for i in range(len(c)):
-            try:
-                c_err[i] = math.sqrt(math.fabs(c_cov[i][i]))
-            except:
-                import sys
-                print sys.exc_value
-                print "oups", c_cov[i][i]
-                c_err[i] = c[i]
+        #import math
+        #c_err = numpy.zeros(len(c))
+        #for i in range(len(c)):
+        #    try:
+        #        c_err[i] = math.sqrt(math.fabs(c_cov[i][i]))
+        #    except:
+        #        import sys
+        #        print sys.exc_value
+        #        print "oups", c_cov[i][i]
+        #        c_err[i] = c[i]
 
-        return self.get_pr_err(c, c_err, r)
+        return self.get_pr_err(c, c_cov, r)
        
     def _accept_q(self, q):